已合并
【chore】: 支持Q2工程优化 #3318
zhuhaoran5创建于 6月2日
【chore】: 支持Q2工程优化 #3318
已合并
共 81 个文件变更+195-258
| @@ -99,7 +99,7 @@ else() | |||
| 99 | endif() | 99 | endif() |
| 100 | 100 | ||
| 101 | if (ENABLE_ACL_UT) | 101 | if (ENABLE_ACL_UT) |
| 102 | - include(cmake/intf_pub_linux.cmake) | 102 | + include(cmake/ge_intf_pub_linux.cmake) |
| 103 | add_cann_third_party(gtest_shared) | 103 | add_cann_third_party(gtest_shared) |
| 104 | find_cann_package(securec MODULE REQUIRED) | 104 | find_cann_package(securec MODULE REQUIRED) |
| 105 | add_cann_third_party(json) | 105 | add_cann_third_party(json) |
| @@ -163,7 +163,7 @@ set(INSTALL_INCLUDE_DIR include) | |||
| 163 | set(INSTALL_CONFIG_DIR cmake) | 163 | set(INSTALL_CONFIG_DIR cmake) |
| 164 | 164 | ||
| 165 | include(CMakePackageConfigHelpers) | 165 | include(CMakePackageConfigHelpers) |
| 166 | -include(cmake/intf_pub_linux.cmake) | 166 | +include(cmake/ge_intf_pub_linux.cmake) |
| 167 | include(cmake/build_type.cmake) | 167 | include(cmake/build_type.cmake) |
| 168 | 168 | ||
| 169 | if (ENABLE_DFLOW_UT OR ENABLE_DFLOW_ST) | 169 | if (ENABLE_DFLOW_UT OR ENABLE_DFLOW_ST) |
| @@ -39,7 +39,6 @@ target_include_directories(acl_cblas PRIVATE | |||
| 39 | 39 | ||
| 40 | target_compile_options(acl_cblas PRIVATE | 40 | target_compile_options(acl_cblas PRIVATE |
| 41 | $<$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>:-fvisibility=hidden> | 41 | $<$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>:-fvisibility=hidden> |
| 42 | - $<$<CONFIG:Release>:-O2> | ||
| 43 | $<$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>:/utf-8> | 42 | $<$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>:/utf-8> |
| 44 | $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Debug>>:/MTd> | 43 | $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Debug>>:/MTd> |
| 45 | $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Release>>:/MT> | 44 | $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Release>>:/MT> |
| @@ -49,7 +48,6 @@ target_compile_definitions(acl_cblas PRIVATE | |||
| 49 | $<IF:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,OS_TYPE=WIN,OS_TYPE=0> | 48 | $<IF:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,OS_TYPE=WIN,OS_TYPE=0> |
| 50 | FUNC_VISIBILITY | 49 | FUNC_VISIBILITY |
| 51 | $<$<STREQUAL:${ENABLE_ACL_UT},ON>:ONLY_ENABLE_ACL_UT> | 50 | $<$<STREQUAL:${ENABLE_ACL_UT},ON>:ONLY_ENABLE_ACL_UT> |
| 52 | - _FORTIFY_SOURCE=2 | ||
| 53 | ) | 51 | ) |
| 54 | 52 | ||
| 55 | target_link_options(acl_cblas PRIVATE | 53 | target_link_options(acl_cblas PRIVATE |
| @@ -59,7 +57,7 @@ target_link_options(acl_cblas PRIVATE | |||
| 59 | ) | 57 | ) |
| 60 | 58 | ||
| 61 | target_link_libraries(acl_cblas PRIVATE | 59 | target_link_libraries(acl_cblas PRIVATE |
| 62 | - $<BUILD_INTERFACE:intf_pub> | 60 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 63 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> | 61 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> |
| 64 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> | 62 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> |
| 65 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> | 63 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> |
| @@ -70,7 +70,7 @@ target_link_directories(acl_mdl_impl PRIVATE | |||
| 70 | ) | 70 | ) |
| 71 | 71 | ||
| 72 | target_link_libraries(acl_mdl_impl PRIVATE | 72 | target_link_libraries(acl_mdl_impl PRIVATE |
| 73 | - $<BUILD_INTERFACE:intf_pub> | 73 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 74 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> | 74 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> |
| 75 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> | 75 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> |
| 76 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> | 76 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> |
| @@ -163,7 +163,7 @@ target_link_options(acl_mdl_impl_om2 PRIVATE | |||
| 163 | ) | 163 | ) |
| 164 | 164 | ||
| 165 | target_link_libraries(acl_mdl_impl_om2 PRIVATE | 165 | target_link_libraries(acl_mdl_impl_om2 PRIVATE |
| 166 | - $<BUILD_INTERFACE:intf_pub> | 166 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 167 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> | 167 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> |
| 168 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> | 168 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> |
| 169 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> | 169 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> |
| @@ -229,7 +229,7 @@ target_link_directories(acl_mdl PRIVATE | |||
| 229 | ) | 229 | ) |
| 230 | 230 | ||
| 231 | target_link_libraries(acl_mdl PRIVATE | 231 | target_link_libraries(acl_mdl PRIVATE |
| 232 | - $<BUILD_INTERFACE:intf_pub> | 232 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 233 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> | 233 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> |
| 234 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> | 234 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> |
| 235 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> | 235 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> |
| @@ -71,7 +71,7 @@ target_link_options(acl_op_compiler PRIVATE | |||
| 71 | ) | 71 | ) |
| 72 | 72 | ||
| 73 | target_link_libraries(acl_op_compiler PRIVATE | 73 | target_link_libraries(acl_op_compiler PRIVATE |
| 74 | - $<BUILD_INTERFACE:intf_pub> | 74 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 75 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> | 75 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> |
| 76 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> | 76 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> |
| 77 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> | 77 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:mmpa_headers>> |
| @@ -90,7 +90,7 @@ target_link_directories(acl_op_executor_impl PRIVATE | |||
| 90 | ) | 90 | ) |
| 91 | 91 | ||
| 92 | target_link_libraries(acl_op_executor_impl PRIVATE | 92 | target_link_libraries(acl_op_executor_impl PRIVATE |
| 93 | - $<BUILD_INTERFACE:intf_pub> | 93 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 94 | $<BUILD_INTERFACE:ge_metadef_headers> | 94 | $<BUILD_INTERFACE:ge_metadef_headers> |
| 95 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> | 95 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> |
| 96 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> | 96 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> |
| @@ -167,7 +167,7 @@ target_link_directories(acl_op_executor PRIVATE | |||
| 167 | ) | 167 | ) |
| 168 | 168 | ||
| 169 | target_link_libraries(acl_op_executor PRIVATE | 169 | target_link_libraries(acl_op_executor PRIVATE |
| 170 | - $<BUILD_INTERFACE:intf_pub> | 170 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 171 | $<BUILD_INTERFACE:runtime_headers> | 171 | $<BUILD_INTERFACE:runtime_headers> |
| 172 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> | 172 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:slog_headers>> |
| 173 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> | 173 | $<$<NOT:$<BOOL:${ENABLE_OPEN_SRC}>>:$<BUILD_INTERFACE:msprof_headers>> |
| @@ -55,10 +55,6 @@ target_include_directories(stub_acl_cblas PRIVATE | |||
| 55 | ${TOP_DIR}/runtime/include/external/acl | 55 | ${TOP_DIR}/runtime/include/external/acl |
| 56 | ) | 56 | ) |
| 57 | 57 | ||
| 58 | -target_compile_definitions(stub_acl_cblas PRIVATE | ||
| 59 | - _FORTIFY_SOURCE=2 | ||
| 60 | -) | ||
| 61 | - | ||
| 62 | target_compile_options(stub_acl_cblas PRIVATE | 58 | target_compile_options(stub_acl_cblas PRIVATE |
| 63 | -Wno-unused-parameter | 59 | -Wno-unused-parameter |
| 64 | ) | 60 | ) |
| @@ -70,7 +66,7 @@ set_target_properties(stub_acl_cblas | |||
| 70 | ) | 66 | ) |
| 71 | 67 | ||
| 72 | target_link_libraries(stub_acl_cblas PRIVATE | 68 | target_link_libraries(stub_acl_cblas PRIVATE |
| 73 | - $<BUILD_INTERFACE:intf_pub> | 69 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 74 | $<BUILD_INTERFACE:runtime_headers> | 70 | $<BUILD_INTERFACE:runtime_headers> |
| 75 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | 71 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> |
| 76 | -ldl | 72 | -ldl |
| @@ -86,9 +82,6 @@ target_include_directories(stub_acl_op_compiler PRIVATE | |||
| 86 | ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl | 82 | ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl |
| 87 | ) | 83 | ) |
| 88 | 84 | ||
| 89 | -target_compile_definitions(stub_acl_op_compiler PRIVATE | ||
| 90 | - _FORTIFY_SOURCE=2 | ||
| 91 | -) | ||
| 92 | set_target_properties(stub_acl_op_compiler | 85 | set_target_properties(stub_acl_op_compiler |
| 93 | PROPERTIES | 86 | PROPERTIES |
| 94 | OUTPUT_NAME acl_op_compiler | 87 | OUTPUT_NAME acl_op_compiler |
| @@ -100,7 +93,7 @@ target_compile_options(stub_acl_op_compiler PRIVATE | |||
| 100 | ) | 93 | ) |
| 101 | 94 | ||
| 102 | target_link_libraries(stub_acl_op_compiler PRIVATE | 95 | target_link_libraries(stub_acl_op_compiler PRIVATE |
| 103 | - $<BUILD_INTERFACE:intf_pub> | 96 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 104 | $<BUILD_INTERFACE:runtime_headers> | 97 | $<BUILD_INTERFACE:runtime_headers> |
| 105 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | 98 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> |
| 106 | -ldl | 99 | -ldl |
| @@ -118,10 +111,6 @@ target_include_directories(stub_acl_op_executor PRIVATE | |||
| 118 | ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl | 111 | ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl |
| 119 | ) | 112 | ) |
| 120 | 113 | ||
| 121 | -target_compile_definitions(stub_acl_op_executor PRIVATE | ||
| 122 | - _FORTIFY_SOURCE=2 | ||
| 123 | -) | ||
| 124 | - | ||
| 125 | target_compile_options(stub_acl_op_executor PRIVATE | 114 | target_compile_options(stub_acl_op_executor PRIVATE |
| 126 | -Wno-unused-parameter | 115 | -Wno-unused-parameter |
| 127 | ) | 116 | ) |
| @@ -133,7 +122,7 @@ set_target_properties(stub_acl_op_executor | |||
| 133 | ) | 122 | ) |
| 134 | 123 | ||
| 135 | target_link_libraries(stub_acl_op_executor PRIVATE | 124 | target_link_libraries(stub_acl_op_executor PRIVATE |
| 136 | - $<BUILD_INTERFACE:intf_pub> | 125 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 137 | $<BUILD_INTERFACE:runtime_headers> | 126 | $<BUILD_INTERFACE:runtime_headers> |
| 138 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | 127 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> |
| 139 | -ldl | 128 | -ldl |
| @@ -151,10 +140,6 @@ target_include_directories(stub_acl_mdl PRIVATE | |||
| 151 | ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl | 140 | ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl |
| 152 | ) | 141 | ) |
| 153 | 142 | ||
| 154 | -target_compile_definitions(stub_acl_mdl PRIVATE | ||
| 155 | - _FORTIFY_SOURCE=2 | ||
| 156 | -) | ||
| 157 | - | ||
| 158 | target_compile_options(stub_acl_mdl PRIVATE | 143 | target_compile_options(stub_acl_mdl PRIVATE |
| 159 | -Wno-unused-parameter | 144 | -Wno-unused-parameter |
| 160 | ) | 145 | ) |
| @@ -167,7 +152,7 @@ set_target_properties(stub_acl_mdl | |||
| 167 | 152 | ||
| 168 | target_link_libraries(stub_acl_mdl PRIVATE | 153 | target_link_libraries(stub_acl_mdl PRIVATE |
| 169 | acl_rt | 154 | acl_rt |
| 170 | - $<BUILD_INTERFACE:intf_pub> | 155 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 171 | $<BUILD_INTERFACE:runtime_headers> | 156 | $<BUILD_INTERFACE:runtime_headers> |
| 172 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | 157 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> |
| 173 | -ldl | 158 | -ldl |
| @@ -204,10 +189,6 @@ target_include_directories(stub_acl_mdl_impl PRIVATE | |||
| 204 | ${TOP_DIR}/runtime/include/external/acl | 189 | ${TOP_DIR}/runtime/include/external/acl |
| 205 | ) | 190 | ) |
| 206 | 191 | ||
| 207 | -target_compile_definitions(stub_acl_mdl_impl PRIVATE | ||
| 208 | - _FORTIFY_SOURCE=2 | ||
| 209 | -) | ||
| 210 | - | ||
| 211 | target_compile_options(stub_acl_mdl_impl PRIVATE | 192 | target_compile_options(stub_acl_mdl_impl PRIVATE |
| 212 | -Wno-unused-parameter | 193 | -Wno-unused-parameter |
| 213 | ) | 194 | ) |
| @@ -219,7 +200,7 @@ set_target_properties(stub_acl_mdl_impl | |||
| 219 | ) | 200 | ) |
| 220 | 201 | ||
| 221 | target_link_libraries(stub_acl_mdl_impl PRIVATE | 202 | target_link_libraries(stub_acl_mdl_impl PRIVATE |
| 222 | - $<BUILD_INTERFACE:intf_pub> | 203 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 223 | $<BUILD_INTERFACE:runtime_headers> | 204 | $<BUILD_INTERFACE:runtime_headers> |
| 224 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> | 205 | $<$<NOT:$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-lrt> |
| 225 | -ldl | 206 | -ldl |
| @@ -79,7 +79,7 @@ if (${TARGET_SYSTEM_NAME} STREQUAL "Linux") | |||
| 79 | ) | 79 | ) |
| 80 | 80 | ||
| 81 | target_link_libraries(${ASCENDCL_C_COMPILE_TARGET} PRIVATE | 81 | target_link_libraries(${ASCENDCL_C_COMPILE_TARGET} PRIVATE |
| 82 | - $<BUILD_INTERFACE:intf_pub> | 82 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 83 | $<BUILD_INTERFACE:runtime_headers> | 83 | $<BUILD_INTERFACE:runtime_headers> |
| 84 | c_base_headers | 84 | c_base_headers |
| 85 | c_sec_headers | 85 | c_sec_headers |
| @@ -144,7 +144,7 @@ elseif (${TARGET_SYSTEM_NAME} STREQUAL "LiteOS") | |||
| 144 | ) | 144 | ) |
| 145 | 145 | ||
| 146 | target_link_libraries(${ASCENDCL_C_COMPILE_TARGET} PRIVATE | 146 | target_link_libraries(${ASCENDCL_C_COMPILE_TARGET} PRIVATE |
| 147 | - $<BUILD_INTERFACE:intf_pub> | 147 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 148 | $<BUILD_INTERFACE:runtime_headers> | 148 | $<BUILD_INTERFACE:runtime_headers> |
| 149 | c_base_headers | 149 | c_base_headers |
| 150 | c_sec_headers | 150 | c_sec_headers |
| @@ -54,7 +54,7 @@ target_link_options(cmd_flag_info_static PRIVATE | |||
| 54 | ) | 54 | ) |
| 55 | 55 | ||
| 56 | target_link_libraries(cmd_flag_info_static PRIVATE | 56 | target_link_libraries(cmd_flag_info_static PRIVATE |
| 57 | - intf_pub | 57 | + ge_intf_pub |
| 58 | c_sec | 58 | c_sec |
| 59 | error_manager | 59 | error_manager |
| 60 | slog | 60 | slog |
| @@ -100,7 +100,7 @@ target_link_options(atc_static PRIVATE | |||
| 100 | ) | 100 | ) |
| 101 | 101 | ||
| 102 | target_link_libraries(atc_static PRIVATE | 102 | target_link_libraries(atc_static PRIVATE |
| 103 | - intf_pub | 103 | + ge_intf_pub |
| 104 | cce_headers | 104 | cce_headers |
| 105 | msprof_headers | 105 | msprof_headers |
| 106 | ge_metadef_headers | 106 | ge_metadef_headers |
| @@ -143,7 +143,7 @@ target_link_options(atc_atc.bin PRIVATE | |||
| 143 | ) | 143 | ) |
| 144 | 144 | ||
| 145 | target_link_libraries(atc_atc.bin PRIVATE | 145 | target_link_libraries(atc_atc.bin PRIVATE |
| 146 | - intf_pub | 146 | + ge_intf_pub |
| 147 | atc_static | 147 | atc_static |
| 148 | ) | 148 | ) |
| 149 | 149 | ||
| @@ -166,7 +166,7 @@ target_link_options(fwk_atc.bin PRIVATE | |||
| 166 | ) | 166 | ) |
| 167 | 167 | ||
| 168 | target_link_libraries(fwk_atc.bin PRIVATE | 168 | target_link_libraries(fwk_atc.bin PRIVATE |
| 169 | - intf_pub | 169 | + ge_intf_pub |
| 170 | atc_static | 170 | atc_static |
| 171 | ) | 171 | ) |
| 172 | 172 | ||
| @@ -38,7 +38,7 @@ target_include_directories(_ge_pass_native PRIVATE | |||
| 38 | ) | 38 | ) |
| 39 | 39 | ||
| 40 | target_link_libraries(_ge_pass_native PRIVATE | 40 | target_link_libraries(_ge_pass_native PRIVATE |
| 41 | - $<BUILD_INTERFACE:intf_pub> | 41 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 42 | $<BUILD_INTERFACE:slog_headers> | 42 | $<BUILD_INTERFACE:slog_headers> |
| 43 | $<BUILD_INTERFACE:mmpa_headers> | 43 | $<BUILD_INTERFACE:mmpa_headers> |
| 44 | $<BUILD_INTERFACE:pybind_options> | 44 | $<BUILD_INTERFACE:pybind_options> |
| @@ -27,7 +27,7 @@ set(PYATC_WRAPPER_SRCS | |||
| 27 | ) | 27 | ) |
| 28 | 28 | ||
| 29 | set(GE_API_C_WRAPPER_COMMON_LINK_LIBS | 29 | set(GE_API_C_WRAPPER_COMMON_LINK_LIBS |
| 30 | - intf_pub | 30 | + ge_intf_pub |
| 31 | slog_headers | 31 | slog_headers |
| 32 | mmpa_headers | 32 | mmpa_headers |
| 33 | ge_metadef_headers | 33 | ge_metadef_headers |
| @@ -102,7 +102,7 @@ target_link_options(pyatc_wrapper PRIVATE | |||
| 102 | -Wl,-Bsymbolic | 102 | -Wl,-Bsymbolic |
| 103 | ) | 103 | ) |
| 104 | target_link_libraries(pyatc_wrapper PRIVATE | 104 | target_link_libraries(pyatc_wrapper PRIVATE |
| 105 | - intf_pub | 105 | + ge_intf_pub |
| 106 | atc_static | 106 | atc_static |
| 107 | -lrt | 107 | -lrt |
| 108 | -ldl | 108 | -ldl |
| @@ -24,7 +24,7 @@ if (NOT ENABLE_TEST) | |||
| 24 | ) | 24 | ) |
| 25 | 25 | ||
| 26 | target_link_libraries(llm_wrapper PRIVATE | 26 | target_link_libraries(llm_wrapper PRIVATE |
| 27 | - $<BUILD_INTERFACE:intf_pub> | 27 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 28 | $<BUILD_INTERFACE:slog_headers> | 28 | $<BUILD_INTERFACE:slog_headers> |
| 29 | $<BUILD_INTERFACE:mmpa_headers> | 29 | $<BUILD_INTERFACE:mmpa_headers> |
| 30 | $<BUILD_INTERFACE:hccl_headers> | 30 | $<BUILD_INTERFACE:hccl_headers> |
| @@ -59,7 +59,7 @@ target_link_options(ge_runner_v2 PRIVATE | |||
| 59 | 59 | ||
| 60 | target_link_libraries(ge_runner_v2 | 60 | target_link_libraries(ge_runner_v2 |
| 61 | PRIVATE | 61 | PRIVATE |
| 62 | - intf_pub | 62 | + ge_intf_pub |
| 63 | cce_headers | 63 | cce_headers |
| 64 | ge_compiler | 64 | ge_compiler |
| 65 | ge_executor_shared | 65 | ge_executor_shared |
| @@ -144,7 +144,7 @@ target_link_options(ge_runner PRIVATE | |||
| 144 | 144 | ||
| 145 | target_link_libraries(ge_runner | 145 | target_link_libraries(ge_runner |
| 146 | PRIVATE | 146 | PRIVATE |
| 147 | - intf_pub | 147 | + ge_intf_pub |
| 148 | cce_headers | 148 | cce_headers |
| 149 | ge_compiler | 149 | ge_compiler |
| 150 | ge_executor_shared | 150 | ge_executor_shared |
| @@ -39,7 +39,7 @@ target_compile_options(jit_exe PRIVATE ${AIR_COMMON_COMPILE_OPTION} | |||
| 39 | ) | 39 | ) |
| 40 | target_link_options(jit_exe PRIVATE ${AIR_COMMON_LINK_OPTION}) | 40 | target_link_options(jit_exe PRIVATE ${AIR_COMMON_LINK_OPTION}) |
| 41 | target_link_libraries(jit_exe PRIVATE | 41 | target_link_libraries(jit_exe PRIVATE |
| 42 | - $<BUILD_INTERFACE:intf_pub> | 42 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 43 | slog_headers | 43 | slog_headers |
| 44 | ge_metadef_headers | 44 | ge_metadef_headers |
| 45 | msprof_headers | 45 | msprof_headers |
| @@ -42,7 +42,7 @@ target_compile_options(atc_stub_ge_compiler PRIVATE | |||
| 42 | ) | 42 | ) |
| 43 | 43 | ||
| 44 | target_link_libraries(atc_stub_ge_compiler PRIVATE | 44 | target_link_libraries(atc_stub_ge_compiler PRIVATE |
| 45 | - intf_pub | 45 | + ge_intf_pub |
| 46 | ge_metadef_headers | 46 | ge_metadef_headers |
| 47 | eager_style_graph_builder_base_headers | 47 | eager_style_graph_builder_base_headers |
| 48 | ) | 48 | ) |
| @@ -75,7 +75,7 @@ target_compile_options(fwk_stub_ge_runner_v2 PRIVATE | |||
| 75 | 75 | ||
| 76 | target_link_libraries(fwk_stub_ge_runner_v2 | 76 | target_link_libraries(fwk_stub_ge_runner_v2 |
| 77 | PRIVATE | 77 | PRIVATE |
| 78 | - intf_pub | 78 | + ge_intf_pub |
| 79 | ge_metadef_headers | 79 | ge_metadef_headers |
| 80 | eager_style_graph_builder_base_headers | 80 | eager_style_graph_builder_base_headers |
| 81 | PUBLIC | 81 | PUBLIC |
| @@ -110,7 +110,7 @@ target_compile_options(fwk_stub_ge_runner PRIVATE | |||
| 110 | 110 | ||
| 111 | target_link_libraries(fwk_stub_ge_runner | 111 | target_link_libraries(fwk_stub_ge_runner |
| 112 | PRIVATE | 112 | PRIVATE |
| 113 | - intf_pub | 113 | + ge_intf_pub |
| 114 | ge_metadef_headers | 114 | ge_metadef_headers |
| 115 | eager_style_graph_builder_base_headers | 115 | eager_style_graph_builder_base_headers |
| 116 | PUBLIC | 116 | PUBLIC |
| @@ -225,7 +225,7 @@ target_link_options(ge_common PRIVATE | |||
| 225 | 225 | ||
| 226 | target_link_libraries(ge_common | 226 | target_link_libraries(ge_common |
| 227 | PRIVATE | 227 | PRIVATE |
| 228 | - intf_pub | 228 | + ge_intf_pub |
| 229 | msprof_headers | 229 | msprof_headers |
| 230 | runtime_headers | 230 | runtime_headers |
| 231 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> | 231 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> |
| @@ -295,7 +295,7 @@ target_link_options(ge_common_base PRIVATE | |||
| 295 | 295 | ||
| 296 | target_link_libraries(ge_common_base | 296 | target_link_libraries(ge_common_base |
| 297 | PRIVATE | 297 | PRIVATE |
| 298 | - intf_pub | 298 | + ge_intf_pub |
| 299 | msprof_headers | 299 | msprof_headers |
| 300 | adump_headers | 300 | adump_headers |
| 301 | runtime_headers | 301 | runtime_headers |
| @@ -369,7 +369,7 @@ target_include_directories(ge_common_static PRIVATE | |||
| 369 | ) | 369 | ) |
| 370 | 370 | ||
| 371 | target_link_libraries(ge_common_static PRIVATE | 371 | target_link_libraries(ge_common_static PRIVATE |
| 372 | - intf_pub | 372 | + ge_intf_pub |
| 373 | slog_headers | 373 | slog_headers |
| 374 | msprof_headers | 374 | msprof_headers |
| 375 | adump_headers | 375 | adump_headers |
| @@ -424,7 +424,7 @@ target_link_options(ge_common PRIVATE | |||
| 424 | 424 | ||
| 425 | target_link_libraries(ge_common | 425 | target_link_libraries(ge_common |
| 426 | PRIVATE | 426 | PRIVATE |
| 427 | - intf_pub | 427 | + ge_intf_pub |
| 428 | msprof_headers | 428 | msprof_headers |
| 429 | runtime_headers | 429 | runtime_headers |
| 430 | datagw_headers | 430 | datagw_headers |
| @@ -491,7 +491,7 @@ target_link_options(ge_common_base PRIVATE | |||
| 491 | 491 | ||
| 492 | target_link_libraries(ge_common_base | 492 | target_link_libraries(ge_common_base |
| 493 | PRIVATE | 493 | PRIVATE |
| 494 | - intf_pub | 494 | + ge_intf_pub |
| 495 | msprof_headers | 495 | msprof_headers |
| 496 | runtime_headers | 496 | runtime_headers |
| 497 | datagw_headers | 497 | datagw_headers |
| @@ -616,7 +616,7 @@ target_link_options(ge_common_stub PRIVATE | |||
| 616 | 616 | ||
| 617 | target_link_libraries(ge_common_stub | 617 | target_link_libraries(ge_common_stub |
| 618 | PRIVATE | 618 | PRIVATE |
| 619 | - intf_pub | 619 | + ge_intf_pub |
| 620 | slog_headers | 620 | slog_headers |
| 621 | ge_metadef_headers | 621 | ge_metadef_headers |
| 622 | runtime_headers | 622 | runtime_headers |
| @@ -64,7 +64,7 @@ target_link_options(formats PRIVATE | |||
| 64 | ) | 64 | ) |
| 65 | 65 | ||
| 66 | target_link_libraries(formats PRIVATE | 66 | target_link_libraries(formats PRIVATE |
| 67 | - intf_pub | 67 | + ge_intf_pub |
| 68 | -Wl,--no-as-needed | 68 | -Wl,--no-as-needed |
| 69 | graph | 69 | graph |
| 70 | graph_base | 70 | graph_base |
| @@ -49,7 +49,7 @@ target_link_options(slice PRIVATE | |||
| 49 | 49 | ||
| 50 | target_link_libraries(slice | 50 | target_link_libraries(slice |
| 51 | PRIVATE | 51 | PRIVATE |
| 52 | - intf_pub | 52 | + ge_intf_pub |
| 53 | -Wl,--no-as-needed | 53 | -Wl,--no-as-needed |
| 54 | graph | 54 | graph |
| 55 | graph_base | 55 | graph_base |
| @@ -121,6 +121,7 @@ graphengine: | |||
| 121 | - runtime/v2/engine/aicpu | 121 | - runtime/v2/engine/aicpu |
| 122 | - base/common/atrace | 122 | - base/common/atrace |
| 123 | - graph_metadef/graph/stub/stub_operator_factory_impl.cc | 123 | - graph_metadef/graph/stub/stub_operator_factory_impl.cc |
| 124 | + - graph_metadef/graph/normal_graph/ge_tensor.cc | ||
| 124 | llt: | 125 | llt: |
| 125 | ut_check:true | 126 | ut_check:true |
| 126 | st_check:true | 127 | st_check:true |
| @@ -8,114 +8,76 @@ | |||
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | 10 | ||
| 11 | +include_guard(GLOBAL) | ||
| 12 | + | ||
| 11 | if ((CMAKE_BUILD_TYPE MATCHES GCOV) OR (CMAKE_BUILD_TYPE MATCHES Debug)) | 13 | if ((CMAKE_BUILD_TYPE MATCHES GCOV) OR (CMAKE_BUILD_TYPE MATCHES Debug)) |
| 12 | set(OPTIMIZE_OPTION "-O0") | 14 | set(OPTIMIZE_OPTION "-O0") |
| 13 | else () | 15 | else () |
| 14 | set(OPTIMIZE_OPTION "-O2") | 16 | set(OPTIMIZE_OPTION "-O2") |
| 15 | endif () | 17 | endif () |
| 16 | 18 | ||
| 17 | -include_guard(GLOBAL) | 19 | +########## imported intf_pub_base|intf_pub ########## |
| 18 | -if (TARGET intf_pub) | 20 | +add_cann_target_options() |
| 19 | - message(STATUS "found intf_pub") | ||
| 20 | - return() | ||
| 21 | -endif () | ||
| 22 | 21 | ||
| 23 | -########## intf_pub_base ########## | 22 | +########## ge_intf_pub_base ########## |
| 24 | -add_library(intf_pub_base INTERFACE) | 23 | +add_library(ge_intf_pub_base INTERFACE) |
| 25 | - | 24 | +target_link_libraries(ge_intf_pub_base INTERFACE |
| 26 | -target_compile_options(intf_pub_base INTERFACE | 25 | + $<BUILD_INTERFACE:intf_pub_base> |
| 27 | - ${OPTIMIZE_OPTION} | 26 | +) |
| 28 | - -Werror -fno-common -Wextra -Wfloat-equal -Wall -fPIC | 27 | +target_compile_options(ge_intf_pub_base INTERFACE |
| 28 | + -Werror | ||
| 29 | $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_GREATER_EQUAL:${CMAKE_CXX_COMPILER_VERSION},14.0>>:-Wno-free-nonheap-object> | 29 | $<$<AND:$<CXX_COMPILER_ID:GNU>,$<VERSION_GREATER_EQUAL:${CMAKE_CXX_COMPILER_VERSION},14.0>>:-Wno-free-nonheap-object> |
| 30 | - -fstack-protector-strong | ||
| 31 | - $<$<NOT:$<STREQUAL:${OPTIMIZE_OPTION},-O0>>:-D_FORTIFY_SOURCE=2> | ||
| 32 | $<$<CONFIG:Debug>:-g> | 30 | $<$<CONFIG:Debug>:-g> |
| 33 | - $<$<BOOL:${ENABLE_ASAN}>: | 31 | + $<$<BOOL:${ENABLE_ASAN}>:-Wno-maybe-uninitialized> |
| 34 | - -Wno-maybe-uninitialized -fsanitize=address -fsanitize=leak -fsanitize-recover=address,all | ||
| 35 | - -fno-stack-protector -fno-omit-frame-pointer -g> | ||
| 36 | $<$<BOOL:${ENABLE_GCOV}>: | 32 | $<$<BOOL:${ENABLE_GCOV}>: |
| 37 | -g | 33 | -g |
| 38 | - --coverage -fprofile-arcs -ftest-coverage | ||
| 39 | -DFUNC_VISIBILITY | 34 | -DFUNC_VISIBILITY |
| 40 | -DFMK_SUPPORT_DUMP | 35 | -DFMK_SUPPORT_DUMP |
| 41 | -DFWK_SUPPORT_TRAINING_TRACE> | 36 | -DFWK_SUPPORT_TRAINING_TRACE> |
| 42 | ) | 37 | ) |
| 43 | - | 38 | +target_compile_definitions(ge_intf_pub_base INTERFACE |
| 44 | -target_compile_definitions(intf_pub_base INTERFACE | ||
| 45 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},device>,$<BOOL:${MDC_COMPILE_RUNTIME}>>:_GLIBCXX_USE_CXX11_ABI=1> | 39 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},device>,$<BOOL:${MDC_COMPILE_RUNTIME}>>:_GLIBCXX_USE_CXX11_ABI=1> |
| 46 | $<$<AND:$<NOT:$<STREQUAL:${PRODUCT_SIDE},device>>,$<NOT:$<BOOL:${MDC_COMPILE_RUNTIME}>>>:_GLIBCXX_USE_CXX11_ABI=0> | 40 | $<$<AND:$<NOT:$<STREQUAL:${PRODUCT_SIDE},device>>,$<NOT:$<BOOL:${MDC_COMPILE_RUNTIME}>>>:_GLIBCXX_USE_CXX11_ABI=0> |
| 47 | - $<$<CONFIG:Release>:CFG_BUILD_NDEBUG> | ||
| 48 | - $<$<CONFIG:Debug>:CFG_BUILD_DEBUG> | ||
| 49 | - LINUX=0 | ||
| 50 | $<$<BOOL:${ENABLE_TEST}>:SUPPORT_LARGE_MODEL_ENABLE=1> | 41 | $<$<BOOL:${ENABLE_TEST}>:SUPPORT_LARGE_MODEL_ENABLE=1> |
| 51 | ) | 42 | ) |
| 52 | - | 43 | +target_link_options(ge_intf_pub_base INTERFACE |
| 53 | -target_link_options(intf_pub_base INTERFACE | ||
| 54 | - -Wl,-z,relro | ||
| 55 | - -Wl,-z,now | ||
| 56 | - -Wl,-z,noexecstack | ||
| 57 | - $<$<CONFIG:Release>:-Wl,--build-id=none> | ||
| 58 | - $<$<CONFIG:Release>:-s> | ||
| 59 | - $<$<STREQUAL:$<TARGET_PROPERTY:TYPE>,EXECUTABLE>:-pie> | ||
| 60 | - $<$<BOOL:${ENABLE_ASAN}>:-fsanitize=address -fsanitize=leak -fsanitize-recover=address> | ||
| 61 | $<$<AND:$<BOOL:${ENABLE_ASAN}>,$<BOOL:${MDC_COMPILE_RUNTIME}>>:-lunwind -shared-libasan> | 44 | $<$<AND:$<BOOL:${ENABLE_ASAN}>,$<BOOL:${MDC_COMPILE_RUNTIME}>>:-lunwind -shared-libasan> |
| 62 | - $<$<BOOL:${ENABLE_GCOV}>:-fprofile-arcs -ftest-coverage> | ||
| 63 | ) | 45 | ) |
| 64 | - | 46 | +target_link_libraries(ge_intf_pub_base INTERFACE |
| 65 | -target_link_libraries(intf_pub_base INTERFACE | ||
| 66 | - $<$<BOOL:${ENABLE_GCOV}>:-lgcov> | ||
| 67 | - -lpthread | ||
| 68 | -lrt | 47 | -lrt |
| 69 | -ldl | 48 | -ldl |
| 70 | ) | 49 | ) |
| 71 | 50 | ||
| 72 | -########## intf_pub ########## | 51 | +########## ge_intf_pub ########## |
| 73 | -add_library(intf_pub INTERFACE) | 52 | +add_library(ge_intf_pub INTERFACE) |
| 74 | - | 53 | +target_compile_options(ge_intf_pub INTERFACE |
| 75 | -target_compile_options(intf_pub INTERFACE | 54 | + ${OPTIMIZE_OPTION} |
| 76 | - $<$<COMPILE_LANGUAGE:CXX>:-std=c++17> | 55 | + $<$<NOT:$<STREQUAL:${OPTIMIZE_OPTION},-O0>>:-D_FORTIFY_SOURCE=2> |
| 56 | +) | ||
| 57 | +target_link_libraries(ge_intf_pub INTERFACE | ||
| 58 | + $<BUILD_INTERFACE:intf_pub> | ||
| 59 | + $<BUILD_INTERFACE:ge_intf_pub_base> | ||
| 77 | ) | 60 | ) |
| 78 | 61 | ||
| 79 | -target_link_libraries(intf_pub INTERFACE | 62 | +########## ge_intf_pub_Os ########## |
| 80 | - $<BUILD_INTERFACE:intf_pub_base> | 63 | +add_library(ge_intf_pub_Os INTERFACE) |
| 64 | +target_compile_options(ge_intf_pub_Os INTERFACE | ||
| 65 | + -Os | ||
| 66 | +) | ||
| 67 | +target_link_libraries(ge_intf_pub_Os INTERFACE | ||
| 68 | + $<BUILD_INTERFACE:intf_pub> | ||
| 69 | + $<BUILD_INTERFACE:ge_intf_pub_base> | ||
| 81 | ) | 70 | ) |
| 82 | 71 | ||
| 83 | -########## intf_pub c++11 ########## | 72 | +########## ge_intf_pub c++14 ########## |
| 84 | -add_library(intf_pub_cxx11 INTERFACE) | 73 | +add_library(ge_intf_pub_cxx14 INTERFACE) |
| 85 | - | 74 | +target_link_libraries(ge_intf_pub_cxx14 INTERFACE |
| 86 | -target_compile_options(intf_pub_cxx11 INTERFACE | 75 | + $<BUILD_INTERFACE:intf_pub_cxx14> |
| 87 | - $<$<COMPILE_LANGUAGE:CXX>:-std=c++11> | 76 | + $<BUILD_INTERFACE:ge_intf_pub_base> |
| 88 | -) | ||
| 89 | - | ||
| 90 | -target_link_libraries(intf_pub_cxx11 INTERFACE | ||
| 91 | - $<BUILD_INTERFACE:intf_pub_base> | ||
| 92 | -) | ||
| 93 | - | ||
| 94 | -########## intf_pub c++14 ########## | ||
| 95 | -add_library(intf_pub_cxx14 INTERFACE) | ||
| 96 | - | ||
| 97 | -target_compile_options(intf_pub_cxx14 INTERFACE | ||
| 98 | - $<$<COMPILE_LANGUAGE:CXX>:-std=c++14> | ||
| 99 | -) | ||
| 100 | - | ||
| 101 | -target_link_libraries(intf_pub_cxx14 INTERFACE | ||
| 102 | - $<BUILD_INTERFACE:intf_pub_base> | ||
| 103 | -) | ||
| 104 | - | ||
| 105 | -########## intf_pub c++17 ########## | ||
| 106 | -add_library(intf_pub_cxx17 INTERFACE) | ||
| 107 | - | ||
| 108 | -target_compile_options(intf_pub_cxx17 INTERFACE | ||
| 109 | - $<$<COMPILE_LANGUAGE:CXX>:-std=c++17> | ||
| 110 | -) | ||
| 111 | - | ||
| 112 | -target_link_libraries(intf_pub_cxx17 INTERFACE | ||
| 113 | - $<BUILD_INTERFACE:intf_pub_base> | ||
| 114 | ) | 77 | ) |
| 115 | 78 | ||
| 116 | # 屏蔽pybind里的编译告警 | 79 | # 屏蔽pybind里的编译告警 |
| 117 | add_library(pybind_options INTERFACE) | 80 | add_library(pybind_options INTERFACE) |
| 118 | - | ||
| 119 | target_compile_options(pybind_options INTERFACE | 81 | target_compile_options(pybind_options INTERFACE |
| 120 | -Wno-float-equal | 82 | -Wno-float-equal |
| 121 | -Wno-missing-field-initializers | 83 | -Wno-missing-field-initializers |
| @@ -64,7 +64,7 @@ target_compile_definitions(ge_fusion_model_protos_obj PRIVATE | |||
| 64 | google=ascend_private | 64 | google=ascend_private |
| 65 | ) | 65 | ) |
| 66 | 66 | ||
| 67 | -target_link_libraries(ge_fusion_model_protos_obj PRIVATE ascend_protobuf intf_pub) | 67 | +target_link_libraries(ge_fusion_model_protos_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 68 | 68 | ||
| 69 | target_compile_options(ge_fusion_model_protos_obj PRIVATE | 69 | target_compile_options(ge_fusion_model_protos_obj PRIVATE |
| 70 | -Werror | 70 | -Werror |
| @@ -89,7 +89,7 @@ target_compile_definitions(ge_proto_common PRIVATE | |||
| 89 | ) | 89 | ) |
| 90 | 90 | ||
| 91 | target_link_libraries(ge_proto_common PRIVATE | 91 | target_link_libraries(ge_proto_common PRIVATE |
| 92 | - intf_pub | 92 | + ge_intf_pub |
| 93 | ascend_protobuf | 93 | ascend_protobuf |
| 94 | ) | 94 | ) |
| 95 | endif () | 95 | endif () |
| @@ -449,7 +449,7 @@ target_link_options(ge_compiler PRIVATE | |||
| 449 | 449 | ||
| 450 | target_link_libraries(ge_compiler | 450 | target_link_libraries(ge_compiler |
| 451 | PRIVATE | 451 | PRIVATE |
| 452 | - intf_pub | 452 | + ge_intf_pub |
| 453 | cce_headers | 453 | cce_headers |
| 454 | msprof_headers | 454 | msprof_headers |
| 455 | static_mmpa | 455 | static_mmpa |
| @@ -526,7 +526,7 @@ target_include_directories(ge_python_pass_bridge SYSTEM PRIVATE | |||
| 526 | 526 | ||
| 527 | target_link_libraries(ge_python_pass_bridge | 527 | target_link_libraries(ge_python_pass_bridge |
| 528 | PRIVATE | 528 | PRIVATE |
| 529 | - intf_pub | 529 | + ge_intf_pub |
| 530 | register | 530 | register |
| 531 | graph | 531 | graph |
| 532 | unified_dlog | 532 | unified_dlog |
| @@ -62,7 +62,7 @@ add_library(aicpu_engine_common SHARED | |||
| 62 | 62 | ||
| 63 | ##-----aicpu_engine_common | 63 | ##-----aicpu_engine_common |
| 64 | target_link_libraries(aicpu_engine_common PRIVATE | 64 | target_link_libraries(aicpu_engine_common PRIVATE |
| 65 | - intf_pub | 65 | + ge_intf_pub |
| 66 | msprof_headers | 66 | msprof_headers |
| 67 | runtime_headers | 67 | runtime_headers |
| 68 | cce_headers | 68 | cce_headers |
| @@ -147,7 +147,6 @@ target_compile_definitions(host_cpu_opskernel_builder PRIVATE | |||
| 147 | ) | 147 | ) |
| 148 | 148 | ||
| 149 | target_compile_definitions(aicpu_const_folding PRIVATE | 149 | target_compile_definitions(aicpu_const_folding PRIVATE |
| 150 | - _FORTIFY_SOURCE=2 | ||
| 151 | google=ascend_private | 150 | google=ascend_private |
| 152 | LOG_CPP | 151 | LOG_CPP |
| 153 | HOST_VISIBILITY | 152 | HOST_VISIBILITY |
| @@ -160,7 +159,7 @@ target_link_options(aicpu_const_folding PRIVATE | |||
| 160 | ) | 159 | ) |
| 161 | 160 | ||
| 162 | target_link_libraries(aicpu_ascend_engine PRIVATE | 161 | target_link_libraries(aicpu_ascend_engine PRIVATE |
| 163 | - intf_pub | 162 | + ge_intf_pub |
| 164 | msprof_headers | 163 | msprof_headers |
| 165 | runtime_headers | 164 | runtime_headers |
| 166 | cce_headers | 165 | cce_headers |
| @@ -183,7 +182,7 @@ target_link_libraries(aicpu_ascend_engine PRIVATE | |||
| 183 | ) | 182 | ) |
| 184 | 183 | ||
| 185 | target_link_libraries(host_cpu_engine PRIVATE | 184 | target_link_libraries(host_cpu_engine PRIVATE |
| 186 | - intf_pub | 185 | + ge_intf_pub |
| 187 | msprof_headers | 186 | msprof_headers |
| 188 | runtime_headers | 187 | runtime_headers |
| 189 | cce_headers | 188 | cce_headers |
| @@ -206,7 +205,7 @@ target_link_libraries(host_cpu_engine PRIVATE | |||
| 206 | ) | 205 | ) |
| 207 | 206 | ||
| 208 | target_link_libraries(host_cpu_opskernel_builder PRIVATE | 207 | target_link_libraries(host_cpu_opskernel_builder PRIVATE |
| 209 | - intf_pub | 208 | + ge_intf_pub |
| 210 | msprof_headers | 209 | msprof_headers |
| 211 | runtime_headers | 210 | runtime_headers |
| 212 | cce_headers | 211 | cce_headers |
| @@ -231,7 +230,7 @@ target_link_libraries(host_cpu_opskernel_builder PRIVATE | |||
| 231 | 230 | ||
| 232 | if (BUILD_OPEN_PROJECT OR ENABLE_OPEN_SRC) | 231 | if (BUILD_OPEN_PROJECT OR ENABLE_OPEN_SRC) |
| 233 | target_link_libraries(aicpu_const_folding PRIVATE | 232 | target_link_libraries(aicpu_const_folding PRIVATE |
| 234 | - intf_pub | 233 | + ge_intf_pub |
| 235 | aicpu_headers | 234 | aicpu_headers |
| 236 | air_headers | 235 | air_headers |
| 237 | mmpa_headers | 236 | mmpa_headers |
| @@ -247,7 +246,7 @@ if (BUILD_OPEN_PROJECT OR ENABLE_OPEN_SRC) | |||
| 247 | ) | 246 | ) |
| 248 | else () | 247 | else () |
| 249 | target_link_libraries(aicpu_const_folding PRIVATE | 248 | target_link_libraries(aicpu_const_folding PRIVATE |
| 250 | - intf_pub | 249 | + ge_intf_pub |
| 251 | air_headers | 250 | air_headers |
| 252 | mmpa_headers | 251 | mmpa_headers |
| 253 | -Wl,--no-as-needed | 252 | -Wl,--no-as-needed |
| @@ -22,4 +22,4 @@ set_target_properties(constant_folding_ops_stub PROPERTIES | |||
| 22 | OUTPUT_NAME "constant_folding_ops" | 22 | OUTPUT_NAME "constant_folding_ops" |
| 23 | ) | 23 | ) |
| 24 | 24 | ||
| 25 | -target_link_libraries(constant_folding_ops_stub PRIVATE $<BUILD_INTERFACE:intf_pub>) | 25 | +target_link_libraries(constant_folding_ops_stub PRIVATE $<BUILD_INTERFACE:ge_intf_pub>) |
| @@ -63,7 +63,7 @@ add_library(aicpu_tf_engine SHARED | |||
| 63 | ) | 63 | ) |
| 64 | ###aicpu_ms_engine | 64 | ###aicpu_ms_engine |
| 65 | target_link_libraries(aicpu_tf_engine PRIVATE | 65 | target_link_libraries(aicpu_tf_engine PRIVATE |
| 66 | - intf_pub | 66 | + ge_intf_pub |
| 67 | msprof_headers | 67 | msprof_headers |
| 68 | cce_headers | 68 | cce_headers |
| 69 | air_headers | 69 | air_headers |
| @@ -83,7 +83,7 @@ target_link_options(dvpp_engine PRIVATE | |||
| 83 | ) | 83 | ) |
| 84 | 84 | ||
| 85 | target_link_libraries(dvpp_engine PRIVATE | 85 | target_link_libraries(dvpp_engine PRIVATE |
| 86 | - intf_pub | 86 | + ge_intf_pub |
| 87 | msprof_headers | 87 | msprof_headers |
| 88 | runtime_headers | 88 | runtime_headers |
| 89 | cce_headers | 89 | cce_headers |
| @@ -52,7 +52,7 @@ target_compile_options(ffts PRIVATE | |||
| 52 | -Wno-deprecated-declarations) | 52 | -Wno-deprecated-declarations) |
| 53 | 53 | ||
| 54 | target_link_libraries(ffts PRIVATE | 54 | target_link_libraries(ffts PRIVATE |
| 55 | - intf_pub | 55 | + ge_intf_pub |
| 56 | mmpa_headers | 56 | mmpa_headers |
| 57 | msprof_headers | 57 | msprof_headers |
| 58 | runtime_headers | 58 | runtime_headers |
| @@ -66,7 +66,7 @@ else() | |||
| 66 | ) | 66 | ) |
| 67 | 67 | ||
| 68 | target_link_libraries(hcom_gradient_split_tune PRIVATE | 68 | target_link_libraries(hcom_gradient_split_tune PRIVATE |
| 69 | - $<BUILD_INTERFACE:intf_pub> | 69 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 70 | $<BUILD_INTERFACE:slog_headers> | 70 | $<BUILD_INTERFACE:slog_headers> |
| 71 | $<BUILD_INTERFACE:hccl_headers> | 71 | $<BUILD_INTERFACE:hccl_headers> |
| 72 | $<BUILD_INTERFACE:mmpa_headers> | 72 | $<BUILD_INTERFACE:mmpa_headers> |
| @@ -402,7 +402,7 @@ else() | |||
| 402 | 402 | ||
| 403 | #hcom_graph_adaptor依赖的so,链接选项 | 403 | #hcom_graph_adaptor依赖的so,链接选项 |
| 404 | target_link_libraries(hcom_graph_adaptor PRIVATE | 404 | target_link_libraries(hcom_graph_adaptor PRIVATE |
| 405 | - $<BUILD_INTERFACE:intf_pub_cxx14> | 405 | + $<BUILD_INTERFACE:ge_intf_pub_cxx14> |
| 406 | $<BUILD_INTERFACE:slog_headers> | 406 | $<BUILD_INTERFACE:slog_headers> |
| 407 | $<BUILD_INTERFACE:msprof_headers> | 407 | $<BUILD_INTERFACE:msprof_headers> |
| 408 | $<BUILD_INTERFACE:mmpa_headers> | 408 | $<BUILD_INTERFACE:mmpa_headers> |
| @@ -430,7 +430,7 @@ else() | |||
| 430 | 430 | ||
| 431 | #hcom_executor依赖的so,链接选项 | 431 | #hcom_executor依赖的so,链接选项 |
| 432 | target_link_libraries(hcom_executor PRIVATE | 432 | target_link_libraries(hcom_executor PRIVATE |
| 433 | - $<BUILD_INTERFACE:intf_pub_cxx14> | 433 | + $<BUILD_INTERFACE:ge_intf_pub_cxx14> |
| 434 | $<BUILD_INTERFACE:slog_headers> | 434 | $<BUILD_INTERFACE:slog_headers> |
| 435 | $<BUILD_INTERFACE:msprof_headers> | 435 | $<BUILD_INTERFACE:msprof_headers> |
| 436 | $<BUILD_INTERFACE:mmpa_headers> | 436 | $<BUILD_INTERFACE:mmpa_headers> |
| @@ -456,7 +456,7 @@ else() | |||
| 456 | 456 | ||
| 457 | #hcom_opskernel_builder依赖的so,链接选项 | 457 | #hcom_opskernel_builder依赖的so,链接选项 |
| 458 | target_link_libraries(hcom_opskernel_builder PRIVATE | 458 | target_link_libraries(hcom_opskernel_builder PRIVATE |
| 459 | - $<BUILD_INTERFACE:intf_pub_cxx14> | 459 | + $<BUILD_INTERFACE:ge_intf_pub_cxx14> |
| 460 | $<BUILD_INTERFACE:slog_headers> | 460 | $<BUILD_INTERFACE:slog_headers> |
| 461 | $<BUILD_INTERFACE:msprof_headers> | 461 | $<BUILD_INTERFACE:msprof_headers> |
| 462 | $<BUILD_INTERFACE:mmpa_headers> | 462 | $<BUILD_INTERFACE:mmpa_headers> |
| @@ -481,7 +481,7 @@ else() | |||
| 481 | 481 | ||
| 482 | #hcom_gradtune_opskernel_builder依赖的so,链接选项 | 482 | #hcom_gradtune_opskernel_builder依赖的so,链接选项 |
| 483 | target_link_libraries(hcom_gradtune_opskernel_builder PRIVATE | 483 | target_link_libraries(hcom_gradtune_opskernel_builder PRIVATE |
| 484 | - $<BUILD_INTERFACE:intf_pub_cxx14> | 484 | + $<BUILD_INTERFACE:ge_intf_pub_cxx14> |
| 485 | $<BUILD_INTERFACE:slog_headers> | 485 | $<BUILD_INTERFACE:slog_headers> |
| 486 | $<BUILD_INTERFACE:msprof_headers> | 486 | $<BUILD_INTERFACE:msprof_headers> |
| 487 | $<BUILD_INTERFACE:mmpa_headers> | 487 | $<BUILD_INTERFACE:mmpa_headers> |
| @@ -59,7 +59,7 @@ target_link_options(ge_local_engine PRIVATE | |||
| 59 | ) | 59 | ) |
| 60 | 60 | ||
| 61 | target_link_libraries(ge_local_engine PRIVATE | 61 | target_link_libraries(ge_local_engine PRIVATE |
| 62 | - intf_pub | 62 | + ge_intf_pub |
| 63 | msprof_headers | 63 | msprof_headers |
| 64 | runtime_headers | 64 | runtime_headers |
| 65 | cce_headers | 65 | cce_headers |
| @@ -109,7 +109,7 @@ target_link_options(atc_ge_local_engine PRIVATE | |||
| 109 | ) | 109 | ) |
| 110 | 110 | ||
| 111 | target_link_libraries(atc_ge_local_engine PRIVATE | 111 | target_link_libraries(atc_ge_local_engine PRIVATE |
| 112 | - intf_pub | 112 | + ge_intf_pub |
| 113 | msprof_headers | 113 | msprof_headers |
| 114 | runtime_headers | 114 | runtime_headers |
| 115 | cce_headers | 115 | cce_headers |
| @@ -160,7 +160,7 @@ target_link_options(ge_local_opskernel_builder PRIVATE | |||
| 160 | ) | 160 | ) |
| 161 | 161 | ||
| 162 | target_link_libraries(ge_local_opskernel_builder PRIVATE | 162 | target_link_libraries(ge_local_opskernel_builder PRIVATE |
| 163 | - intf_pub | 163 | + ge_intf_pub |
| 164 | msprof_headers | 164 | msprof_headers |
| 165 | runtime_headers | 165 | runtime_headers |
| 166 | cce_headers | 166 | cce_headers |
| @@ -212,7 +212,7 @@ target_link_options(atc_ge_local_opskernel_builder PRIVATE | |||
| 212 | ) | 212 | ) |
| 213 | 213 | ||
| 214 | target_link_libraries(atc_ge_local_opskernel_builder PRIVATE | 214 | target_link_libraries(atc_ge_local_opskernel_builder PRIVATE |
| 215 | - intf_pub | 215 | + ge_intf_pub |
| 216 | msprof_headers | 216 | msprof_headers |
| 217 | runtime_headers | 217 | runtime_headers |
| 218 | cce_headers | 218 | cce_headers |
| @@ -47,7 +47,7 @@ target_link_options(engine PRIVATE | |||
| 47 | ) | 47 | ) |
| 48 | 48 | ||
| 49 | target_link_libraries(engine PRIVATE | 49 | target_link_libraries(engine PRIVATE |
| 50 | - intf_pub | 50 | + ge_intf_pub |
| 51 | ge_metadef_headers | 51 | ge_metadef_headers |
| 52 | error_manager | 52 | error_manager |
| 53 | runtime_headers | 53 | runtime_headers |
| @@ -78,7 +78,7 @@ target_compile_definitions(fusion_pass PRIVATE | |||
| 78 | ) | 78 | ) |
| 79 | 79 | ||
| 80 | target_link_libraries(fusion_pass PRIVATE | 80 | target_link_libraries(fusion_pass PRIVATE |
| 81 | - intf_pub | 81 | + ge_intf_pub |
| 82 | msprof_headers | 82 | msprof_headers |
| 83 | $<$<BOOL:${BUILD_OPEN_PROJECT}>:op_compile_adapter_headers> | 83 | $<$<BOOL:${BUILD_OPEN_PROJECT}>:op_compile_adapter_headers> |
| 84 | $<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:tensor_engine_headers>> | 84 | $<$<NOT:$<BOOL:${BUILD_OPEN_PROJECT}>>:$<BUILD_INTERFACE:tensor_engine_headers>> |
| @@ -32,7 +32,7 @@ target_compile_definitions(opskernel PRIVATE | |||
| 32 | ) | 32 | ) |
| 33 | 33 | ||
| 34 | target_link_libraries(opskernel PRIVATE | 34 | target_link_libraries(opskernel PRIVATE |
| 35 | - intf_pub | 35 | + ge_intf_pub |
| 36 | mmpa_headers | 36 | mmpa_headers |
| 37 | msprof_headers | 37 | msprof_headers |
| 38 | runtime_headers | 38 | runtime_headers |
| @@ -114,7 +114,7 @@ target_compile_definitions(fe PRIVATE | |||
| 114 | ) | 114 | ) |
| 115 | 115 | ||
| 116 | target_link_libraries(fe PRIVATE | 116 | target_link_libraries(fe PRIVATE |
| 117 | - intf_pub | 117 | + ge_intf_pub |
| 118 | msprof_headers | 118 | msprof_headers |
| 119 | cce_headers | 119 | cce_headers |
| 120 | $<$<BOOL:${BUILD_OPEN_PROJECT}>:op_compile_adapter_headers> | 120 | $<$<BOOL:${BUILD_OPEN_PROJECT}>:op_compile_adapter_headers> |
| @@ -42,7 +42,7 @@ target_compile_definitions(aicore_utils PRIVATE | |||
| 42 | 42 | ||
| 43 | target_link_libraries(aicore_utils | 43 | target_link_libraries(aicore_utils |
| 44 | PRIVATE | 44 | PRIVATE |
| 45 | - intf_pub | 45 | + ge_intf_pub |
| 46 | msprof_headers | 46 | msprof_headers |
| 47 | runtime_headers | 47 | runtime_headers |
| 48 | -Wl,--no-as-needed | 48 | -Wl,--no-as-needed |
| @@ -96,7 +96,7 @@ target_link_options(rts_engine PRIVATE | |||
| 96 | ) | 96 | ) |
| 97 | 97 | ||
| 98 | target_link_libraries(rts_engine PRIVATE | 98 | target_link_libraries(rts_engine PRIVATE |
| 99 | - intf_pub | 99 | + ge_intf_pub |
| 100 | msprof_headers | 100 | msprof_headers |
| 101 | runtime_headers | 101 | runtime_headers |
| 102 | cce_headers | 102 | cce_headers |
| @@ -149,7 +149,7 @@ target_compile_options(rts_engine_atc PRIVATE | |||
| 149 | ) | 149 | ) |
| 150 | 150 | ||
| 151 | target_link_libraries(rts_engine_atc PRIVATE | 151 | target_link_libraries(rts_engine_atc PRIVATE |
| 152 | - $<BUILD_INTERFACE:intf_pub> | 152 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 153 | $<BUILD_INTERFACE:mmpa_headers> | 153 | $<BUILD_INTERFACE:mmpa_headers> |
| 154 | $<BUILD_INTERFACE:msprof_headers> | 154 | $<BUILD_INTERFACE:msprof_headers> |
| 155 | $<BUILD_INTERFACE:slog_headers> | 155 | $<BUILD_INTERFACE:slog_headers> |
| @@ -198,7 +198,7 @@ target_compile_options(rts_kernel_builder_host_static PRIVATE | |||
| 198 | ) | 198 | ) |
| 199 | 199 | ||
| 200 | target_link_libraries(rts_kernel_builder_host_static PRIVATE | 200 | target_link_libraries(rts_kernel_builder_host_static PRIVATE |
| 201 | - $<BUILD_INTERFACE:intf_pub> | 201 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 202 | $<BUILD_INTERFACE:tsch_headers> | 202 | $<BUILD_INTERFACE:tsch_headers> |
| 203 | $<BUILD_INTERFACE:runtime_headers> $<BUILD_INTERFACE:cce_headers> graph | 203 | $<BUILD_INTERFACE:runtime_headers> $<BUILD_INTERFACE:cce_headers> graph |
| 204 | register | 204 | register |
| @@ -32,7 +32,7 @@ target_compile_options(compress PRIVATE | |||
| 32 | target_link_libraries(compress | 32 | target_link_libraries(compress |
| 33 | PRIVATE | 33 | PRIVATE |
| 34 | runtime_headers | 34 | runtime_headers |
| 35 | - intf_pub | 35 | + ge_intf_pub |
| 36 | -Wl,--no-as-needed | 36 | -Wl,--no-as-needed |
| 37 | c_sec | 37 | c_sec |
| 38 | -Wl,--as-needed | 38 | -Wl,--as-needed |
| @@ -68,7 +68,7 @@ target_compile_options(compress_static PRIVATE | |||
| 68 | 68 | ||
| 69 | target_link_libraries(compress_static PRIVATE | 69 | target_link_libraries(compress_static PRIVATE |
| 70 | $<BUILD_INTERFACE:runtime_headers> | 70 | $<BUILD_INTERFACE:runtime_headers> |
| 71 | - $<BUILD_INTERFACE:intf_pub> | 71 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 72 | -Wl,--no-as-needed | 72 | -Wl,--no-as-needed |
| 73 | c_sec | 73 | c_sec |
| 74 | -Wl,--as-needed | 74 | -Wl,--as-needed |
| @@ -94,7 +94,7 @@ target_compile_options(compressweight PRIVATE | |||
| 94 | 94 | ||
| 95 | target_link_libraries(compressweight PRIVATE | 95 | target_link_libraries(compressweight PRIVATE |
| 96 | $<BUILD_INTERFACE:runtime_headers> | 96 | $<BUILD_INTERFACE:runtime_headers> |
| 97 | - $<BUILD_INTERFACE:intf_pub> | 97 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 98 | -Wl,--no-as-needed | 98 | -Wl,--no-as-needed |
| 99 | c_sec | 99 | c_sec |
| 100 | compress | 100 | compress |
| @@ -121,7 +121,7 @@ target_compile_options(compressweight_static PRIVATE | |||
| 121 | 121 | ||
| 122 | target_link_libraries(compressweight_static PRIVATE | 122 | target_link_libraries(compressweight_static PRIVATE |
| 123 | $<BUILD_INTERFACE:runtime_headers> | 123 | $<BUILD_INTERFACE:runtime_headers> |
| 124 | - $<BUILD_INTERFACE:intf_pub> | 124 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 125 | -Wl,--no-as-needed | 125 | -Wl,--no-as-needed |
| 126 | c_sec | 126 | c_sec |
| 127 | compress | 127 | compress |
| @@ -26,7 +26,7 @@ add_library(eager_style_graph_builder_base SHARED ${EAGER_STYLE_GRAPH_BUILDER}) | |||
| 26 | target_compile_options(eager_style_graph_builder_base PRIVATE ${AIR_COMMON_DYNAMIC_COMPILE_OPTION}) | 26 | target_compile_options(eager_style_graph_builder_base PRIVATE ${AIR_COMMON_DYNAMIC_COMPILE_OPTION}) |
| 27 | target_link_libraries(eager_style_graph_builder_base | 27 | target_link_libraries(eager_style_graph_builder_base |
| 28 | PRIVATE | 28 | PRIVATE |
| 29 | - intf_pub | 29 | + ge_intf_pub |
| 30 | slog_headers | 30 | slog_headers |
| 31 | unified_dlog | 31 | unified_dlog |
| 32 | air_headers | 32 | air_headers |
| @@ -50,7 +50,7 @@ target_compile_options(eager_style_graph_builder_base_static PRIVATE ${AIR_COMMO | |||
| 50 | ) | 50 | ) |
| 51 | target_link_libraries(eager_style_graph_builder_base_static | 51 | target_link_libraries(eager_style_graph_builder_base_static |
| 52 | PRIVATE | 52 | PRIVATE |
| 53 | - intf_pub | 53 | + ge_intf_pub |
| 54 | slog_headers | 54 | slog_headers |
| 55 | unified_dlog | 55 | unified_dlog |
| 56 | air_headers | 56 | air_headers |
| @@ -19,7 +19,7 @@ add_library(geir_collector STATIC | |||
| 19 | target_compile_options(geir_collector PRIVATE ${AIR_COMMON_COMPILE_OPTION}) | 19 | target_compile_options(geir_collector PRIVATE ${AIR_COMMON_COMPILE_OPTION}) |
| 20 | 20 | ||
| 21 | target_link_libraries(geir_collector PRIVATE | 21 | target_link_libraries(geir_collector PRIVATE |
| 22 | - intf_pub | 22 | + ge_intf_pub |
| 23 | graph | 23 | graph |
| 24 | graph_base | 24 | graph_base |
| 25 | metadef | 25 | metadef |
| @@ -49,7 +49,7 @@ add_library(gen_esb_impl STATIC | |||
| 49 | 49 | ||
| 50 | target_compile_options(gen_esb_impl PRIVATE ${AIR_COMMON_COMPILE_OPTION}) | 50 | target_compile_options(gen_esb_impl PRIVATE ${AIR_COMMON_COMPILE_OPTION}) |
| 51 | target_link_libraries(gen_esb_impl PRIVATE | 51 | target_link_libraries(gen_esb_impl PRIVATE |
| 52 | - intf_pub | 52 | + ge_intf_pub |
| 53 | graph | 53 | graph |
| 54 | graph_base | 54 | graph_base |
| 55 | error_manager | 55 | error_manager |
| @@ -61,4 +61,4 @@ target_link_libraries(gen_esb_impl PRIVATE | |||
| 61 | ) | 61 | ) |
| 62 | add_executable(gen_esb main.cc) | 62 | add_executable(gen_esb main.cc) |
| 63 | target_compile_options(gen_esb PRIVATE ${AIR_COMMON_COMPILE_OPTION}) | 63 | target_compile_options(gen_esb PRIVATE ${AIR_COMMON_COMPILE_OPTION}) |
| 64 | -target_link_libraries(gen_esb PRIVATE c_sec metadef intf_pub cmd_flag_info_static gen_esb_impl json) | 64 | +target_link_libraries(gen_esb PRIVATE c_sec metadef ge_intf_pub cmd_flag_info_static gen_esb_impl json) |
| @@ -39,7 +39,7 @@ target_compile_definitions(op_compile_adapter PRIVATE | |||
| 39 | 39 | ||
| 40 | target_link_libraries(op_compile_adapter | 40 | target_link_libraries(op_compile_adapter |
| 41 | PRIVATE | 41 | PRIVATE |
| 42 | - intf_pub | 42 | + ge_intf_pub |
| 43 | ge_metadef_headers | 43 | ge_metadef_headers |
| 44 | msprof_headers | 44 | msprof_headers |
| 45 | runtime_headers | 45 | runtime_headers |
| @@ -68,7 +68,7 @@ target_link_options(data_flow_base PRIVATE | |||
| 68 | ) | 68 | ) |
| 69 | 69 | ||
| 70 | target_link_libraries(data_flow_base PRIVATE | 70 | target_link_libraries(data_flow_base PRIVATE |
| 71 | - intf_pub | 71 | + ge_intf_pub |
| 72 | -Wl,--no-as-needed | 72 | -Wl,--no-as-needed |
| 73 | ascend_protobuf | 73 | ascend_protobuf |
| 74 | static_mmpa | 74 | static_mmpa |
| @@ -96,7 +96,7 @@ target_link_options(dflow_runner PRIVATE | |||
| 96 | 96 | ||
| 97 | target_link_libraries(dflow_runner | 97 | target_link_libraries(dflow_runner |
| 98 | PRIVATE | 98 | PRIVATE |
| 99 | - intf_pub | 99 | + ge_intf_pub |
| 100 | ge_compiler | 100 | ge_compiler |
| 101 | ge_runner_v2 | 101 | ge_runner_v2 |
| 102 | -Wl,--as-needed | 102 | -Wl,--as-needed |
| @@ -50,7 +50,7 @@ target_link_options(cpu_compiler PRIVATE | |||
| 50 | ) | 50 | ) |
| 51 | 51 | ||
| 52 | target_link_libraries(cpu_compiler PRIVATE | 52 | target_link_libraries(cpu_compiler PRIVATE |
| 53 | - intf_pub | 53 | + ge_intf_pub |
| 54 | msprof_headers | 54 | msprof_headers |
| 55 | static_mmpa | 55 | static_mmpa |
| 56 | ge_proto_common | 56 | ge_proto_common |
| @@ -55,7 +55,7 @@ target_link_options(udf_compiler PRIVATE | |||
| 55 | ) | 55 | ) |
| 56 | 56 | ||
| 57 | target_link_libraries(udf_compiler PRIVATE | 57 | target_link_libraries(udf_compiler PRIVATE |
| 58 | - intf_pub | 58 | + ge_intf_pub |
| 59 | msprof_headers | 59 | msprof_headers |
| 60 | static_mmpa | 60 | static_mmpa |
| 61 | ge_proto_common | 61 | ge_proto_common |
| @@ -62,7 +62,7 @@ target_link_options(npu_sched_model_loader PRIVATE | |||
| 62 | ) | 62 | ) |
| 63 | 63 | ||
| 64 | target_link_libraries(npu_sched_model_loader PRIVATE | 64 | target_link_libraries(npu_sched_model_loader PRIVATE |
| 65 | - intf_pub | 65 | + ge_intf_pub |
| 66 | msprof_headers | 66 | msprof_headers |
| 67 | datagw_headers | 67 | datagw_headers |
| 68 | -Wl,--no-as-needed | 68 | -Wl,--no-as-needed |
| @@ -194,7 +194,7 @@ target_link_options(model_deployer PRIVATE | |||
| 194 | ) | 194 | ) |
| 195 | 195 | ||
| 196 | target_link_libraries(model_deployer PRIVATE | 196 | target_link_libraries(model_deployer PRIVATE |
| 197 | - intf_pub | 197 | + ge_intf_pub |
| 198 | acl_rt | 198 | acl_rt |
| 199 | msprof_headers | 199 | msprof_headers |
| 200 | cce_headers | 200 | cce_headers |
| @@ -257,7 +257,7 @@ target_include_directories(deployer_daemon_static PUBLIC | |||
| 257 | ) | 257 | ) |
| 258 | 258 | ||
| 259 | target_link_libraries(deployer_daemon_static PRIVATE | 259 | target_link_libraries(deployer_daemon_static PRIVATE |
| 260 | - intf_pub | 260 | + ge_intf_pub |
| 261 | msprof_headers | 261 | msprof_headers |
| 262 | datagw_headers | 262 | datagw_headers |
| 263 | air_headers | 263 | air_headers |
| @@ -300,7 +300,7 @@ target_link_options(deployer_daemon PRIVATE | |||
| 300 | ) | 300 | ) |
| 301 | 301 | ||
| 302 | target_link_libraries(deployer_daemon PRIVATE | 302 | target_link_libraries(deployer_daemon PRIVATE |
| 303 | - intf_pub | 303 | + ge_intf_pub |
| 304 | msprof_headers | 304 | msprof_headers |
| 305 | datagw_headers | 305 | datagw_headers |
| 306 | air_headers | 306 | air_headers |
| @@ -386,7 +386,7 @@ target_include_directories(npu_executor_static PUBLIC | |||
| 386 | ) | 386 | ) |
| 387 | 387 | ||
| 388 | target_link_libraries(npu_executor_static PRIVATE | 388 | target_link_libraries(npu_executor_static PRIVATE |
| 389 | - intf_pub | 389 | + ge_intf_pub |
| 390 | msprof_headers | 390 | msprof_headers |
| 391 | datagw_headers | 391 | datagw_headers |
| 392 | air_headers | 392 | air_headers |
| @@ -430,7 +430,7 @@ target_link_options(npu_executor_main PRIVATE | |||
| 430 | -Wl,--exclude-libs,ALL) | 430 | -Wl,--exclude-libs,ALL) |
| 431 | 431 | ||
| 432 | target_link_libraries(npu_executor_main PRIVATE | 432 | target_link_libraries(npu_executor_main PRIVATE |
| 433 | - intf_pub | 433 | + ge_intf_pub |
| 434 | datagw_headers | 434 | datagw_headers |
| 435 | cce_headers | 435 | cce_headers |
| 436 | hccl_headers | 436 | hccl_headers |
| @@ -536,7 +536,7 @@ target_link_options(host_cpu_executor_main PRIVATE | |||
| 536 | -Wl,--exclude-libs,ALL) | 536 | -Wl,--exclude-libs,ALL) |
| 537 | 537 | ||
| 538 | target_link_libraries(host_cpu_executor_main PRIVATE | 538 | target_link_libraries(host_cpu_executor_main PRIVATE |
| 539 | - intf_pub | 539 | + ge_intf_pub |
| 540 | datagw_headers | 540 | datagw_headers |
| 541 | hccl_headers | 541 | hccl_headers |
| 542 | air_headers | 542 | air_headers |
| @@ -50,7 +50,7 @@ if (NOT TARGET flow_graph) | |||
| 50 | 50 | ||
| 51 | target_link_libraries(flow_graph | 51 | target_link_libraries(flow_graph |
| 52 | PRIVATE | 52 | PRIVATE |
| 53 | - intf_pub | 53 | + ge_intf_pub |
| 54 | static_mmpa | 54 | static_mmpa |
| 55 | -Wl,--no-as-needed | 55 | -Wl,--no-as-needed |
| 56 | graph_base | 56 | graph_base |
| @@ -43,7 +43,7 @@ target_compile_options(llm_engine PRIVATE | |||
| 43 | -ftrapv) | 43 | -ftrapv) |
| 44 | 44 | ||
| 45 | target_link_libraries(llm_engine PRIVATE | 45 | target_link_libraries(llm_engine PRIVATE |
| 46 | - $<BUILD_INTERFACE:intf_pub> | 46 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 47 | $<BUILD_INTERFACE:slog_headers> | 47 | $<BUILD_INTERFACE:slog_headers> |
| 48 | $<BUILD_INTERFACE:mmpa_headers> | 48 | $<BUILD_INTERFACE:mmpa_headers> |
| 49 | $<BUILD_INTERFACE:hccl_headers> | 49 | $<BUILD_INTERFACE:hccl_headers> |
| @@ -20,7 +20,7 @@ add_dependencies(flow_graph_protos_obj data_flow_protos) | |||
| 20 | target_compile_definitions(flow_graph_protos_obj PRIVATE | 20 | target_compile_definitions(flow_graph_protos_obj PRIVATE |
| 21 | google=ascend_private | 21 | google=ascend_private |
| 22 | ) | 22 | ) |
| 23 | -target_link_libraries(flow_graph_protos_obj PRIVATE ascend_protobuf intf_pub) | 23 | +target_link_libraries(flow_graph_protos_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 24 | target_compile_options(flow_graph_protos_obj PRIVATE | 24 | target_compile_options(flow_graph_protos_obj PRIVATE |
| 25 | $<$<CONFIG:Release>:-O2> | 25 | $<$<CONFIG:Release>:-O2> |
| 26 | $<$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>:-fPIC> | 26 | $<$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>:-fPIC> |
| @@ -18,7 +18,7 @@ target_include_directories(dflow_wrapper PRIVATE | |||
| 18 | ) | 18 | ) |
| 19 | 19 | ||
| 20 | target_link_libraries(dflow_wrapper PRIVATE | 20 | target_link_libraries(dflow_wrapper PRIVATE |
| 21 | - $<BUILD_INTERFACE:intf_pub> | 21 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 22 | $<BUILD_INTERFACE:slog_headers> | 22 | $<BUILD_INTERFACE:slog_headers> |
| 23 | $<BUILD_INTERFACE:udf_headers> | 23 | $<BUILD_INTERFACE:udf_headers> |
| 24 | $<BUILD_INTERFACE:metadef_headers> | 24 | $<BUILD_INTERFACE:metadef_headers> |
| @@ -64,7 +64,7 @@ target_compile_definitions(data_wrapper PRIVATE | |||
| 64 | ) | 64 | ) |
| 65 | 65 | ||
| 66 | target_link_libraries(data_wrapper PRIVATE | 66 | target_link_libraries(data_wrapper PRIVATE |
| 67 | - $<BUILD_INTERFACE:intf_pub> | 67 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 68 | $<BUILD_INTERFACE:udf_headers> | 68 | $<BUILD_INTERFACE:udf_headers> |
| 69 | $<BUILD_INTERFACE:metadef_headers> | 69 | $<BUILD_INTERFACE:metadef_headers> |
| 70 | $<BUILD_INTERFACE:pybind_options> | 70 | $<BUILD_INTERFACE:pybind_options> |
| @@ -18,7 +18,7 @@ target_include_directories(flowfunc_wrapper PRIVATE | |||
| 18 | ) | 18 | ) |
| 19 | 19 | ||
| 20 | target_link_libraries(flowfunc_wrapper PRIVATE | 20 | target_link_libraries(flowfunc_wrapper PRIVATE |
| 21 | - $<BUILD_INTERFACE:intf_pub> | 21 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 22 | $<BUILD_INTERFACE:udf_headers> | 22 | $<BUILD_INTERFACE:udf_headers> |
| 23 | $<BUILD_INTERFACE:slog_headers> | 23 | $<BUILD_INTERFACE:slog_headers> |
| 24 | $<BUILD_INTERFACE:metadef_headers> | 24 | $<BUILD_INTERFACE:metadef_headers> |
| @@ -84,7 +84,7 @@ target_include_directories(udf_static PUBLIC | |||
| 84 | target_link_libraries(udf_static PRIVATE | 84 | target_link_libraries(udf_static PRIVATE |
| 85 | -ldl | 85 | -ldl |
| 86 | ${AIR_COMMON_LINK_OPTION} | 86 | ${AIR_COMMON_LINK_OPTION} |
| 87 | - $<BUILD_INTERFACE:intf_pub> | 87 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 88 | $<BUILD_INTERFACE:slog_headers> | 88 | $<BUILD_INTERFACE:slog_headers> |
| 89 | $<BUILD_INTERFACE:mmpa_headers> | 89 | $<BUILD_INTERFACE:mmpa_headers> |
| 90 | $<BUILD_INTERFACE:air_headers> | 90 | $<BUILD_INTERFACE:air_headers> |
| @@ -120,7 +120,7 @@ target_compile_options(udf_executor PRIVATE | |||
| 120 | ) | 120 | ) |
| 121 | 121 | ||
| 122 | target_link_libraries(udf_executor PRIVATE | 122 | target_link_libraries(udf_executor PRIVATE |
| 123 | - $<BUILD_INTERFACE:intf_pub> | 123 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 124 | $<BUILD_INTERFACE:slog_headers> | 124 | $<BUILD_INTERFACE:slog_headers> |
| 125 | $<BUILD_INTERFACE:mmpa_headers> | 125 | $<BUILD_INTERFACE:mmpa_headers> |
| 126 | $<BUILD_INTERFACE:air_headers> | 126 | $<BUILD_INTERFACE:air_headers> |
| @@ -36,7 +36,7 @@ target_compile_options(built_in_flowfunc PRIVATE | |||
| 36 | ) | 36 | ) |
| 37 | 37 | ||
| 38 | target_link_libraries(built_in_flowfunc PRIVATE | 38 | target_link_libraries(built_in_flowfunc PRIVATE |
| 39 | - $<BUILD_INTERFACE:intf_pub> | 39 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 40 | $<BUILD_INTERFACE:slog_headers> | 40 | $<BUILD_INTERFACE:slog_headers> |
| 41 | $<BUILD_INTERFACE:mmpa_headers> | 41 | $<BUILD_INTERFACE:mmpa_headers> |
| 42 | $<BUILD_INTERFACE:ascend_hal_headers> | 42 | $<BUILD_INTERFACE:ascend_hal_headers> |
| @@ -8,7 +8,7 @@ | |||
| 8 | # See LICENSE in the root of the software repository for the full text of the License. | 8 | # See LICENSE in the root of the software repository for the full text of the License. |
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | include(func.cmake) | 10 | include(func.cmake) |
| 11 | -include(${GE_DIR}/cmake/intf_pub_linux.cmake) | 11 | +include(${GE_DIR}/cmake/ge_intf_pub_linux.cmake) |
| 12 | include(${GE_DIR}/cmake/air_headers.cmake) | 12 | include(${GE_DIR}/cmake/air_headers.cmake) |
| 13 | add_cann_third_party(protobuf) | 13 | add_cann_third_party(protobuf) |
| 14 | include(seccomp.cmake) | 14 | include(seccomp.cmake) |
| @@ -58,7 +58,7 @@ target_compile_options(flow_func PRIVATE | |||
| 58 | ) | 58 | ) |
| 59 | 59 | ||
| 60 | target_link_libraries(flow_func PRIVATE | 60 | target_link_libraries(flow_func PRIVATE |
| 61 | - $<BUILD_INTERFACE:intf_pub> | 61 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 62 | $<BUILD_INTERFACE:slog_headers> | 62 | $<BUILD_INTERFACE:slog_headers> |
| 63 | $<BUILD_INTERFACE:mmpa_headers> | 63 | $<BUILD_INTERFACE:mmpa_headers> |
| 64 | $<BUILD_INTERFACE:ascend_hal_headers> | 64 | $<BUILD_INTERFACE:ascend_hal_headers> |
| @@ -36,7 +36,7 @@ target_compile_options(reader_writer PRIVATE | |||
| 36 | ) | 36 | ) |
| 37 | 37 | ||
| 38 | target_link_libraries(reader_writer PRIVATE | 38 | target_link_libraries(reader_writer PRIVATE |
| 39 | - $<BUILD_INTERFACE:intf_pub> | 39 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 40 | $<BUILD_INTERFACE:slog_headers> | 40 | $<BUILD_INTERFACE:slog_headers> |
| 41 | $<BUILD_INTERFACE:ascend_hal_headers> | 41 | $<BUILD_INTERFACE:ascend_hal_headers> |
| 42 | -ldl | 42 | -ldl |
| @@ -24,6 +24,6 @@ set_target_properties(seccomp_stub PROPERTIES | |||
| 24 | SOVERSION 2) | 24 | SOVERSION 2) |
| 25 | 25 | ||
| 26 | target_link_libraries(seccomp_stub PRIVATE | 26 | target_link_libraries(seccomp_stub PRIVATE |
| 27 | - $<BUILD_INTERFACE:intf_pub> | 27 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 28 | $<BUILD_INTERFACE:seccomp_headers> | 28 | $<BUILD_INTERFACE:seccomp_headers> |
| 29 | ) | 29 | ) |
| @@ -27,5 +27,5 @@ add_library(stackcore SHARED | |||
| 27 | ) | 27 | ) |
| 28 | 28 | ||
| 29 | target_link_libraries(stackcore PRIVATE | 29 | target_link_libraries(stackcore PRIVATE |
| 30 | - $<BUILD_INTERFACE:intf_pub> | 30 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 31 | ) | 31 | ) |
| @@ -61,7 +61,7 @@ target_compile_options(udf_dump PRIVATE | |||
| 61 | ) | 61 | ) |
| 62 | 62 | ||
| 63 | target_link_libraries(udf_dump PRIVATE | 63 | target_link_libraries(udf_dump PRIVATE |
| 64 | - $<BUILD_INTERFACE:intf_pub> | 64 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 65 | $<BUILD_INTERFACE:slog_headers> | 65 | $<BUILD_INTERFACE:slog_headers> |
| 66 | $<BUILD_INTERFACE:mmpa_headers> | 66 | $<BUILD_INTERFACE:mmpa_headers> |
| 67 | $<BUILD_INTERFACE:ascend_hal_headers> | 67 | $<BUILD_INTERFACE:ascend_hal_headers> |
| @@ -31,7 +31,7 @@ target_compile_options(udf_profiling PRIVATE | |||
| 31 | ) | 31 | ) |
| 32 | 32 | ||
| 33 | target_link_libraries(udf_profiling PRIVATE | 33 | target_link_libraries(udf_profiling PRIVATE |
| 34 | - $<BUILD_INTERFACE:intf_pub> | 34 | + $<BUILD_INTERFACE:ge_intf_pub> |
| 35 | $<BUILD_INTERFACE:slog_headers> | 35 | $<BUILD_INTERFACE:slog_headers> |
| 36 | $<IF:$<STREQUAL:${PRODUCT_SIDE},device>,alog,unified_dlog> | 36 | $<IF:$<STREQUAL:${PRODUCT_SIDE},device>,alog,unified_dlog> |
| 37 | ) | 37 | ) |
| @@ -19,7 +19,7 @@ if (NOT ENABLE_OPEN_SRC) | |||
| 19 | endif() | 19 | endif() |
| 20 | 20 | ||
| 21 | message(STATUS "Variables in graph metadef project:") | 21 | message(STATUS "Variables in graph metadef project:") |
| 22 | -include(${AIR_CODE_DIR}/cmake/intf_pub_linux.cmake) | 22 | +include(${AIR_CODE_DIR}/cmake/ge_intf_pub_linux.cmake) |
| 23 | include(${AIR_CODE_DIR}/cmake/function.cmake) | 23 | include(${AIR_CODE_DIR}/cmake/function.cmake) |
| 24 | add_subdirectory(proto) | 24 | add_subdirectory(proto) |
| 25 | add_subdirectory(graph) | 25 | add_subdirectory(graph) |
| @@ -45,7 +45,7 @@ target_include_directories(lowering PRIVATE | |||
| 45 | ) | 45 | ) |
| 46 | 46 | ||
| 47 | target_link_libraries(lowering PRIVATE | 47 | target_link_libraries(lowering PRIVATE |
| 48 | - intf_pub | 48 | + ge_intf_pub |
| 49 | mmpa_headers | 49 | mmpa_headers |
| 50 | ge_metadef_headers | 50 | ge_metadef_headers |
| 51 | error_manager_headers | 51 | error_manager_headers |
| @@ -127,14 +127,13 @@ target_include_directories(stub_lowering PRIVATE | |||
| 127 | target_compile_options(stub_lowering PRIVATE | 127 | target_compile_options(stub_lowering PRIVATE |
| 128 | -Wfloat-equal | 128 | -Wfloat-equal |
| 129 | -fno-common | 129 | -fno-common |
| 130 | - -Os | ||
| 131 | -Werror=return-type | 130 | -Werror=return-type |
| 132 | -Wno-unused-parameter | 131 | -Wno-unused-parameter |
| 133 | ) | 132 | ) |
| 134 | 133 | ||
| 135 | target_link_libraries(stub_lowering | 134 | target_link_libraries(stub_lowering |
| 136 | PRIVATE | 135 | PRIVATE |
| 137 | - intf_pub | 136 | + ge_intf_pub_Os |
| 138 | c_sec_headers | 137 | c_sec_headers |
| 139 | PUBLIC | 138 | PUBLIC |
| 140 | ge_metadef_headers | 139 | ge_metadef_headers |
| @@ -176,7 +176,7 @@ target_link_options(graph_base PRIVATE | |||
| 176 | 176 | ||
| 177 | target_link_libraries(graph_base | 177 | target_link_libraries(graph_base |
| 178 | PRIVATE | 178 | PRIVATE |
| 179 | - intf_pub | 179 | + ge_intf_pub |
| 180 | static_mmpa | 180 | static_mmpa |
| 181 | -Wl,--no-as-needed | 181 | -Wl,--no-as-needed |
| 182 | c_sec | 182 | c_sec |
| @@ -247,7 +247,7 @@ target_link_options(graph PRIVATE | |||
| 247 | 247 | ||
| 248 | target_link_libraries(graph | 248 | target_link_libraries(graph |
| 249 | PRIVATE | 249 | PRIVATE |
| 250 | - intf_pub | 250 | + ge_intf_pub |
| 251 | static_mmpa | 251 | static_mmpa |
| 252 | -Wl,--no-as-needed | 252 | -Wl,--no-as-needed |
| 253 | c_sec | 253 | c_sec |
| @@ -305,7 +305,7 @@ else() | |||
| 305 | 305 | ||
| 306 | target_link_libraries(graph_share | 306 | target_link_libraries(graph_share |
| 307 | PRIVATE | 307 | PRIVATE |
| 308 | - intf_pub | 308 | + ge_intf_pub |
| 309 | static_mmpa | 309 | static_mmpa |
| 310 | -Wl,--no-as-needed | 310 | -Wl,--no-as-needed |
| 311 | c_sec | 311 | c_sec |
| @@ -425,14 +425,13 @@ target_include_directories(atc_stub_graph PRIVATE | |||
| 425 | target_compile_options(atc_stub_graph PRIVATE | 425 | target_compile_options(atc_stub_graph PRIVATE |
| 426 | -Wfloat-equal | 426 | -Wfloat-equal |
| 427 | -fno-common | 427 | -fno-common |
| 428 | - -Os | ||
| 429 | -Werror=return-type | 428 | -Werror=return-type |
| 430 | -Wno-unused-parameter | 429 | -Wno-unused-parameter |
| 431 | ) | 430 | ) |
| 432 | 431 | ||
| 433 | target_link_libraries(atc_stub_graph | 432 | target_link_libraries(atc_stub_graph |
| 434 | PRIVATE | 433 | PRIVATE |
| 435 | - intf_pub | 434 | + ge_intf_pub_Os |
| 436 | mmpa_headers | 435 | mmpa_headers |
| 437 | c_sec | 436 | c_sec |
| 438 | slog_headers | 437 | slog_headers |
| @@ -490,7 +489,7 @@ target_include_directories(fwk_stub_graph PRIVATE | |||
| 490 | 489 | ||
| 491 | target_link_libraries(fwk_stub_graph | 490 | target_link_libraries(fwk_stub_graph |
| 492 | PRIVATE | 491 | PRIVATE |
| 493 | - intf_pub | 492 | + ge_intf_pub |
| 494 | static_mmpa | 493 | static_mmpa |
| 495 | c_sec | 494 | c_sec |
| 496 | error_manager_headers | 495 | error_manager_headers |
| @@ -39,7 +39,7 @@ target_link_options(aihac_symbolizer PRIVATE | |||
| 39 | 39 | ||
| 40 | target_link_libraries(aihac_symbolizer | 40 | target_link_libraries(aihac_symbolizer |
| 41 | PRIVATE | 41 | PRIVATE |
| 42 | - intf_pub | 42 | + ge_intf_pub |
| 43 | static_mmpa | 43 | static_mmpa |
| 44 | -Wl,--no-as-needed | 44 | -Wl,--no-as-needed |
| 45 | c_sec | 45 | c_sec |
| @@ -1065,8 +1065,8 @@ graphStatus TensorDataImpl::SetData(const uint8_t *const data, const size_t size | |||
| 1065 | while (remain_size > SECUREC_MEM_MAX_LEN) { | 1065 | while (remain_size > SECUREC_MEM_MAX_LEN) { |
| 1066 | if (memcpy_s(ValueToPtr(dst_addr), SECUREC_MEM_MAX_LEN, | 1066 | if (memcpy_s(ValueToPtr(dst_addr), SECUREC_MEM_MAX_LEN, |
| 1067 | ValueToPtr(src_addr), SECUREC_MEM_MAX_LEN) != EOK) { | 1067 | ValueToPtr(src_addr), SECUREC_MEM_MAX_LEN) != EOK) { |
| 1068 | - REPORT_INNER_ERR_MSG("E18888", "memcpy failed, size = %" PRIu64 "", SECUREC_MEM_MAX_LEN); | 1068 | + REPORT_INNER_ERR_MSG("E18888", "memcpy failed, size = %" PRIu64 "", static_cast<uint64_t>(SECUREC_MEM_MAX_LEN)); |
| 1069 | - GELOGE(INTERNAL_ERROR, "[Memcpy][Data] failed, size = %" PRIu64 "", SECUREC_MEM_MAX_LEN); | 1069 | + GELOGE(INTERNAL_ERROR, "[Memcpy][Data] failed, size = %" PRIu64 "", static_cast<uint64_t>(SECUREC_MEM_MAX_LEN)); |
| 1070 | return GRAPH_FAILED; | 1070 | return GRAPH_FAILED; |
| 1071 | } | 1071 | } |
| 1072 | remain_size -= SECUREC_MEM_MAX_LEN; | 1072 | remain_size -= SECUREC_MEM_MAX_LEN; |
| @@ -85,7 +85,7 @@ add_dependencies(metadef_graph_protos_obj metadef_protos) | |||
| 85 | target_compile_definitions(metadef_graph_protos_obj PRIVATE | 85 | target_compile_definitions(metadef_graph_protos_obj PRIVATE |
| 86 | google=ascend_private | 86 | google=ascend_private |
| 87 | ) | 87 | ) |
| 88 | -target_link_libraries(metadef_graph_protos_obj PRIVATE ascend_protobuf intf_pub) | 88 | +target_link_libraries(metadef_graph_protos_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 89 | target_compile_options(metadef_graph_protos_obj PRIVATE | 89 | target_compile_options(metadef_graph_protos_obj PRIVATE |
| 90 | $<$<CONFIG:Release>:-O2> | 90 | $<$<CONFIG:Release>:-O2> |
| 91 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> | 91 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> |
| @@ -99,7 +99,7 @@ add_dependencies(metadef_tensorflow_protos_obj metadef_protos) | |||
| 99 | target_compile_definitions(metadef_tensorflow_protos_obj PRIVATE | 99 | target_compile_definitions(metadef_tensorflow_protos_obj PRIVATE |
| 100 | google=ascend_private | 100 | google=ascend_private |
| 101 | ) | 101 | ) |
| 102 | -target_link_libraries(metadef_tensorflow_protos_obj PRIVATE ascend_protobuf intf_pub) | 102 | +target_link_libraries(metadef_tensorflow_protos_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 103 | target_compile_options(metadef_tensorflow_protos_obj PRIVATE | 103 | target_compile_options(metadef_tensorflow_protos_obj PRIVATE |
| 104 | $<$<CONFIG:Release>:-O2> | 104 | $<$<CONFIG:Release>:-O2> |
| 105 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> | 105 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> |
| @@ -113,7 +113,7 @@ add_dependencies(metadef_aicpu_protos_obj metadef_protos) | |||
| 113 | target_compile_definitions(metadef_aicpu_protos_obj PRIVATE | 113 | target_compile_definitions(metadef_aicpu_protos_obj PRIVATE |
| 114 | google=ascend_private | 114 | google=ascend_private |
| 115 | ) | 115 | ) |
| 116 | -target_link_libraries(metadef_aicpu_protos_obj PRIVATE ascend_protobuf intf_pub) | 116 | +target_link_libraries(metadef_aicpu_protos_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 117 | target_compile_options(metadef_aicpu_protos_obj PRIVATE | 117 | target_compile_options(metadef_aicpu_protos_obj PRIVATE |
| 118 | $<$<CONFIG:Release>:-O2> | 118 | $<$<CONFIG:Release>:-O2> |
| 119 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> | 119 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> |
| @@ -127,7 +127,7 @@ add_dependencies(metadef_attr_group_protos_obj metadef_protos) | |||
| 127 | target_compile_definitions(metadef_attr_group_protos_obj PRIVATE | 127 | target_compile_definitions(metadef_attr_group_protos_obj PRIVATE |
| 128 | google=ascend_private | 128 | google=ascend_private |
| 129 | ) | 129 | ) |
| 130 | -target_link_libraries(metadef_attr_group_protos_obj PRIVATE ascend_protobuf intf_pub) | 130 | +target_link_libraries(metadef_attr_group_protos_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 131 | target_compile_options(metadef_attr_group_protos_obj PRIVATE | 131 | target_compile_options(metadef_attr_group_protos_obj PRIVATE |
| 132 | $<$<CONFIG:Release>:-O2> | 132 | $<$<CONFIG:Release>:-O2> |
| 133 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> | 133 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> |
| @@ -168,7 +168,7 @@ target_compile_options(stub_op_common PRIVATE | |||
| 168 | 168 | ||
| 169 | target_link_libraries(stub_op_common | 169 | target_link_libraries(stub_op_common |
| 170 | PRIVATE | 170 | PRIVATE |
| 171 | - intf_pub | 171 | + ge_intf_pub |
| 172 | c_sec | 172 | c_sec |
| 173 | PUBLIC | 173 | PUBLIC |
| 174 | ge_metadef_headers | 174 | ge_metadef_headers |
| @@ -127,7 +127,7 @@ target_link_libraries(register | |||
| 127 | PUBLIC | 127 | PUBLIC |
| 128 | ge_metadef_headers | 128 | ge_metadef_headers |
| 129 | PRIVATE | 129 | PRIVATE |
| 130 | - intf_pub | 130 | + ge_intf_pub |
| 131 | msprof_headers | 131 | msprof_headers |
| 132 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> | 132 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> |
| 133 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> | 133 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> |
| @@ -197,7 +197,7 @@ target_include_directories(register_static PRIVATE | |||
| 197 | target_link_libraries(register_static PRIVATE | 197 | target_link_libraries(register_static PRIVATE |
| 198 | c_sec | 198 | c_sec |
| 199 | json | 199 | json |
| 200 | - intf_pub | 200 | + ge_intf_pub |
| 201 | slog_headers | 201 | slog_headers |
| 202 | msprof_headers | 202 | msprof_headers |
| 203 | mmpa_headers | 203 | mmpa_headers |
| @@ -253,7 +253,7 @@ target_compile_definitions(op_tiling_o2 PRIVATE | |||
| 253 | ) | 253 | ) |
| 254 | 254 | ||
| 255 | target_link_libraries(op_tiling_o2 PRIVATE | 255 | target_link_libraries(op_tiling_o2 PRIVATE |
| 256 | - intf_pub | 256 | + ge_intf_pub |
| 257 | slog_headers | 257 | slog_headers |
| 258 | mmpa_headers | 258 | mmpa_headers |
| 259 | ge_metadef_headers | 259 | ge_metadef_headers |
| @@ -349,7 +349,7 @@ target_compile_options(stub_register_options INTERFACE | |||
| 349 | 349 | ||
| 350 | target_link_libraries(stub_register | 350 | target_link_libraries(stub_register |
| 351 | PRIVATE | 351 | PRIVATE |
| 352 | - intf_pub | 352 | + ge_intf_pub |
| 353 | stub_register_options | 353 | stub_register_options |
| 354 | slog_headers | 354 | slog_headers |
| 355 | msprof_headers | 355 | msprof_headers |
| @@ -10,6 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | 11 | ||
| 12 | 12 | ||
| 13 | + | ||
| 13 | 14 | ||
| 14 | 15 | ||
| 15 | 16 | ||
| @@ -544,7 +545,7 @@ ge::graphStatus PostProcMemoryCheck(const ge::Operator &op, OpRunInfoV2 &run_inf | |||
| 544 | GELOGD("The ori_op_para_size of node [%s] is %lu.", op_desc->GetName().c_str(), ori_op_para_size); | 545 | GELOGD("The ori_op_para_size of node [%s] is %lu.", op_desc->GetName().c_str(), ori_op_para_size); |
| 545 | if (!run_info.SetMemCheckBaseOffset(ori_op_para_size)) { | 546 | if (!run_info.SetMemCheckBaseOffset(ori_op_para_size)) { |
| 546 | REPORT_INNER_ERR_MSG("E19999", | 547 | REPORT_INNER_ERR_MSG("E19999", |
| 547 | - "[register][op_tiling][PostProcMemoryCheck]Node:%s set mem check offset:%lu failed.", | 548 | + "[register][op_tiling][PostProcMemoryCheck]Node:%s set mem check offset:%" PRIu64 " failed.", |
| 548 | op_desc->GetName().c_str(), ori_op_para_size); | 549 | op_desc->GetName().c_str(), ori_op_para_size); |
| 549 | return ge::GRAPH_FAILED; | 550 | return ge::GRAPH_FAILED; |
| 550 | } | 551 | } |
| @@ -21,7 +21,6 @@ class HostCpuContext { | |||
| 21 | ~HostCpuContext() = default; | 21 | ~HostCpuContext() = default; |
| 22 | private: | 22 | private: |
| 23 | class Impl; | 23 | class Impl; |
| 24 | - Impl *impl_; | ||
| 25 | }; | 24 | }; |
| 26 | } // namespace ge | 25 | } // namespace ge |
| 27 | 26 | ||
| @@ -70,7 +70,7 @@ add_dependencies(parser_graph_library_proto_obj parser_protos) | |||
| 70 | target_compile_definitions(parser_graph_library_proto_obj PRIVATE | 70 | target_compile_definitions(parser_graph_library_proto_obj PRIVATE |
| 71 | google=ascend_private | 71 | google=ascend_private |
| 72 | ) | 72 | ) |
| 73 | -target_link_libraries(parser_graph_library_proto_obj PRIVATE ascend_protobuf intf_pub) | 73 | +target_link_libraries(parser_graph_library_proto_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 74 | target_compile_options(parser_graph_library_proto_obj PRIVATE | 74 | target_compile_options(parser_graph_library_proto_obj PRIVATE |
| 75 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> | 75 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> |
| 76 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fno-common -Wextra -Wfloat-equal> | 76 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fno-common -Wextra -Wfloat-equal> |
| @@ -84,7 +84,7 @@ add_dependencies(parser_tensorflow_protos_obj parser_protos) | |||
| 84 | target_compile_definitions(parser_tensorflow_protos_obj PRIVATE | 84 | target_compile_definitions(parser_tensorflow_protos_obj PRIVATE |
| 85 | google=ascend_private | 85 | google=ascend_private |
| 86 | ) | 86 | ) |
| 87 | -target_link_libraries(parser_tensorflow_protos_obj PRIVATE ascend_protobuf intf_pub) | 87 | +target_link_libraries(parser_tensorflow_protos_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 88 | target_compile_options(parser_tensorflow_protos_obj PRIVATE | 88 | target_compile_options(parser_tensorflow_protos_obj PRIVATE |
| 89 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> | 89 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> |
| 90 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fno-common -Wextra -Wfloat-equal> | 90 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fno-common -Wextra -Wfloat-equal> |
| @@ -98,7 +98,7 @@ add_dependencies(parser_onnx_protos_obj parser_protos) | |||
| 98 | target_compile_definitions(parser_onnx_protos_obj PRIVATE | 98 | target_compile_definitions(parser_onnx_protos_obj PRIVATE |
| 99 | google=ascend_private | 99 | google=ascend_private |
| 100 | ) | 100 | ) |
| 101 | -target_link_libraries(parser_onnx_protos_obj PRIVATE ascend_protobuf intf_pub) | 101 | +target_link_libraries(parser_onnx_protos_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 102 | target_compile_options(parser_onnx_protos_obj PRIVATE | 102 | target_compile_options(parser_onnx_protos_obj PRIVATE |
| 103 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> | 103 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> |
| 104 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fno-common -Wextra -Wfloat-equal> | 104 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fno-common -Wextra -Wfloat-equal> |
| @@ -112,7 +112,7 @@ add_dependencies(parser_caffe_proto_obj parser_protos) | |||
| 112 | target_compile_definitions(parser_caffe_proto_obj PRIVATE | 112 | target_compile_definitions(parser_caffe_proto_obj PRIVATE |
| 113 | google=ascend_private | 113 | google=ascend_private |
| 114 | ) | 114 | ) |
| 115 | -target_link_libraries(parser_caffe_proto_obj PRIVATE ascend_protobuf intf_pub) | 115 | +target_link_libraries(parser_caffe_proto_obj PRIVATE ascend_protobuf ge_intf_pub) |
| 116 | target_compile_options(parser_caffe_proto_obj PRIVATE | 116 | target_compile_options(parser_caffe_proto_obj PRIVATE |
| 117 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> | 117 | $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions> |
| 118 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fno-common -Wextra -Wfloat-equal> | 118 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fno-common -Wextra -Wfloat-equal> |
| @@ -139,7 +139,7 @@ target_link_options(_caffe_parser PRIVATE | |||
| 139 | 139 | ||
| 140 | target_link_libraries(_caffe_parser | 140 | target_link_libraries(_caffe_parser |
| 141 | PRIVATE | 141 | PRIVATE |
| 142 | - intf_pub | 142 | + ge_intf_pub |
| 143 | -Wl,--no-as-needed | 143 | -Wl,--no-as-needed |
| 144 | ascend_protobuf | 144 | ascend_protobuf |
| 145 | -Wl,--as-needed | 145 | -Wl,--as-needed |
| @@ -80,7 +80,7 @@ target_link_options(fmk_parser PRIVATE | |||
| 80 | 80 | ||
| 81 | target_link_libraries(fmk_parser | 81 | target_link_libraries(fmk_parser |
| 82 | PRIVATE | 82 | PRIVATE |
| 83 | - intf_pub | 83 | + ge_intf_pub |
| 84 | air_headers | 84 | air_headers |
| 85 | json | 85 | json |
| 86 | PUBLIC | 86 | PUBLIC |
| @@ -139,7 +139,7 @@ target_include_directories(fmk_parser_stub PRIVATE | |||
| 139 | ) | 139 | ) |
| 140 | 140 | ||
| 141 | target_link_libraries(fmk_parser_stub PRIVATE | 141 | target_link_libraries(fmk_parser_stub PRIVATE |
| 142 | - intf_pub | 142 | + ge_intf_pub |
| 143 | ge_metadef_headers | 143 | ge_metadef_headers |
| 144 | ) | 144 | ) |
| 145 | 145 | ||
| @@ -70,7 +70,7 @@ target_link_options(parser_common PRIVATE | |||
| 70 | 70 | ||
| 71 | target_link_libraries(parser_common | 71 | target_link_libraries(parser_common |
| 72 | PRIVATE | 72 | PRIVATE |
| 73 | - intf_pub | 73 | + ge_intf_pub |
| 74 | air_headers | 74 | air_headers |
| 75 | static_mmpa | 75 | static_mmpa |
| 76 | -Wl,--no-as-needed | 76 | -Wl,--no-as-needed |
| @@ -29,7 +29,7 @@ target_compile_options(func2graph PRIVATE | |||
| 29 | ) | 29 | ) |
| 30 | 30 | ||
| 31 | target_link_libraries(func2graph PUBLIC | 31 | target_link_libraries(func2graph PUBLIC |
| 32 | - intf_pub | 32 | + ge_intf_pub |
| 33 | parser_headers | 33 | parser_headers |
| 34 | ascend_protobuf_static | 34 | ascend_protobuf_static |
| 35 | ) | 35 | ) |
| @@ -55,7 +55,7 @@ target_link_options(fmk_onnx_parser PRIVATE | |||
| 55 | 55 | ||
| 56 | target_link_libraries(fmk_onnx_parser | 56 | target_link_libraries(fmk_onnx_parser |
| 57 | PRIVATE | 57 | PRIVATE |
| 58 | - intf_pub | 58 | + ge_intf_pub |
| 59 | air_headers | 59 | air_headers |
| 60 | static_mmpa | 60 | static_mmpa |
| 61 | -Wl,--no-as-needed | 61 | -Wl,--no-as-needed |
| @@ -109,7 +109,7 @@ target_include_directories(fmk_onnx_parser_stub PRIVATE | |||
| 109 | ) | 109 | ) |
| 110 | 110 | ||
| 111 | target_link_libraries(fmk_onnx_parser_stub PRIVATE | 111 | target_link_libraries(fmk_onnx_parser_stub PRIVATE |
| 112 | - intf_pub | 112 | + ge_intf_pub |
| 113 | ge_metadef_headers | 113 | ge_metadef_headers |
| 114 | ) | 114 | ) |
| 115 | 115 | ||
| @@ -9,5 +9,6 @@ | |||
| 9 | # ----------------------------------------------------------------------------------------------------------- | 9 | # ----------------------------------------------------------------------------------------------------------- |
| 10 | cmake_minimum_required(VERSION 3.14) | 10 | cmake_minimum_required(VERSION 3.14) |
| 11 | set(AIR_CODE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../) | 11 | set(AIR_CODE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../) |
| 12 | +include(${AIR_CODE_DIR}/cmake/ge_intf_pub_linux.cmake) | ||
| 12 | add_subdirectory(executor) | 13 | add_subdirectory(executor) |
| 13 | add_subdirectory(dbg) | 14 | add_subdirectory(dbg) |
| @@ -57,7 +57,6 @@ if(${TARGET_SYSTEM_NAME} STREQUAL "Linux") | |||
| 57 | ) | 57 | ) |
| 58 | 58 | ||
| 59 | target_compile_options(ge_dbg_c PRIVATE | 59 | target_compile_options(ge_dbg_c PRIVATE |
| 60 | - -Os | ||
| 61 | -fno-common | 60 | -fno-common |
| 62 | -Wextra | 61 | -Wextra |
| 63 | -Wfloat-equal | 62 | -Wfloat-equal |
| @@ -69,7 +68,7 @@ if(${TARGET_SYSTEM_NAME} STREQUAL "Linux") | |||
| 69 | ) | 68 | ) |
| 70 | 69 | ||
| 71 | target_link_libraries(ge_dbg_c PRIVATE | 70 | target_link_libraries(ge_dbg_c PRIVATE |
| 72 | - intf_pub | 71 | + ge_intf_pub_Os |
| 73 | c_sec_headers | 72 | c_sec_headers |
| 74 | msprof_headers | 73 | msprof_headers |
| 75 | npu_runtime_headers | 74 | npu_runtime_headers |
| @@ -116,7 +115,7 @@ elseif(${TARGET_SYSTEM_NAME} STREQUAL "LiteOS") | |||
| 116 | ) | 115 | ) |
| 117 | 116 | ||
| 118 | target_link_libraries(ge_dbg_c_static_stub PRIVATE | 117 | target_link_libraries(ge_dbg_c_static_stub PRIVATE |
| 119 | - intf_pub | 118 | + ge_intf_pub |
| 120 | c_sec_headers | 119 | c_sec_headers |
| 121 | msprof_headers | 120 | msprof_headers |
| 122 | c_mmpa_headers | 121 | c_mmpa_headers |
| @@ -161,7 +160,7 @@ elseif(${TARGET_SYSTEM_NAME} STREQUAL "LiteOS") | |||
| 161 | ) | 160 | ) |
| 162 | 161 | ||
| 163 | target_link_libraries(ge_dbg_c_static_debug PRIVATE | 162 | target_link_libraries(ge_dbg_c_static_debug PRIVATE |
| 164 | - intf_pub | 163 | + ge_intf_pub |
| 165 | c_sec_headers | 164 | c_sec_headers |
| 166 | msprof_headers | 165 | msprof_headers |
| 167 | npu_runtime_headers | 166 | npu_runtime_headers |
| @@ -43,7 +43,6 @@ target_include_directories(ge_executor_c_static PRIVATE | |||
| 43 | ) | 43 | ) |
| 44 | 44 | ||
| 45 | set(COMMON_COMPILE_OPTIONS | 45 | set(COMMON_COMPILE_OPTIONS |
| 46 | - -Os | ||
| 47 | -fvisibility=hidden | 46 | -fvisibility=hidden |
| 48 | -fno-common | 47 | -fno-common |
| 49 | -Wextra | 48 | -Wextra |
| @@ -70,7 +69,7 @@ elseif(${TARGET_SYSTEM_NAME} STREQUAL "Linux") | |||
| 70 | endif() | 69 | endif() |
| 71 | 70 | ||
| 72 | target_link_libraries(ge_executor_c_static PRIVATE | 71 | target_link_libraries(ge_executor_c_static PRIVATE |
| 73 | - $<BUILD_INTERFACE:intf_pub> | 72 | + $<BUILD_INTERFACE:ge_intf_pub_Os> |
| 74 | c_sec_headers | 73 | c_sec_headers |
| 75 | msprof_headers | 74 | msprof_headers |
| 76 | -Wl,--whole-archive | 75 | -Wl,--whole-archive |
| @@ -52,7 +52,7 @@ target_include_directories(om2_executor PRIVATE | |||
| 52 | 52 | ||
| 53 | target_link_libraries(om2_executor PRIVATE | 53 | target_link_libraries(om2_executor PRIVATE |
| 54 | ${AIR_COMMON_LINK_OPTION} | 54 | ${AIR_COMMON_LINK_OPTION} |
| 55 | - intf_pub | 55 | + ge_intf_pub |
| 56 | slog_headers | 56 | slog_headers |
| 57 | msprof_headers | 57 | msprof_headers |
| 58 | adump_headers | 58 | adump_headers |
| @@ -75,7 +75,7 @@ add_dependencies(gert_stub stub_gert) | |||
| 75 | target_include_directories(gert_stub PRIVATE ${GERT_INCLUDING_PATH}) | 75 | target_include_directories(gert_stub PRIVATE ${GERT_INCLUDING_PATH}) |
| 76 | target_compile_definitions(gert_stub PRIVATE ${GERT_COMPILE_DEF}) | 76 | target_compile_definitions(gert_stub PRIVATE ${GERT_COMPILE_DEF}) |
| 77 | target_link_libraries(gert_stub PRIVATE | 77 | target_link_libraries(gert_stub PRIVATE |
| 78 | - intf_pub | 78 | + ge_intf_pub_Os |
| 79 | slog_headers | 79 | slog_headers |
| 80 | ge_metadef_headers | 80 | ge_metadef_headers |
| 81 | mmpa_headers | 81 | mmpa_headers |
| @@ -89,7 +89,7 @@ target_link_libraries(gert_stub PRIVATE | |||
| 89 | ) | 89 | ) |
| 90 | 90 | ||
| 91 | target_compile_options(gert_stub PRIVATE | 91 | target_compile_options(gert_stub PRIVATE |
| 92 | - -fvisibility=hidden -Os -fno-common -Wfloat-equal | 92 | + -fvisibility=hidden -fno-common -Wfloat-equal |
| 93 | -Werror=return-type | 93 | -Werror=return-type |
| 94 | -Wno-unused-parameter | 94 | -Wno-unused-parameter |
| 95 | ) | 95 | ) |
| @@ -199,7 +199,6 @@ target_compile_options(ge_executor PRIVATE | |||
| 199 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:${AIR_COMMON_COMPILE_OPTION}> | 199 | $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:${AIR_COMMON_COMPILE_OPTION}> |
| 200 | $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Debug>>:/MTd> | 200 | $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Debug>>:/MTd> |
| 201 | $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Release>>:/MT> | 201 | $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Release>>:/MT> |
| 202 | - -Os | ||
| 203 | -fvisibility=hidden | 202 | -fvisibility=hidden |
| 204 | -fvisibility-inlines-hidden | 203 | -fvisibility-inlines-hidden |
| 205 | -ffunction-sections | 204 | -ffunction-sections |
| @@ -235,7 +234,7 @@ target_include_directories(ge_executor PRIVATE | |||
| 235 | ) | 234 | ) |
| 236 | 235 | ||
| 237 | target_link_libraries(ge_executor PRIVATE | 236 | target_link_libraries(ge_executor PRIVATE |
| 238 | - intf_pub | 237 | + ge_intf_pub_Os |
| 239 | cce_headers | 238 | cce_headers |
| 240 | slog_headers | 239 | slog_headers |
| 241 | msprof_headers | 240 | msprof_headers |
| @@ -305,7 +304,7 @@ target_link_options(ge_executor_shared PRIVATE | |||
| 305 | 304 | ||
| 306 | target_link_libraries(ge_executor_shared | 305 | target_link_libraries(ge_executor_shared |
| 307 | PRIVATE | 306 | PRIVATE |
| 308 | - intf_pub | 307 | + ge_intf_pub |
| 309 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> | 308 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> |
| 310 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> | 309 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> |
| 311 | msprof_headers | 310 | msprof_headers |
| @@ -386,7 +385,7 @@ target_link_options(davinci_executor PRIVATE | |||
| 386 | 385 | ||
| 387 | target_link_libraries(davinci_executor | 386 | target_link_libraries(davinci_executor |
| 388 | PRIVATE | 387 | PRIVATE |
| 389 | - intf_pub | 388 | + ge_intf_pub |
| 390 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> | 389 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> |
| 391 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> | 390 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> |
| 392 | msprof_headers | 391 | msprof_headers |
| @@ -483,7 +482,7 @@ target_link_options(hybrid_executor PRIVATE | |||
| 483 | 482 | ||
| 484 | target_link_libraries(hybrid_executor | 483 | target_link_libraries(hybrid_executor |
| 485 | PRIVATE | 484 | PRIVATE |
| 486 | - intf_pub | 485 | + ge_intf_pub |
| 487 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> | 486 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> |
| 488 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> | 487 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> |
| 489 | msprof_headers | 488 | msprof_headers |
| @@ -561,7 +560,7 @@ add_dependencies(hybrid_executor_stub | |||
| 561 | ) | 560 | ) |
| 562 | 561 | ||
| 563 | target_compile_options(hybrid_executor_stub PRIVATE | 562 | target_compile_options(hybrid_executor_stub PRIVATE |
| 564 | - -fno-common -Wfloat-equal -fvisibility=default -Os | 563 | + -fno-common -Wfloat-equal -fvisibility=default |
| 565 | -Werror=return-type | 564 | -Werror=return-type |
| 566 | -Wno-unused-parameter | 565 | -Wno-unused-parameter |
| 567 | ) | 566 | ) |
| @@ -591,7 +590,7 @@ target_include_directories(hybrid_executor_stub PRIVATE | |||
| 591 | ) | 590 | ) |
| 592 | 591 | ||
| 593 | target_link_libraries(hybrid_executor_stub PRIVATE | 592 | target_link_libraries(hybrid_executor_stub PRIVATE |
| 594 | - intf_pub | 593 | + ge_intf_pub_Os |
| 595 | slog_headers | 594 | slog_headers |
| 596 | msprof_headers | 595 | msprof_headers |
| 597 | mmpa_headers | 596 | mmpa_headers |
| @@ -60,7 +60,7 @@ target_include_directories(gert_static PUBLIC | |||
| 60 | ) | 60 | ) |
| 61 | target_compile_definitions(gert_static PRIVATE ${GERT_COMPILE_DEF}) | 61 | target_compile_definitions(gert_static PRIVATE ${GERT_COMPILE_DEF}) |
| 62 | target_link_libraries(gert_static PRIVATE | 62 | target_link_libraries(gert_static PRIVATE |
| 63 | - intf_pub | 63 | + ge_intf_pub |
| 64 | cce_headers | 64 | cce_headers |
| 65 | slog_headers | 65 | slog_headers |
| 66 | msprof_headers | 66 | msprof_headers |
| @@ -89,7 +89,7 @@ target_include_directories(gert PRIVATE | |||
| 89 | ) | 89 | ) |
| 90 | target_compile_definitions(gert PRIVATE ${GERT_COMPILE_DEF}) | 90 | target_compile_definitions(gert PRIVATE ${GERT_COMPILE_DEF}) |
| 91 | target_link_libraries(gert PRIVATE | 91 | target_link_libraries(gert PRIVATE |
| 92 | - intf_pub | 92 | + ge_intf_pub |
| 93 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> | 93 | $<$<TARGET_EXISTS:cce_headers>:cce_headers> |
| 94 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> | 94 | $<$<TARGET_EXISTS:aicpu_headers>:aicpu_headers> |
| 95 | msprof_headers | 95 | msprof_headers |
| @@ -38,4 +38,4 @@ target_compile_options(st_stubs PRIVATE | |||
| 38 | target_link_libraries(st_stubs PUBLIC intf_llt_pub ge_graph_dsl ge_running_env GTestShared::gtest GTestShared::gmock GTestShared::gmock_main datagw_headers) | 38 | target_link_libraries(st_stubs PUBLIC intf_llt_pub ge_graph_dsl ge_running_env GTestShared::gtest GTestShared::gmock GTestShared::gmock_main datagw_headers) |
| 39 | 39 | ||
| 40 | add_library(memset_stubs STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/memset.c) | 40 | add_library(memset_stubs STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/memset.c) |
| 41 | -target_link_libraries(memset_stubs PRIVATE intf_pub) | 41 | +target_link_libraries(memset_stubs PRIVATE ge_intf_pub) |
| @@ -39,7 +39,7 @@ target_compile_definitions(ut_expression PRIVATE | |||
| 39 | LOG_CPP | 39 | LOG_CPP |
| 40 | ) | 40 | ) |
| 41 | 41 | ||
| 42 | -# intf_pub包含stdc++11 当前需要按照更高版本来编译ut | 42 | +# ge_intf_pub包含stdc++11 当前需要按照更高版本来编译ut |
| 43 | target_link_libraries(ut_expression PRIVATE | 43 | target_link_libraries(ut_expression PRIVATE |
| 44 | -lgcov | 44 | -lgcov |
| 45 | -Wl,--no-as-needed | 45 | -Wl,--no-as-needed |
如果是异常分支确实执行不到,通过这种方式绕一下的话,需要马上提一个pr把这个文件从当前文件删除