Browse Source

rm compile macro

tags/v1.2.0
chenyemeng 3 years ago
parent
commit
6fdd3de670
9 changed files with 44 additions and 22 deletions
  1. +0
    -2
      ge/CMakeLists.txt
  2. +0
    -3
      ge/common/CMakeLists.txt
  3. +0
    -2
      ge/executor/CMakeLists.txt
  4. +0
    -5
      ge/ge_local_engine/CMakeLists.txt
  5. +0
    -1
      ge/ge_runtime/CMakeLists.txt
  6. +44
    -0
      ge/graph/build/memory/CMakeLists.txt
  7. +0
    -5
      ge/host_cpu_engine/CMakeLists.txt
  8. +0
    -3
      ge/offline/CMakeLists.txt
  9. +0
    -1
      ge/plugin/engine/CMakeLists.txt

+ 0
- 2
ge/CMakeLists.txt View File

@@ -718,7 +718,6 @@ target_compile_definitions(ge_compiler PRIVATE
FMK_HOST_INFER FMK_HOST_INFER
COMPILE_OMG_PACKAGE COMPILE_OMG_PACKAGE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_compile_options(ge_compiler PRIVATE target_compile_options(ge_compiler PRIVATE
@@ -806,7 +805,6 @@ endif()


target_compile_definitions(opensrc_ascendcl PRIVATE target_compile_definitions(opensrc_ascendcl PRIVATE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_compile_options(opensrc_ascendcl PRIVATE target_compile_options(opensrc_ascendcl PRIVATE


+ 0
- 3
ge/common/CMakeLists.txt View File

@@ -73,7 +73,6 @@ target_compile_definitions(ge_common PRIVATE
FMK_SUPPORT_DUMP FMK_SUPPORT_DUMP
OS_CENTOS OS_CENTOS
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_compile_options(ge_common PRIVATE target_compile_options(ge_common PRIVATE
@@ -133,7 +132,6 @@ target_compile_definitions(ge_common_static PRIVATE
$<IF:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,OS_TYPE=WIN,OS_TYPE=0> $<IF:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,OS_TYPE=WIN,OS_TYPE=0>
$<$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>:SECUREC_USING_STD_SECURE_LIB=0 NOMINMAX> $<$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>:SECUREC_USING_STD_SECURE_LIB=0 NOMINMAX>
LOG_CPP LOG_CPP
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_compile_options(ge_common_static PRIVATE target_compile_options(ge_common_static PRIVATE
@@ -182,7 +180,6 @@ target_compile_definitions(ge_common PRIVATE
FMK_SUPPORT_DUMP FMK_SUPPORT_DUMP
OS_CENTOS OS_CENTOS
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_compile_options(ge_common PRIVATE target_compile_options(ge_common PRIVATE


+ 0
- 2
ge/executor/CMakeLists.txt View File

@@ -175,7 +175,6 @@ target_compile_definitions(ge_executor PRIVATE
$<IF:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,OS_TYPE=WIN,OS_TYPE=0> $<IF:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,OS_TYPE=WIN,OS_TYPE=0>
$<$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>:SECUREC_USING_STD_SECURE_LIB=0 NOMINMAX> $<$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>:SECUREC_USING_STD_SECURE_LIB=0 NOMINMAX>
LOG_CPP LOG_CPP
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(ge_executor PRIVATE target_include_directories(ge_executor PRIVATE
@@ -218,7 +217,6 @@ target_compile_definitions(ge_executor_shared PRIVATE
PROTOBUF_INLINE_NOT_IN_HEADERS=0 PROTOBUF_INLINE_NOT_IN_HEADERS=0
DAVINCI_SUPPORT_PROFILING DAVINCI_SUPPORT_PROFILING
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(ge_executor_shared PRIVATE target_include_directories(ge_executor_shared PRIVATE


+ 0
- 5
ge/ge_local_engine/CMakeLists.txt View File

@@ -31,7 +31,6 @@ target_compile_options(ge_local_engine PRIVATE


target_compile_definitions(ge_local_engine PRIVATE target_compile_definitions(ge_local_engine PRIVATE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(ge_local_engine PRIVATE target_include_directories(ge_local_engine PRIVATE
@@ -73,7 +72,6 @@ target_compile_options(atc_ge_local_engine PRIVATE
target_compile_definitions(atc_ge_local_engine PRIVATE target_compile_definitions(atc_ge_local_engine PRIVATE
COMPILE_OMG_PACKAGE COMPILE_OMG_PACKAGE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(atc_ge_local_engine PRIVATE target_include_directories(atc_ge_local_engine PRIVATE
@@ -119,7 +117,6 @@ target_compile_options(ge_local_opskernel_builder PRIVATE


target_compile_definitions(ge_local_opskernel_builder PRIVATE target_compile_definitions(ge_local_opskernel_builder PRIVATE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(ge_local_opskernel_builder PRIVATE target_include_directories(ge_local_opskernel_builder PRIVATE
@@ -161,7 +158,6 @@ target_compile_options(atc_ge_local_opskernel_builder PRIVATE


target_compile_definitions(atc_ge_local_opskernel_builder PRIVATE target_compile_definitions(atc_ge_local_opskernel_builder PRIVATE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(atc_ge_local_opskernel_builder PRIVATE target_include_directories(atc_ge_local_opskernel_builder PRIVATE
@@ -209,7 +205,6 @@ target_compile_options(ge_local_opskernel_builder_static PRIVATE
target_compile_definitions(ge_local_opskernel_builder_static PRIVATE target_compile_definitions(ge_local_opskernel_builder_static PRIVATE
google=ascend_private google=ascend_private
LOG_CPP LOG_CPP
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(ge_local_opskernel_builder_static PRIVATE target_include_directories(ge_local_opskernel_builder_static PRIVATE


+ 0
- 1
ge/ge_runtime/CMakeLists.txt View File

@@ -27,7 +27,6 @@ target_compile_options(ge_runtime PRIVATE


target_compile_definitions(ge_runtime PRIVATE target_compile_definitions(ge_runtime PRIVATE
PROTOBUF_INLINE_NOT_IN_HEADERS=0 PROTOBUF_INLINE_NOT_IN_HEADERS=0
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(ge_runtime PRIVATE target_include_directories(ge_runtime PRIVATE


+ 44
- 0
ge/graph/build/memory/CMakeLists.txt View File

@@ -0,0 +1,44 @@
set(SRC_LIST
"memory_assigner.cc"
"graph_mem_assigner.cc"
"binary_block_mem_assigner.cc"
"block_mem_assigner.cc"
"hybrid_mem_assigner.cc"
"max_block_mem_assigner.cc"
"var_mem_assign_util.cc"
)

############ libge_memory.a ############
add_library(ge_memory STATIC ${SRC_LIST})

target_compile_options(ge_memory PRIVATE
-Werror
-O2
-fno-common
)

target_compile_definitions(ge_memory PRIVATE
google=ascend_private
LOG_CPP
)

target_link_libraries(ge_memory PRIVATE
$<BUILD_INTERFACE:intf_pub>
ascend_protobuf
c_sec
)

target_include_directories(ge_memory PRIVATE
${CMAKE_CURRENT_LIST_DIR}
${GE_CODE_DIR}/ge
${GE_CODE_DIR}/inc
${GE_CODE_DIR}/inc/external
${METADEF_DIR}/inc
${METADEF_DIR}/inc/external
${METADEF_DIR}/inc/external/graph
${GE_CODE_DIR}/inc/framework
#### yellow zone ####
${GE_CODE_DIR}/../inc
#### blue zone ####
${GE_CODE_DIR}/third_party/fwkacllib/inc
)

+ 0
- 5
ge/host_cpu_engine/CMakeLists.txt View File

@@ -25,7 +25,6 @@ target_compile_options(host_cpu_engine PRIVATE


target_compile_definitions(host_cpu_engine PRIVATE target_compile_definitions(host_cpu_engine PRIVATE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(host_cpu_engine PRIVATE target_include_directories(host_cpu_engine PRIVATE
@@ -66,7 +65,6 @@ target_compile_options(atc_host_cpu_engine PRIVATE
target_compile_definitions(atc_host_cpu_engine PRIVATE target_compile_definitions(atc_host_cpu_engine PRIVATE
COMPILE_OMG_PACKAGE COMPILE_OMG_PACKAGE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(atc_host_cpu_engine PRIVATE target_include_directories(atc_host_cpu_engine PRIVATE
@@ -111,7 +109,6 @@ target_compile_options(host_cpu_opskernel_builder PRIVATE


target_compile_definitions(host_cpu_opskernel_builder PRIVATE target_compile_definitions(host_cpu_opskernel_builder PRIVATE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(host_cpu_opskernel_builder PRIVATE target_include_directories(host_cpu_opskernel_builder PRIVATE
@@ -152,7 +149,6 @@ target_compile_options(atc_host_cpu_opskernel_builder PRIVATE


target_compile_definitions(atc_host_cpu_opskernel_builder PRIVATE target_compile_definitions(atc_host_cpu_opskernel_builder PRIVATE
google=ascend_private google=ascend_private
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(atc_host_cpu_opskernel_builder PRIVATE target_include_directories(atc_host_cpu_opskernel_builder PRIVATE
@@ -199,7 +195,6 @@ target_compile_options(host_cpu_opskernel_builder_static PRIVATE
target_compile_definitions(host_cpu_opskernel_builder_static PRIVATE target_compile_definitions(host_cpu_opskernel_builder_static PRIVATE
google=ascend_private google=ascend_private
LOG_CPP LOG_CPP
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(host_cpu_opskernel_builder_static PRIVATE target_include_directories(host_cpu_opskernel_builder_static PRIVATE


+ 0
- 3
ge/offline/CMakeLists.txt View File

@@ -30,7 +30,6 @@ target_compile_definitions(atc PRIVATE
COMPILE_OMG_PACKAGE COMPILE_OMG_PACKAGE
google=ascend_private google=ascend_private
LOG_CPP LOG_CPP
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(atc PRIVATE target_include_directories(atc PRIVATE
@@ -93,7 +92,6 @@ target_compile_definitions(atc_atc.bin PRIVATE
COMPILE_OMG_PACKAGE COMPILE_OMG_PACKAGE
google=ascend_private google=ascend_private
LOG_CPP LOG_CPP
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(atc_atc.bin PRIVATE target_include_directories(atc_atc.bin PRIVATE
@@ -154,7 +152,6 @@ target_compile_options(fwk_atc.bin PRIVATE
-O2 -O2
-Wno-deprecated-declarations -Wno-deprecated-declarations
-fno-common -fno-common
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_compile_definitions(fwk_atc.bin PRIVATE target_compile_definitions(fwk_atc.bin PRIVATE


+ 0
- 1
ge/plugin/engine/CMakeLists.txt View File

@@ -14,7 +14,6 @@ target_compile_options(engine PRIVATE
target_compile_definitions(engine PRIVATE target_compile_definitions(engine PRIVATE
REUSE_MEMORY=1 REUSE_MEMORY=1
PROTOBUF_INLINE_NOT_IN_HEADERS=0 PROTOBUF_INLINE_NOT_IN_HEADERS=0
$<$<STREQUAL:${ENABLE_OPEN_SRC},True>:ONLY_COMPILE_OPEN_SRC>
) )


target_include_directories(engine PRIVATE target_include_directories(engine PRIVATE


Loading…
Cancel
Save