已合并
【chore】: 支持Q2工程优化 #3318
【chore】: 支持Q2工程优化 #3318
已合并
zhuhaoran5创建于 6月2日
81 个文件变更+195-258
MCMakeLists.txt+2-2
@@ -99,7 +99,7 @@ else()
99endif()99endif()
100 100 
101if (ENABLE_ACL_UT)101if (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)
163set(INSTALL_CONFIG_DIR cmake)163set(INSTALL_CONFIG_DIR cmake)
164 164 
165include(CMakePackageConfigHelpers)165include(CMakePackageConfigHelpers)
166-include(cmake/intf_pub_linux.cmake)166+include(cmake/ge_intf_pub_linux.cmake)
167include(cmake/build_type.cmake)167include(cmake/build_type.cmake)
168 168 
169if (ENABLE_DFLOW_UT OR ENABLE_DFLOW_ST)169if (ENABLE_DFLOW_UT OR ENABLE_DFLOW_ST)
Mapi/acl/acl_cblas/CMakeLists.txt+1-3
@@ -39,7 +39,6 @@ target_include_directories(acl_cblas PRIVATE
39 39 
40target_compile_options(acl_cblas PRIVATE40target_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_VISIBILITY49 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 
55target_link_options(acl_cblas PRIVATE53target_link_options(acl_cblas PRIVATE
@@ -59,7 +57,7 @@ target_link_options(acl_cblas PRIVATE
59)57)
60 58 
61target_link_libraries(acl_cblas PRIVATE59target_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>>
Mapi/acl/acl_model/CMakeLists.txt+3-3
@@ -70,7 +70,7 @@ target_link_directories(acl_mdl_impl PRIVATE
70)70)
71 71 
72target_link_libraries(acl_mdl_impl PRIVATE72target_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 
165target_link_libraries(acl_mdl_impl_om2 PRIVATE165target_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 
231target_link_libraries(acl_mdl PRIVATE231target_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>>
Mapi/acl/acl_op_compiler/CMakeLists.txt+1-1
@@ -71,7 +71,7 @@ target_link_options(acl_op_compiler PRIVATE
71)71)
72 72 
73target_link_libraries(acl_op_compiler PRIVATE73target_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>>
Mapi/acl/acl_op_executor/CMakeLists.txt+2-2
@@ -90,7 +90,7 @@ target_link_directories(acl_op_executor_impl PRIVATE
90)90)
91 91 
92target_link_libraries(acl_op_executor_impl PRIVATE92target_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 
169target_link_libraries(acl_op_executor PRIVATE169target_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>>
Mapi/acl/stub/CMakeLists.txt+5-24
@@ -55,10 +55,6 @@ target_include_directories(stub_acl_cblas PRIVATE
55 ${TOP_DIR}/runtime/include/external/acl55 ${TOP_DIR}/runtime/include/external/acl
56)56)
57 57 
58-target_compile_definitions(stub_acl_cblas PRIVATE
59- _FORTIFY_SOURCE=2
60-)
61- 
62target_compile_options(stub_acl_cblas PRIVATE58target_compile_options(stub_acl_cblas PRIVATE
63 -Wno-unused-parameter59 -Wno-unused-parameter
64)60)
@@ -70,7 +66,7 @@ set_target_properties(stub_acl_cblas
70)66)
71 67 
72target_link_libraries(stub_acl_cblas PRIVATE68target_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 -ldl72 -ldl
@@ -86,9 +82,6 @@ target_include_directories(stub_acl_op_compiler PRIVATE
86 ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl82 ${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-)
92set_target_properties(stub_acl_op_compiler85set_target_properties(stub_acl_op_compiler
93 PROPERTIES86 PROPERTIES
94 OUTPUT_NAME acl_op_compiler87 OUTPUT_NAME acl_op_compiler
@@ -100,7 +93,7 @@ target_compile_options(stub_acl_op_compiler PRIVATE
100)93)
101 94 
102target_link_libraries(stub_acl_op_compiler PRIVATE95target_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 -ldl99 -ldl
@@ -118,10 +111,6 @@ target_include_directories(stub_acl_op_executor PRIVATE
118 ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl111 ${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- 
125target_compile_options(stub_acl_op_executor PRIVATE114target_compile_options(stub_acl_op_executor PRIVATE
126 -Wno-unused-parameter115 -Wno-unused-parameter
127)116)
@@ -133,7 +122,7 @@ set_target_properties(stub_acl_op_executor
133)122)
134 123 
135target_link_libraries(stub_acl_op_executor PRIVATE124target_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 -ldl128 -ldl
@@ -151,10 +140,6 @@ target_include_directories(stub_acl_mdl PRIVATE
151 ${CMAKE_CURRENT_LIST_DIR}/../../../inc/external/acl140 ${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- 
158target_compile_options(stub_acl_mdl PRIVATE143target_compile_options(stub_acl_mdl PRIVATE
159 -Wno-unused-parameter144 -Wno-unused-parameter
160)145)
@@ -167,7 +152,7 @@ set_target_properties(stub_acl_mdl
167 152 
168target_link_libraries(stub_acl_mdl PRIVATE153target_link_libraries(stub_acl_mdl PRIVATE
169 acl_rt154 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 -ldl158 -ldl
@@ -204,10 +189,6 @@ target_include_directories(stub_acl_mdl_impl PRIVATE
204 ${TOP_DIR}/runtime/include/external/acl189 ${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- 
211target_compile_options(stub_acl_mdl_impl PRIVATE192target_compile_options(stub_acl_mdl_impl PRIVATE
212 -Wno-unused-parameter193 -Wno-unused-parameter
213)194)
@@ -219,7 +200,7 @@ set_target_properties(stub_acl_mdl_impl
219)200)
220 201 
221target_link_libraries(stub_acl_mdl_impl PRIVATE202target_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 -ldl206 -ldl
Mapi/acl_c/acl_model/CMakeLists.txt+2-2
@@ -79,7 +79,7 @@ if (${TARGET_SYSTEM_NAME} STREQUAL "Linux")
79 )79 )
80 80 
81 target_link_libraries(${ASCENDCL_C_COMPILE_TARGET} PRIVATE81 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_headers84 c_base_headers
85 c_sec_headers85 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} PRIVATE146 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_headers149 c_base_headers
150 c_sec_headers150 c_sec_headers
Mapi/atc/CMakeLists.txt+4-4
@@ -54,7 +54,7 @@ target_link_options(cmd_flag_info_static PRIVATE
54 )54 )
55 55 
56target_link_libraries(cmd_flag_info_static PRIVATE56target_link_libraries(cmd_flag_info_static PRIVATE
57- intf_pub57+ ge_intf_pub
58 c_sec58 c_sec
59 error_manager59 error_manager
60 slog60 slog
@@ -100,7 +100,7 @@ target_link_options(atc_static PRIVATE
100 )100 )
101 101 
102target_link_libraries(atc_static PRIVATE102target_link_libraries(atc_static PRIVATE
103- intf_pub103+ ge_intf_pub
104 cce_headers104 cce_headers
105 msprof_headers105 msprof_headers
106 ge_metadef_headers106 ge_metadef_headers
@@ -143,7 +143,7 @@ target_link_options(atc_atc.bin PRIVATE
143 )143 )
144 144 
145target_link_libraries(atc_atc.bin PRIVATE145target_link_libraries(atc_atc.bin PRIVATE
146- intf_pub146+ ge_intf_pub
147 atc_static147 atc_static
148 )148 )
149 149 
@@ -166,7 +166,7 @@ target_link_options(fwk_atc.bin PRIVATE
166 )166 )
167 167 
168target_link_libraries(fwk_atc.bin PRIVATE168target_link_libraries(fwk_atc.bin PRIVATE
169- intf_pub169+ ge_intf_pub
170 atc_static170 atc_static
171 )171 )
172 172 
Mapi/python/ge/ge/passes/CMakeLists.txt+1-1
@@ -38,7 +38,7 @@ target_include_directories(_ge_pass_native PRIVATE
38)38)
39 39 
40target_link_libraries(_ge_pass_native PRIVATE40target_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>
Mapi/python/ge/ge_api_c_wrapper/CMakeLists.txt+2-2
@@ -27,7 +27,7 @@ set(PYATC_WRAPPER_SRCS
27)27)
28 28 
29set(GE_API_C_WRAPPER_COMMON_LINK_LIBS29set(GE_API_C_WRAPPER_COMMON_LINK_LIBS
30- intf_pub30+ ge_intf_pub
31 slog_headers31 slog_headers
32 mmpa_headers32 mmpa_headers
33 ge_metadef_headers33 ge_metadef_headers
@@ -102,7 +102,7 @@ target_link_options(pyatc_wrapper PRIVATE
102 -Wl,-Bsymbolic102 -Wl,-Bsymbolic
103)103)
104target_link_libraries(pyatc_wrapper PRIVATE104target_link_libraries(pyatc_wrapper PRIVATE
105- intf_pub105+ ge_intf_pub
106 atc_static106 atc_static
107 -lrt107 -lrt
108 -ldl108 -ldl
Mapi/python/llm_wrapper/CMakeLists.txt+1-1
@@ -24,7 +24,7 @@ if (NOT ENABLE_TEST)
24 )24 )
25 25 
26 target_link_libraries(llm_wrapper PRIVATE26 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>
Mapi/session/CMakeLists.txt+2-2
@@ -59,7 +59,7 @@ target_link_options(ge_runner_v2 PRIVATE
59 59 
60target_link_libraries(ge_runner_v260target_link_libraries(ge_runner_v2
61 PRIVATE61 PRIVATE
62- intf_pub62+ ge_intf_pub
63 cce_headers63 cce_headers
64 ge_compiler64 ge_compiler
65 ge_executor_shared65 ge_executor_shared
@@ -144,7 +144,7 @@ target_link_options(ge_runner PRIVATE
144 144 
145target_link_libraries(ge_runner145target_link_libraries(ge_runner
146 PRIVATE146 PRIVATE
147- intf_pub147+ ge_intf_pub
148 cce_headers148 cce_headers
149 ge_compiler149 ge_compiler
150 ge_executor_shared150 ge_executor_shared
Mapi/session/jit_execution/CMakeLists.txt+1-1
@@ -39,7 +39,7 @@ target_compile_options(jit_exe PRIVATE ${AIR_COMMON_COMPILE_OPTION}
39)39)
40target_link_options(jit_exe PRIVATE ${AIR_COMMON_LINK_OPTION})40target_link_options(jit_exe PRIVATE ${AIR_COMMON_LINK_OPTION})
41target_link_libraries(jit_exe PRIVATE41target_link_libraries(jit_exe PRIVATE
42- $<BUILD_INTERFACE:intf_pub>42+ $<BUILD_INTERFACE:ge_intf_pub>
43 slog_headers43 slog_headers
44 ge_metadef_headers44 ge_metadef_headers
45 msprof_headers45 msprof_headers
Mapi/session/stub/CMakeLists.txt+3-3
@@ -42,7 +42,7 @@ target_compile_options(atc_stub_ge_compiler PRIVATE
42)42)
43 43 
44target_link_libraries(atc_stub_ge_compiler PRIVATE44target_link_libraries(atc_stub_ge_compiler PRIVATE
45- intf_pub45+ ge_intf_pub
46 ge_metadef_headers46 ge_metadef_headers
47 eager_style_graph_builder_base_headers47 eager_style_graph_builder_base_headers
48)48)
@@ -75,7 +75,7 @@ target_compile_options(fwk_stub_ge_runner_v2 PRIVATE
75 75 
76target_link_libraries(fwk_stub_ge_runner_v276target_link_libraries(fwk_stub_ge_runner_v2
77 PRIVATE77 PRIVATE
78- intf_pub78+ ge_intf_pub
79 ge_metadef_headers79 ge_metadef_headers
80 eager_style_graph_builder_base_headers80 eager_style_graph_builder_base_headers
81 PUBLIC81 PUBLIC
@@ -110,7 +110,7 @@ target_compile_options(fwk_stub_ge_runner PRIVATE
110 110 
111target_link_libraries(fwk_stub_ge_runner111target_link_libraries(fwk_stub_ge_runner
112 PRIVATE112 PRIVATE
113- intf_pub113+ ge_intf_pub
114 ge_metadef_headers114 ge_metadef_headers
115 eager_style_graph_builder_base_headers115 eager_style_graph_builder_base_headers
116 PUBLIC116 PUBLIC
Mbase/CMakeLists.txt+6-6
@@ -225,7 +225,7 @@ target_link_options(ge_common PRIVATE
225 225 
226target_link_libraries(ge_common226target_link_libraries(ge_common
227 PRIVATE227 PRIVATE
228- intf_pub228+ ge_intf_pub
229 msprof_headers229 msprof_headers
230 runtime_headers230 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 
296target_link_libraries(ge_common_base296target_link_libraries(ge_common_base
297 PRIVATE297 PRIVATE
298- intf_pub298+ ge_intf_pub
299 msprof_headers299 msprof_headers
300 adump_headers300 adump_headers
301 runtime_headers301 runtime_headers
@@ -369,7 +369,7 @@ target_include_directories(ge_common_static PRIVATE
369)369)
370 370 
371target_link_libraries(ge_common_static PRIVATE371target_link_libraries(ge_common_static PRIVATE
372- intf_pub372+ ge_intf_pub
373 slog_headers373 slog_headers
374 msprof_headers374 msprof_headers
375 adump_headers375 adump_headers
@@ -424,7 +424,7 @@ target_link_options(ge_common PRIVATE
424 424 
425target_link_libraries(ge_common425target_link_libraries(ge_common
426 PRIVATE426 PRIVATE
427- intf_pub427+ ge_intf_pub
428 msprof_headers428 msprof_headers
429 runtime_headers429 runtime_headers
430 datagw_headers430 datagw_headers
@@ -491,7 +491,7 @@ target_link_options(ge_common_base PRIVATE
491 491 
492target_link_libraries(ge_common_base492target_link_libraries(ge_common_base
493 PRIVATE493 PRIVATE
494- intf_pub494+ ge_intf_pub
495 msprof_headers495 msprof_headers
496 runtime_headers496 runtime_headers
497 datagw_headers497 datagw_headers
@@ -616,7 +616,7 @@ target_link_options(ge_common_stub PRIVATE
616 616 
617target_link_libraries(ge_common_stub617target_link_libraries(ge_common_stub
618 PRIVATE618 PRIVATE
619- intf_pub619+ ge_intf_pub
620 slog_headers620 slog_headers
621 ge_metadef_headers621 ge_metadef_headers
622 runtime_headers622 runtime_headers
Mbase/formats/CMakeLists.txt+1-1
@@ -64,7 +64,7 @@ target_link_options(formats PRIVATE
64)64)
65 65 
66target_link_libraries(formats PRIVATE66target_link_libraries(formats PRIVATE
67- intf_pub67+ ge_intf_pub
68 -Wl,--no-as-needed68 -Wl,--no-as-needed
69 graph69 graph
70 graph_base70 graph_base
Mbase/slice/CMakeLists.txt+1-1
@@ -49,7 +49,7 @@ target_link_options(slice PRIVATE
49 49 
50target_link_libraries(slice50target_link_libraries(slice
51 PRIVATE51 PRIVATE
52- intf_pub52+ ge_intf_pub
53 -Wl,--no-as-needed53 -Wl,--no-as-needed
54 graph54 graph
55 graph_base55 graph_base
Mclassify_rule.yaml+1-0
@@ -121,6 +121,7 @@ graphengine:
121 - runtime/v2/engine/aicpu121 - runtime/v2/engine/aicpu
122 - base/common/atrace122 - base/common/atrace
123 - graph_metadef/graph/stub/stub_operator_factory_impl.cc123 - graph_metadef/graph/stub/stub_operator_factory_impl.cc
124+ - graph_metadef/graph/normal_graph/ge_tensor.cc
GengChao
GengChaoGengChao6月3日

如果是异常分支确实执行不到,通过这种方式绕一下的话,需要马上提一个pr把这个文件从当前文件删除

likedislike
zhuhaoran5
zhuhaoran5
6月3日 评论:
124 llt:125 llt:
125 ut_check:true126 ut_check:true
126 st_check:true127 st_check:true
Rcmake/intf_pub_linux.cmakecmake/ge_intf_pub_linux.cmake+37-75
@@ -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+ 
11if ((CMAKE_BUILD_TYPE MATCHES GCOV) OR (CMAKE_BUILD_TYPE MATCHES Debug))13if ((CMAKE_BUILD_TYPE MATCHES GCOV) OR (CMAKE_BUILD_TYPE MATCHES Debug))
12 set(OPTIMIZE_OPTION "-O0")14 set(OPTIMIZE_OPTION "-O0")
13else ()15else ()
14 set(OPTIMIZE_OPTION "-O2")16 set(OPTIMIZE_OPTION "-O2")
15endif ()17endif ()
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 INTERFACE25+ $<BUILD_INTERFACE:intf_pub_base>
27- ${OPTIMIZE_OPTION}26+)
28- -Werror -fno-common -Wextra -Wfloat-equal -Wall -fPIC27+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 -g33 -g
38- --coverage -fprofile-arcs -ftest-coverage
39 -DFUNC_VISIBILITY34 -DFUNC_VISIBILITY
40 -DFMK_SUPPORT_DUMP35 -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 -lrt47 -lrt
69 -ldl48 -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 INTERFACE54+ ${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 INTERFACE62+########## 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 INTERFACE75+ $<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里的编译告警
117add_library(pybind_options INTERFACE)80add_library(pybind_options INTERFACE)
118- 
119target_compile_options(pybind_options INTERFACE81target_compile_options(pybind_options INTERFACE
120 -Wno-float-equal82 -Wno-float-equal
121 -Wno-missing-field-initializers83 -Wno-missing-field-initializers
Mcompiler/CMakeLists.txt+4-4
@@ -64,7 +64,7 @@ target_compile_definitions(ge_fusion_model_protos_obj PRIVATE
64 google=ascend_private64 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 
69target_compile_options(ge_fusion_model_protos_obj PRIVATE69target_compile_options(ge_fusion_model_protos_obj PRIVATE
70 -Werror70 -Werror
@@ -89,7 +89,7 @@ target_compile_definitions(ge_proto_common PRIVATE
89)89)
90 90 
91target_link_libraries(ge_proto_common PRIVATE91target_link_libraries(ge_proto_common PRIVATE
92- intf_pub92+ ge_intf_pub
93 ascend_protobuf93 ascend_protobuf
94)94)
95endif ()95endif ()
@@ -449,7 +449,7 @@ target_link_options(ge_compiler PRIVATE
449 449 
450target_link_libraries(ge_compiler450target_link_libraries(ge_compiler
451 PRIVATE451 PRIVATE
452- intf_pub452+ ge_intf_pub
453 cce_headers453 cce_headers
454 msprof_headers454 msprof_headers
455 static_mmpa455 static_mmpa
@@ -526,7 +526,7 @@ target_include_directories(ge_python_pass_bridge SYSTEM PRIVATE
526 526 
527target_link_libraries(ge_python_pass_bridge527target_link_libraries(ge_python_pass_bridge
528 PRIVATE528 PRIVATE
529- intf_pub529+ ge_intf_pub
530 register530 register
531 graph531 graph
532 unified_dlog532 unified_dlog
Mcompiler/engines/cpu_engine/common/CMakeLists.txt+1-1
@@ -62,7 +62,7 @@ add_library(aicpu_engine_common SHARED
62 62 
63##-----aicpu_engine_common63##-----aicpu_engine_common
64target_link_libraries(aicpu_engine_common PRIVATE64target_link_libraries(aicpu_engine_common PRIVATE
65- intf_pub65+ ge_intf_pub
66 msprof_headers66 msprof_headers
67 runtime_headers67 runtime_headers
68 cce_headers68 cce_headers
Mcompiler/engines/cpu_engine/cpu_engine/CMakeLists.txt+5-6
@@ -147,7 +147,6 @@ target_compile_definitions(host_cpu_opskernel_builder PRIVATE
147)147)
148 148 
149target_compile_definitions(aicpu_const_folding PRIVATE149target_compile_definitions(aicpu_const_folding PRIVATE
150- _FORTIFY_SOURCE=2
151 google=ascend_private150 google=ascend_private
152 LOG_CPP151 LOG_CPP
153 HOST_VISIBILITY152 HOST_VISIBILITY
@@ -160,7 +159,7 @@ target_link_options(aicpu_const_folding PRIVATE
160)159)
161 160 
162target_link_libraries(aicpu_ascend_engine PRIVATE161target_link_libraries(aicpu_ascend_engine PRIVATE
163- intf_pub162+ ge_intf_pub
164 msprof_headers163 msprof_headers
165 runtime_headers164 runtime_headers
166 cce_headers165 cce_headers
@@ -183,7 +182,7 @@ target_link_libraries(aicpu_ascend_engine PRIVATE
183)182)
184 183 
185target_link_libraries(host_cpu_engine PRIVATE184target_link_libraries(host_cpu_engine PRIVATE
186- intf_pub185+ ge_intf_pub
187 msprof_headers186 msprof_headers
188 runtime_headers187 runtime_headers
189 cce_headers188 cce_headers
@@ -206,7 +205,7 @@ target_link_libraries(host_cpu_engine PRIVATE
206)205)
207 206 
208target_link_libraries(host_cpu_opskernel_builder PRIVATE207target_link_libraries(host_cpu_opskernel_builder PRIVATE
209- intf_pub208+ ge_intf_pub
210 msprof_headers209 msprof_headers
211 runtime_headers210 runtime_headers
212 cce_headers211 cce_headers
@@ -231,7 +230,7 @@ target_link_libraries(host_cpu_opskernel_builder PRIVATE
231 230 
232if (BUILD_OPEN_PROJECT OR ENABLE_OPEN_SRC)231if (BUILD_OPEN_PROJECT OR ENABLE_OPEN_SRC)
233 target_link_libraries(aicpu_const_folding PRIVATE232 target_link_libraries(aicpu_const_folding PRIVATE
234- intf_pub233+ ge_intf_pub
235 aicpu_headers234 aicpu_headers
236 air_headers235 air_headers
237 mmpa_headers236 mmpa_headers
@@ -247,7 +246,7 @@ if (BUILD_OPEN_PROJECT OR ENABLE_OPEN_SRC)
247 )246 )
248else ()247else ()
249 target_link_libraries(aicpu_const_folding PRIVATE248 target_link_libraries(aicpu_const_folding PRIVATE
250- intf_pub249+ ge_intf_pub
251 air_headers250 air_headers
252 mmpa_headers251 mmpa_headers
253 -Wl,--no-as-needed252 -Wl,--no-as-needed
Mcompiler/engines/cpu_engine/cpu_engine/constant_folding_stub/CMakeLists.txt+1-1
@@ -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>)
Mcompiler/engines/cpu_engine/tf_engine/CMakeLists.txt+1-1
@@ -63,7 +63,7 @@ add_library(aicpu_tf_engine SHARED
63)63)
64###aicpu_ms_engine64###aicpu_ms_engine
65target_link_libraries(aicpu_tf_engine PRIVATE65target_link_libraries(aicpu_tf_engine PRIVATE
66- intf_pub66+ ge_intf_pub
67 msprof_headers67 msprof_headers
68 cce_headers68 cce_headers
69 air_headers69 air_headers
Mcompiler/engines/dvpp_engine/CMakeLists.txt+1-1
@@ -83,7 +83,7 @@ target_link_options(dvpp_engine PRIVATE
83)83)
84 84 
85target_link_libraries(dvpp_engine PRIVATE85target_link_libraries(dvpp_engine PRIVATE
86- intf_pub86+ ge_intf_pub
87 msprof_headers87 msprof_headers
88 runtime_headers88 runtime_headers
89 cce_headers89 cce_headers
Mcompiler/engines/ffts_engine/CMakeLists.txt+1-1
@@ -52,7 +52,7 @@ target_compile_options(ffts PRIVATE
52 -Wno-deprecated-declarations)52 -Wno-deprecated-declarations)
53 53 
54target_link_libraries(ffts PRIVATE54target_link_libraries(ffts PRIVATE
55- intf_pub55+ ge_intf_pub
56 mmpa_headers56 mmpa_headers
57 msprof_headers57 msprof_headers
58 runtime_headers58 runtime_headers
Mcompiler/engines/hccl_engine/hcom_gradient_split_tune/CMakeLists.txt+1-1
@@ -66,7 +66,7 @@ else()
66 )66 )
67 67
68 target_link_libraries(hcom_gradient_split_tune PRIVATE68 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>
Mcompiler/engines/hccl_engine/hcom_graph_adaptor/CMakeLists.txt+4-4
@@ -402,7 +402,7 @@ else()
402 402 
403 #hcom_graph_adaptor依赖的so,链接选项403 #hcom_graph_adaptor依赖的so,链接选项
404 target_link_libraries(hcom_graph_adaptor PRIVATE404 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 PRIVATE432 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 PRIVATE458 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 PRIVATE483 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>
Mcompiler/engines/local_engine/CMakeLists.txt+4-4
@@ -59,7 +59,7 @@ target_link_options(ge_local_engine PRIVATE
59)59)
60 60 
61target_link_libraries(ge_local_engine PRIVATE61target_link_libraries(ge_local_engine PRIVATE
62- intf_pub62+ ge_intf_pub
63 msprof_headers63 msprof_headers
64 runtime_headers64 runtime_headers
65 cce_headers65 cce_headers
@@ -109,7 +109,7 @@ target_link_options(atc_ge_local_engine PRIVATE
109)109)
110 110 
111target_link_libraries(atc_ge_local_engine PRIVATE111target_link_libraries(atc_ge_local_engine PRIVATE
112- intf_pub112+ ge_intf_pub
113 msprof_headers113 msprof_headers
114 runtime_headers114 runtime_headers
115 cce_headers115 cce_headers
@@ -160,7 +160,7 @@ target_link_options(ge_local_opskernel_builder PRIVATE
160)160)
161 161 
162target_link_libraries(ge_local_opskernel_builder PRIVATE162target_link_libraries(ge_local_opskernel_builder PRIVATE
163- intf_pub163+ ge_intf_pub
164 msprof_headers164 msprof_headers
165 runtime_headers165 runtime_headers
166 cce_headers166 cce_headers
@@ -212,7 +212,7 @@ target_link_options(atc_ge_local_opskernel_builder PRIVATE
212)212)
213 213 
214target_link_libraries(atc_ge_local_opskernel_builder PRIVATE214target_link_libraries(atc_ge_local_opskernel_builder PRIVATE
215- intf_pub215+ ge_intf_pub
216 msprof_headers216 msprof_headers
217 runtime_headers217 runtime_headers
218 cce_headers218 cce_headers
Mcompiler/engines/manager/engine/CMakeLists.txt+1-1
@@ -47,7 +47,7 @@ target_link_options(engine PRIVATE
47)47)
48 48 
49target_link_libraries(engine PRIVATE49target_link_libraries(engine PRIVATE
50- intf_pub50+ ge_intf_pub
51 ge_metadef_headers51 ge_metadef_headers
52 error_manager52 error_manager
53 runtime_headers53 runtime_headers
Mcompiler/engines/nn_engine/fusion/CMakeLists.txt+1-1
@@ -78,7 +78,7 @@ target_compile_definitions(fusion_pass PRIVATE
78 )78 )
79 79 
80target_link_libraries(fusion_pass PRIVATE80target_link_libraries(fusion_pass PRIVATE
81- intf_pub81+ ge_intf_pub
82 msprof_headers82 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>>
Mcompiler/engines/nn_engine/opskernel/CMakeLists.txt+1-1
@@ -32,7 +32,7 @@ target_compile_definitions(opskernel PRIVATE
32 )32 )
33 33 
34target_link_libraries(opskernel PRIVATE34target_link_libraries(opskernel PRIVATE
35- intf_pub35+ ge_intf_pub
36 mmpa_headers36 mmpa_headers
37 msprof_headers37 msprof_headers
38 runtime_headers38 runtime_headers
Mcompiler/engines/nn_engine/optimizer/CMakeLists.txt+1-1
@@ -114,7 +114,7 @@ target_compile_definitions(fe PRIVATE
114 )114 )
115 115 
116target_link_libraries(fe PRIVATE116target_link_libraries(fe PRIVATE
117- intf_pub117+ ge_intf_pub
118 msprof_headers118 msprof_headers
119 cce_headers119 cce_headers
120 $<$<BOOL:${BUILD_OPEN_PROJECT}>:op_compile_adapter_headers>120 $<$<BOOL:${BUILD_OPEN_PROJECT}>:op_compile_adapter_headers>
Mcompiler/engines/nn_engine/utils/CMakeLists.txt+1-1
@@ -42,7 +42,7 @@ target_compile_definitions(aicore_utils PRIVATE
42 42 
43target_link_libraries(aicore_utils43target_link_libraries(aicore_utils
44 PRIVATE44 PRIVATE
45- intf_pub45+ ge_intf_pub
46 msprof_headers46 msprof_headers
47 runtime_headers47 runtime_headers
48 -Wl,--no-as-needed48 -Wl,--no-as-needed
Mcompiler/engines/rts_engine/CMakeLists.txt+3-3
@@ -96,7 +96,7 @@ target_link_options(rts_engine PRIVATE
96)96)
97 97 
98target_link_libraries(rts_engine PRIVATE98target_link_libraries(rts_engine PRIVATE
99- intf_pub99+ ge_intf_pub
100 msprof_headers100 msprof_headers
101 runtime_headers101 runtime_headers
102 cce_headers102 cce_headers
@@ -149,7 +149,7 @@ target_compile_options(rts_engine_atc PRIVATE
149 )149 )
150 150 
151target_link_libraries(rts_engine_atc PRIVATE151target_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 
200target_link_libraries(rts_kernel_builder_host_static PRIVATE200target_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> graph203 $<BUILD_INTERFACE:runtime_headers> $<BUILD_INTERFACE:cce_headers> graph
204 register204 register
Mcompiler/graph/common/compress/CMakeLists.txt+4-4
@@ -32,7 +32,7 @@ target_compile_options(compress PRIVATE
32target_link_libraries(compress32target_link_libraries(compress
33 PRIVATE33 PRIVATE
34 runtime_headers34 runtime_headers
35- intf_pub35+ ge_intf_pub
36 -Wl,--no-as-needed36 -Wl,--no-as-needed
37 c_sec37 c_sec
38 -Wl,--as-needed38 -Wl,--as-needed
@@ -68,7 +68,7 @@ target_compile_options(compress_static PRIVATE
68 68 
69target_link_libraries(compress_static PRIVATE69target_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-needed72 -Wl,--no-as-needed
73 c_sec73 c_sec
74 -Wl,--as-needed74 -Wl,--as-needed
@@ -94,7 +94,7 @@ target_compile_options(compressweight PRIVATE
94 94 
95target_link_libraries(compressweight PRIVATE95target_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-needed98 -Wl,--no-as-needed
99 c_sec99 c_sec
100 compress100 compress
@@ -121,7 +121,7 @@ target_compile_options(compressweight_static PRIVATE
121 121 
122target_link_libraries(compressweight_static PRIVATE122target_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-needed125 -Wl,--no-as-needed
126 c_sec126 c_sec
127 compress127 compress
Mcompiler/graph/eager_style_graph_builder/es_base_struct/CMakeLists.txt+2-2
@@ -26,7 +26,7 @@ add_library(eager_style_graph_builder_base SHARED ${EAGER_STYLE_GRAPH_BUILDER})
26target_compile_options(eager_style_graph_builder_base PRIVATE ${AIR_COMMON_DYNAMIC_COMPILE_OPTION})26target_compile_options(eager_style_graph_builder_base PRIVATE ${AIR_COMMON_DYNAMIC_COMPILE_OPTION})
27target_link_libraries(eager_style_graph_builder_base27target_link_libraries(eager_style_graph_builder_base
28 PRIVATE28 PRIVATE
29- intf_pub29+ ge_intf_pub
30 slog_headers30 slog_headers
31 unified_dlog31 unified_dlog
32 air_headers32 air_headers
@@ -50,7 +50,7 @@ target_compile_options(eager_style_graph_builder_base_static PRIVATE ${AIR_COMMO
50 )50 )
51target_link_libraries(eager_style_graph_builder_base_static51target_link_libraries(eager_style_graph_builder_base_static
52 PRIVATE52 PRIVATE
53- intf_pub53+ ge_intf_pub
54 slog_headers54 slog_headers
55 unified_dlog55 unified_dlog
56 air_headers56 air_headers
Mcompiler/graph/eager_style_graph_builder/es_generator/CMakeLists.txt+3-3
@@ -19,7 +19,7 @@ add_library(geir_collector STATIC
19target_compile_options(geir_collector PRIVATE ${AIR_COMMON_COMPILE_OPTION})19target_compile_options(geir_collector PRIVATE ${AIR_COMMON_COMPILE_OPTION})
20 20 
21target_link_libraries(geir_collector PRIVATE21target_link_libraries(geir_collector PRIVATE
22- intf_pub22+ ge_intf_pub
23 graph23 graph
24 graph_base24 graph_base
25 metadef25 metadef
@@ -49,7 +49,7 @@ add_library(gen_esb_impl STATIC
49 49 
50target_compile_options(gen_esb_impl PRIVATE ${AIR_COMMON_COMPILE_OPTION})50target_compile_options(gen_esb_impl PRIVATE ${AIR_COMMON_COMPILE_OPTION})
51target_link_libraries(gen_esb_impl PRIVATE51target_link_libraries(gen_esb_impl PRIVATE
52- intf_pub52+ ge_intf_pub
53 graph53 graph
54 graph_base54 graph_base
55 error_manager55 error_manager
@@ -61,4 +61,4 @@ target_link_libraries(gen_esb_impl PRIVATE
61 )61 )
62add_executable(gen_esb main.cc)62add_executable(gen_esb main.cc)
63target_compile_options(gen_esb PRIVATE ${AIR_COMMON_COMPILE_OPTION})63target_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)
Mcompiler/opcompiler/op_compile_adapter/source/CMakeLists.txt+1-1
@@ -39,7 +39,7 @@ target_compile_definitions(op_compile_adapter PRIVATE
39 39 
40target_link_libraries(op_compile_adapter40target_link_libraries(op_compile_adapter
41 PRIVATE41 PRIVATE
42- intf_pub42+ ge_intf_pub
43 ge_metadef_headers43 ge_metadef_headers
44 msprof_headers44 msprof_headers
45 runtime_headers45 runtime_headers
Mdflow/base/CMakeLists.txt+1-1
@@ -68,7 +68,7 @@ target_link_options(data_flow_base PRIVATE
68)68)
69 69 
70target_link_libraries(data_flow_base PRIVATE70target_link_libraries(data_flow_base PRIVATE
71- intf_pub71+ ge_intf_pub
72 -Wl,--no-as-needed72 -Wl,--no-as-needed
73 ascend_protobuf73 ascend_protobuf
74 static_mmpa74 static_mmpa
Mdflow/compiler/CMakeLists.txt+1-1
@@ -96,7 +96,7 @@ target_link_options(dflow_runner PRIVATE
96 96 
97target_link_libraries(dflow_runner97target_link_libraries(dflow_runner
98 PRIVATE98 PRIVATE
99- intf_pub99+ ge_intf_pub
100 ge_compiler100 ge_compiler
101 ge_runner_v2101 ge_runner_v2
102 -Wl,--as-needed102 -Wl,--as-needed
Mdflow/compiler/pne/cpu/CMakeLists.txt+1-1
@@ -50,7 +50,7 @@ target_link_options(cpu_compiler PRIVATE
50)50)
51 51 
52target_link_libraries(cpu_compiler PRIVATE52target_link_libraries(cpu_compiler PRIVATE
53- intf_pub53+ ge_intf_pub
54 msprof_headers54 msprof_headers
55 static_mmpa55 static_mmpa
56 ge_proto_common56 ge_proto_common
Mdflow/compiler/pne/udf/CMakeLists.txt+1-1
@@ -55,7 +55,7 @@ target_link_options(udf_compiler PRIVATE
55)55)
56 56 
57target_link_libraries(udf_compiler PRIVATE57target_link_libraries(udf_compiler PRIVATE
58- intf_pub58+ ge_intf_pub
59 msprof_headers59 msprof_headers
60 static_mmpa60 static_mmpa
61 ge_proto_common61 ge_proto_common
Mdflow/deployer/CMakeLists.txt+7-7
@@ -62,7 +62,7 @@ target_link_options(npu_sched_model_loader PRIVATE
62 )62 )
63 63 
64target_link_libraries(npu_sched_model_loader PRIVATE64target_link_libraries(npu_sched_model_loader PRIVATE
65- intf_pub65+ ge_intf_pub
66 msprof_headers66 msprof_headers
67 datagw_headers67 datagw_headers
68 -Wl,--no-as-needed68 -Wl,--no-as-needed
@@ -194,7 +194,7 @@ target_link_options(model_deployer PRIVATE
194 )194 )
195 195 
196target_link_libraries(model_deployer PRIVATE196target_link_libraries(model_deployer PRIVATE
197- intf_pub197+ ge_intf_pub
198 acl_rt198 acl_rt
199 msprof_headers199 msprof_headers
200 cce_headers200 cce_headers
@@ -257,7 +257,7 @@ target_include_directories(deployer_daemon_static PUBLIC
257 )257 )
258 258 
259target_link_libraries(deployer_daemon_static PRIVATE259target_link_libraries(deployer_daemon_static PRIVATE
260- intf_pub260+ ge_intf_pub
261 msprof_headers261 msprof_headers
262 datagw_headers262 datagw_headers
263 air_headers263 air_headers
@@ -300,7 +300,7 @@ target_link_options(deployer_daemon PRIVATE
300 )300 )
301 301 
302target_link_libraries(deployer_daemon PRIVATE302target_link_libraries(deployer_daemon PRIVATE
303- intf_pub303+ ge_intf_pub
304 msprof_headers304 msprof_headers
305 datagw_headers305 datagw_headers
306 air_headers306 air_headers
@@ -386,7 +386,7 @@ target_include_directories(npu_executor_static PUBLIC
386 )386 )
387 387 
388target_link_libraries(npu_executor_static PRIVATE388target_link_libraries(npu_executor_static PRIVATE
389- intf_pub389+ ge_intf_pub
390 msprof_headers390 msprof_headers
391 datagw_headers391 datagw_headers
392 air_headers392 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 
432target_link_libraries(npu_executor_main PRIVATE432target_link_libraries(npu_executor_main PRIVATE
433- intf_pub433+ ge_intf_pub
434 datagw_headers434 datagw_headers
435 cce_headers435 cce_headers
436 hccl_headers436 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 
538target_link_libraries(host_cpu_executor_main PRIVATE538target_link_libraries(host_cpu_executor_main PRIVATE
539- intf_pub539+ ge_intf_pub
540 datagw_headers540 datagw_headers
541 hccl_headers541 hccl_headers
542 air_headers542 air_headers
Mdflow/flow_graph/CMakeLists.txt+1-1
@@ -50,7 +50,7 @@ if (NOT TARGET flow_graph)
50 50 
51 target_link_libraries(flow_graph51 target_link_libraries(flow_graph
52 PRIVATE52 PRIVATE
53- intf_pub53+ ge_intf_pub
54 static_mmpa54 static_mmpa
55 -Wl,--no-as-needed55 -Wl,--no-as-needed
56 graph_base56 graph_base
Mdflow/llm_datadist/v1/CMakeLists.txt+1-1
@@ -43,7 +43,7 @@ target_compile_options(llm_engine PRIVATE
43 -ftrapv)43 -ftrapv)
44 44 
45target_link_libraries(llm_engine PRIVATE45target_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>
Mdflow/proto/CMakeLists.txt+1-1
@@ -20,7 +20,7 @@ add_dependencies(flow_graph_protos_obj data_flow_protos)
20target_compile_definitions(flow_graph_protos_obj PRIVATE20target_compile_definitions(flow_graph_protos_obj PRIVATE
21 google=ascend_private21 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)
24target_compile_options(flow_graph_protos_obj PRIVATE24target_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>
Mdflow/pydflow/wrapper/CMakeLists.txt+2-2
@@ -18,7 +18,7 @@ target_include_directories(dflow_wrapper PRIVATE
18)18)
19 19 
20target_link_libraries(dflow_wrapper PRIVATE20target_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 
66target_link_libraries(data_wrapper PRIVATE66target_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>
Mdflow/pydflow/wrapper/flow_func_wrapper/CMakeLists.txt+1-1
@@ -18,7 +18,7 @@ target_include_directories(flowfunc_wrapper PRIVATE
18)18)
19 19 
20target_link_libraries(flowfunc_wrapper PRIVATE20target_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>
Mdflow/udf/CMakeLists.txt+2-2
@@ -84,7 +84,7 @@ target_include_directories(udf_static PUBLIC
84target_link_libraries(udf_static PRIVATE84target_link_libraries(udf_static PRIVATE
85 -ldl85 -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 
122target_link_libraries(udf_executor PRIVATE122target_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>
Mdflow/udf/built_in/CMakeLists.txt+1-1
@@ -36,7 +36,7 @@ target_compile_options(built_in_flowfunc PRIVATE
36)36)
37 37 
38target_link_libraries(built_in_flowfunc PRIVATE38target_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>
Mdflow/udf/cmake/device/CMakeLists.txt+1-1
@@ -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# -----------------------------------------------------------------------------------------------------------
10include(func.cmake)10include(func.cmake)
11-include(${GE_DIR}/cmake/intf_pub_linux.cmake)11+include(${GE_DIR}/cmake/ge_intf_pub_linux.cmake)
12include(${GE_DIR}/cmake/air_headers.cmake)12include(${GE_DIR}/cmake/air_headers.cmake)
13add_cann_third_party(protobuf)13add_cann_third_party(protobuf)
14include(seccomp.cmake)14include(seccomp.cmake)
Mdflow/udf/flow_func/CMakeLists.txt+1-1
@@ -58,7 +58,7 @@ target_compile_options(flow_func PRIVATE
58)58)
59 59 
60target_link_libraries(flow_func PRIVATE60target_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>
Mdflow/udf/reader_writer/CMakeLists.txt+1-1
@@ -36,7 +36,7 @@ target_compile_options(reader_writer PRIVATE
36)36)
37 37 
38target_link_libraries(reader_writer PRIVATE38target_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 -ldl42 -ldl
Mdflow/udf/stubs/seccomp/CMakeLists.txt+1-1
@@ -24,6 +24,6 @@ set_target_properties(seccomp_stub PROPERTIES
24 SOVERSION 2)24 SOVERSION 2)
25 25 
26target_link_libraries(seccomp_stub PRIVATE26target_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)
Mdflow/udf/stubs/stackcore/CMakeLists.txt+1-1
@@ -27,5 +27,5 @@ add_library(stackcore SHARED
27)27)
28 28 
29target_link_libraries(stackcore PRIVATE29target_link_libraries(stackcore PRIVATE
30- $<BUILD_INTERFACE:intf_pub>30+ $<BUILD_INTERFACE:ge_intf_pub>
31)31)
Mdflow/udf/toolchain/dump/CMakeLists.txt+1-1
@@ -61,7 +61,7 @@ target_compile_options(udf_dump PRIVATE
61)61)
62 62 
63target_link_libraries(udf_dump PRIVATE63target_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>
Mdflow/udf/toolchain/profiling/CMakeLists.txt+1-1
@@ -31,7 +31,7 @@ target_compile_options(udf_profiling PRIVATE
31)31)
32 32 
33target_link_libraries(udf_profiling PRIVATE33target_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)
Mgraph_metadef/CMakeLists.txt+1-1
@@ -19,7 +19,7 @@ if (NOT ENABLE_OPEN_SRC)
19endif()19endif()
20 20 
21message(STATUS "Variables in graph metadef project:")21message(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)
23include(${AIR_CODE_DIR}/cmake/function.cmake)23include(${AIR_CODE_DIR}/cmake/function.cmake)
24add_subdirectory(proto)24add_subdirectory(proto)
25add_subdirectory(graph)25add_subdirectory(graph)
Mgraph_metadef/exe_graph/CMakeLists.txt+2-3
@@ -45,7 +45,7 @@ target_include_directories(lowering PRIVATE
45)45)
46 46 
47target_link_libraries(lowering PRIVATE47target_link_libraries(lowering PRIVATE
48- intf_pub48+ ge_intf_pub
49 mmpa_headers49 mmpa_headers
50 ge_metadef_headers50 ge_metadef_headers
51 error_manager_headers51 error_manager_headers
@@ -127,14 +127,13 @@ target_include_directories(stub_lowering PRIVATE
127target_compile_options(stub_lowering PRIVATE127target_compile_options(stub_lowering PRIVATE
128 -Wfloat-equal128 -Wfloat-equal
129 -fno-common129 -fno-common
130- -Os
131 -Werror=return-type130 -Werror=return-type
132 -Wno-unused-parameter131 -Wno-unused-parameter
133)132)
134 133 
135target_link_libraries(stub_lowering134target_link_libraries(stub_lowering
136 PRIVATE135 PRIVATE
137- intf_pub136+ ge_intf_pub_Os
138 c_sec_headers137 c_sec_headers
139 PUBLIC138 PUBLIC
140 ge_metadef_headers139 ge_metadef_headers
Mgraph_metadef/graph/CMakeLists.txt+5-6
@@ -176,7 +176,7 @@ target_link_options(graph_base PRIVATE
176 176 
177target_link_libraries(graph_base177target_link_libraries(graph_base
178 PRIVATE178 PRIVATE
179- intf_pub179+ ge_intf_pub
180 static_mmpa180 static_mmpa
181 -Wl,--no-as-needed181 -Wl,--no-as-needed
182 c_sec182 c_sec
@@ -247,7 +247,7 @@ target_link_options(graph PRIVATE
247 247 
248target_link_libraries(graph248target_link_libraries(graph
249 PRIVATE249 PRIVATE
250- intf_pub250+ ge_intf_pub
251 static_mmpa251 static_mmpa
252 -Wl,--no-as-needed252 -Wl,--no-as-needed
253 c_sec253 c_sec
@@ -305,7 +305,7 @@ else()
305 305 
306 target_link_libraries(graph_share306 target_link_libraries(graph_share
307 PRIVATE307 PRIVATE
308- intf_pub308+ ge_intf_pub
309 static_mmpa309 static_mmpa
310 -Wl,--no-as-needed310 -Wl,--no-as-needed
311 c_sec311 c_sec
@@ -425,14 +425,13 @@ target_include_directories(atc_stub_graph PRIVATE
425target_compile_options(atc_stub_graph PRIVATE425target_compile_options(atc_stub_graph PRIVATE
426 -Wfloat-equal426 -Wfloat-equal
427 -fno-common427 -fno-common
428- -Os
429 -Werror=return-type428 -Werror=return-type
430 -Wno-unused-parameter429 -Wno-unused-parameter
431)430)
432 431 
433target_link_libraries(atc_stub_graph432target_link_libraries(atc_stub_graph
434 PRIVATE433 PRIVATE
435- intf_pub434+ ge_intf_pub_Os
436 mmpa_headers435 mmpa_headers
437 c_sec436 c_sec
438 slog_headers437 slog_headers
@@ -490,7 +489,7 @@ target_include_directories(fwk_stub_graph PRIVATE
490 489 
491target_link_libraries(fwk_stub_graph490target_link_libraries(fwk_stub_graph
492 PRIVATE491 PRIVATE
493- intf_pub492+ ge_intf_pub
494 static_mmpa493 static_mmpa
495 c_sec494 c_sec
496 error_manager_headers495 error_manager_headers
Mgraph_metadef/graph/expression/CMakeLists.txt+1-1
@@ -39,7 +39,7 @@ target_link_options(aihac_symbolizer PRIVATE
39 39 
40target_link_libraries(aihac_symbolizer40target_link_libraries(aihac_symbolizer
41 PRIVATE41 PRIVATE
42- intf_pub42+ ge_intf_pub
43 static_mmpa43 static_mmpa
44 -Wl,--no-as-needed44 -Wl,--no-as-needed
45 c_sec45 c_sec
Mgraph_metadef/graph/normal_graph/ge_tensor.cc+2-2
@@ -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;
Mgraph_metadef/proto/CMakeLists.txt+5-5
@@ -85,7 +85,7 @@ add_dependencies(metadef_graph_protos_obj metadef_protos)
85target_compile_definitions(metadef_graph_protos_obj PRIVATE85target_compile_definitions(metadef_graph_protos_obj PRIVATE
86 google=ascend_private86 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)
89target_compile_options(metadef_graph_protos_obj PRIVATE89target_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)
99target_compile_definitions(metadef_tensorflow_protos_obj PRIVATE99target_compile_definitions(metadef_tensorflow_protos_obj PRIVATE
100 google=ascend_private100 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)
103target_compile_options(metadef_tensorflow_protos_obj PRIVATE103target_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)
113target_compile_definitions(metadef_aicpu_protos_obj PRIVATE113target_compile_definitions(metadef_aicpu_protos_obj PRIVATE
114 google=ascend_private114 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)
117target_compile_options(metadef_aicpu_protos_obj PRIVATE117target_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)
127target_compile_definitions(metadef_attr_group_protos_obj PRIVATE127target_compile_definitions(metadef_attr_group_protos_obj PRIVATE
128 google=ascend_private128 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)
131target_compile_options(metadef_attr_group_protos_obj PRIVATE131target_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 
169target_link_libraries(stub_op_common169target_link_libraries(stub_op_common
170 PRIVATE170 PRIVATE
171- intf_pub171+ ge_intf_pub
172 c_sec172 c_sec
173 PUBLIC173 PUBLIC
174 ge_metadef_headers174 ge_metadef_headers
Mgraph_metadef/register/CMakeLists.txt+4-4
@@ -127,7 +127,7 @@ target_link_libraries(register
127 PUBLIC127 PUBLIC
128 ge_metadef_headers128 ge_metadef_headers
129 PRIVATE129 PRIVATE
130- intf_pub130+ ge_intf_pub
131 msprof_headers131 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
197target_link_libraries(register_static PRIVATE197target_link_libraries(register_static PRIVATE
198 c_sec198 c_sec
199 json199 json
200- intf_pub200+ ge_intf_pub
201 slog_headers201 slog_headers
202 msprof_headers202 msprof_headers
203 mmpa_headers203 mmpa_headers
@@ -253,7 +253,7 @@ target_compile_definitions(op_tiling_o2 PRIVATE
253)253)
254 254 
255target_link_libraries(op_tiling_o2 PRIVATE255target_link_libraries(op_tiling_o2 PRIVATE
256- intf_pub256+ ge_intf_pub
257 slog_headers257 slog_headers
258 mmpa_headers258 mmpa_headers
259 ge_metadef_headers259 ge_metadef_headers
@@ -349,7 +349,7 @@ target_compile_options(stub_register_options INTERFACE
349 349 
350target_link_libraries(stub_register350target_link_libraries(stub_register
351 PRIVATE351 PRIVATE
352- intf_pub352+ ge_intf_pub
353 stub_register_options353 stub_register_options
354 slog_headers354 slog_headers
355 msprof_headers355 msprof_headers
Mgraph_metadef/register/op_tiling/op_tiling.cc+2-1
@@ -10,6 +10,7 @@
10 10 
11#include "register/op_tiling.h"11#include "register/op_tiling.h"
12 12 
13+#include <cinttypes>
13#include <nlohmann/json.hpp>14#include <nlohmann/json.hpp>
14#include "graph/operator.h"15#include "graph/operator.h"
15#include "framework/common/debug/ge_log.h"16#include "framework/common/debug/ge_log.h"
@@ -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 }
Minc/graph_metadef/register/host_cpu_context.h+0-1
@@ -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 ge25} // namespace ge
27 26 
Mparser/CMakeLists.txt+5-5
@@ -70,7 +70,7 @@ add_dependencies(parser_graph_library_proto_obj parser_protos)
70target_compile_definitions(parser_graph_library_proto_obj PRIVATE70target_compile_definitions(parser_graph_library_proto_obj PRIVATE
71 google=ascend_private71 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)
74target_compile_options(parser_graph_library_proto_obj PRIVATE74target_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)
84target_compile_definitions(parser_tensorflow_protos_obj PRIVATE84target_compile_definitions(parser_tensorflow_protos_obj PRIVATE
85 google=ascend_private85 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)
88target_compile_options(parser_tensorflow_protos_obj PRIVATE88target_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)
98target_compile_definitions(parser_onnx_protos_obj PRIVATE98target_compile_definitions(parser_onnx_protos_obj PRIVATE
99 google=ascend_private99 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)
102target_compile_options(parser_onnx_protos_obj PRIVATE102target_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)
112target_compile_definitions(parser_caffe_proto_obj PRIVATE112target_compile_definitions(parser_caffe_proto_obj PRIVATE
113 google=ascend_private113 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)
116target_compile_options(parser_caffe_proto_obj PRIVATE116target_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 
140target_link_libraries(_caffe_parser140target_link_libraries(_caffe_parser
141 PRIVATE141 PRIVATE
142- intf_pub142+ ge_intf_pub
143 -Wl,--no-as-needed143 -Wl,--no-as-needed
144 ascend_protobuf144 ascend_protobuf
145 -Wl,--as-needed145 -Wl,--as-needed
Mparser/parser/CMakeLists.txt+2-2
@@ -80,7 +80,7 @@ target_link_options(fmk_parser PRIVATE
80 80 
81target_link_libraries(fmk_parser81target_link_libraries(fmk_parser
82 PRIVATE82 PRIVATE
83- intf_pub83+ ge_intf_pub
84 air_headers84 air_headers
85 json85 json
86 PUBLIC86 PUBLIC
@@ -139,7 +139,7 @@ target_include_directories(fmk_parser_stub PRIVATE
139)139)
140 140 
141target_link_libraries(fmk_parser_stub PRIVATE141target_link_libraries(fmk_parser_stub PRIVATE
142- intf_pub142+ ge_intf_pub
143 ge_metadef_headers143 ge_metadef_headers
144)144)
145 145 
Mparser/parser/common/CMakeLists.txt+1-1
@@ -70,7 +70,7 @@ target_link_options(parser_common PRIVATE
70 70 
71target_link_libraries(parser_common71target_link_libraries(parser_common
72 PRIVATE72 PRIVATE
73- intf_pub73+ ge_intf_pub
74 air_headers74 air_headers
75 static_mmpa75 static_mmpa
76 -Wl,--no-as-needed76 -Wl,--no-as-needed
Mparser/parser/func_to_graph/CMakeLists.txt+1-1
@@ -29,7 +29,7 @@ target_compile_options(func2graph PRIVATE
29)29)
30 30 
31target_link_libraries(func2graph PUBLIC31target_link_libraries(func2graph PUBLIC
32- intf_pub32+ ge_intf_pub
33 parser_headers33 parser_headers
34 ascend_protobuf_static34 ascend_protobuf_static
35)35)
Mparser/parser/onnx/CMakeLists.txt+2-2
@@ -55,7 +55,7 @@ target_link_options(fmk_onnx_parser PRIVATE
55 55 
56target_link_libraries(fmk_onnx_parser56target_link_libraries(fmk_onnx_parser
57 PRIVATE57 PRIVATE
58- intf_pub58+ ge_intf_pub
59 air_headers59 air_headers
60 static_mmpa60 static_mmpa
61 -Wl,--no-as-needed61 -Wl,--no-as-needed
@@ -109,7 +109,7 @@ target_include_directories(fmk_onnx_parser_stub PRIVATE
109)109)
110 110 
111target_link_libraries(fmk_onnx_parser_stub PRIVATE111target_link_libraries(fmk_onnx_parser_stub PRIVATE
112- intf_pub112+ ge_intf_pub
113 ge_metadef_headers113 ge_metadef_headers
114)114)
115 115 
Mruntime/c/CMakeLists.txt+1-0
@@ -9,5 +9,6 @@
9# -----------------------------------------------------------------------------------------------------------9# -----------------------------------------------------------------------------------------------------------
10cmake_minimum_required(VERSION 3.14)10cmake_minimum_required(VERSION 3.14)
11set(AIR_CODE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../)11set(AIR_CODE_DIR ${CMAKE_CURRENT_LIST_DIR}/../../)
12+include(${AIR_CODE_DIR}/cmake/ge_intf_pub_linux.cmake)
12add_subdirectory(executor)13add_subdirectory(executor)
13add_subdirectory(dbg)14add_subdirectory(dbg)
Mruntime/c/dbg/CMakeLists.txt+3-4
@@ -57,7 +57,6 @@ if(${TARGET_SYSTEM_NAME} STREQUAL "Linux")
57 )57 )
58 58 
59 target_compile_options(ge_dbg_c PRIVATE59 target_compile_options(ge_dbg_c PRIVATE
60- -Os
61 -fno-common60 -fno-common
62 -Wextra61 -Wextra
63 -Wfloat-equal62 -Wfloat-equal
@@ -69,7 +68,7 @@ if(${TARGET_SYSTEM_NAME} STREQUAL "Linux")
69 )68 )
70 69 
71 target_link_libraries(ge_dbg_c PRIVATE70 target_link_libraries(ge_dbg_c PRIVATE
72- intf_pub71+ ge_intf_pub_Os
73 c_sec_headers72 c_sec_headers
74 msprof_headers73 msprof_headers
75 npu_runtime_headers74 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 PRIVATE117 target_link_libraries(ge_dbg_c_static_stub PRIVATE
119- intf_pub118+ ge_intf_pub
120 c_sec_headers119 c_sec_headers
121 msprof_headers120 msprof_headers
122 c_mmpa_headers121 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 PRIVATE162 target_link_libraries(ge_dbg_c_static_debug PRIVATE
164- intf_pub163+ ge_intf_pub
165 c_sec_headers164 c_sec_headers
166 msprof_headers165 msprof_headers
167 npu_runtime_headers166 npu_runtime_headers
Mruntime/c/executor/CMakeLists.txt+1-2
@@ -43,7 +43,6 @@ target_include_directories(ge_executor_c_static PRIVATE
43)43)
44 44 
45set(COMMON_COMPILE_OPTIONS45set(COMMON_COMPILE_OPTIONS
46- -Os
47 -fvisibility=hidden46 -fvisibility=hidden
48 -fno-common47 -fno-common
49 -Wextra48 -Wextra
@@ -70,7 +69,7 @@ elseif(${TARGET_SYSTEM_NAME} STREQUAL "Linux")
70endif()69endif()
71 70 
72target_link_libraries(ge_executor_c_static PRIVATE71target_link_libraries(ge_executor_c_static PRIVATE
73- $<BUILD_INTERFACE:intf_pub>72+ $<BUILD_INTERFACE:ge_intf_pub_Os>
74 c_sec_headers73 c_sec_headers
75 msprof_headers74 msprof_headers
76 -Wl,--whole-archive75 -Wl,--whole-archive
Mruntime/om2/CMakeLists.txt+1-1
@@ -52,7 +52,7 @@ target_include_directories(om2_executor PRIVATE
52 52 
53target_link_libraries(om2_executor PRIVATE53target_link_libraries(om2_executor PRIVATE
54 ${AIR_COMMON_LINK_OPTION}54 ${AIR_COMMON_LINK_OPTION}
55- intf_pub55+ ge_intf_pub
56 slog_headers56 slog_headers
57 msprof_headers57 msprof_headers
58 adump_headers58 adump_headers
Mruntime/stub/CMakeLists.txt+2-2
@@ -75,7 +75,7 @@ add_dependencies(gert_stub stub_gert)
75target_include_directories(gert_stub PRIVATE ${GERT_INCLUDING_PATH})75target_include_directories(gert_stub PRIVATE ${GERT_INCLUDING_PATH})
76target_compile_definitions(gert_stub PRIVATE ${GERT_COMPILE_DEF})76target_compile_definitions(gert_stub PRIVATE ${GERT_COMPILE_DEF})
77target_link_libraries(gert_stub PRIVATE77target_link_libraries(gert_stub PRIVATE
78- intf_pub78+ ge_intf_pub_Os
79 slog_headers79 slog_headers
80 ge_metadef_headers80 ge_metadef_headers
81 mmpa_headers81 mmpa_headers
@@ -89,7 +89,7 @@ target_link_libraries(gert_stub PRIVATE
89)89)
90 90 
91target_compile_options(gert_stub PRIVATE91target_compile_options(gert_stub PRIVATE
92- -fvisibility=hidden -Os -fno-common -Wfloat-equal92+ -fvisibility=hidden -fno-common -Wfloat-equal
93 -Werror=return-type93 -Werror=return-type
94 -Wno-unused-parameter94 -Wno-unused-parameter
95)95)
Mruntime/v1/CMakeLists.txt+6-7
@@ -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=hidden202 -fvisibility=hidden
204 -fvisibility-inlines-hidden203 -fvisibility-inlines-hidden
205 -ffunction-sections204 -ffunction-sections
@@ -235,7 +234,7 @@ target_include_directories(ge_executor PRIVATE
235)234)
236 235 
237target_link_libraries(ge_executor PRIVATE236target_link_libraries(ge_executor PRIVATE
238- intf_pub237+ ge_intf_pub_Os
239 cce_headers238 cce_headers
240 slog_headers239 slog_headers
241 msprof_headers240 msprof_headers
@@ -305,7 +304,7 @@ target_link_options(ge_executor_shared PRIVATE
305 304 
306target_link_libraries(ge_executor_shared305target_link_libraries(ge_executor_shared
307 PRIVATE306 PRIVATE
308- intf_pub307+ 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_headers310 msprof_headers
@@ -386,7 +385,7 @@ target_link_options(davinci_executor PRIVATE
386 385 
387target_link_libraries(davinci_executor386target_link_libraries(davinci_executor
388 PRIVATE387 PRIVATE
389- intf_pub388+ 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_headers391 msprof_headers
@@ -483,7 +482,7 @@ target_link_options(hybrid_executor PRIVATE
483 482 
484target_link_libraries(hybrid_executor483target_link_libraries(hybrid_executor
485 PRIVATE484 PRIVATE
486- intf_pub485+ 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_headers488 msprof_headers
@@ -561,7 +560,7 @@ add_dependencies(hybrid_executor_stub
561)560)
562 561 
563target_compile_options(hybrid_executor_stub PRIVATE562target_compile_options(hybrid_executor_stub PRIVATE
564- -fno-common -Wfloat-equal -fvisibility=default -Os563+ -fno-common -Wfloat-equal -fvisibility=default
565 -Werror=return-type564 -Werror=return-type
566 -Wno-unused-parameter565 -Wno-unused-parameter
567)566)
@@ -591,7 +590,7 @@ target_include_directories(hybrid_executor_stub PRIVATE
591)590)
592 591 
593target_link_libraries(hybrid_executor_stub PRIVATE592target_link_libraries(hybrid_executor_stub PRIVATE
594- intf_pub593+ ge_intf_pub_Os
595 slog_headers594 slog_headers
596 msprof_headers595 msprof_headers
597 mmpa_headers596 mmpa_headers
Mruntime/v2/CMakeLists.txt+2-2
@@ -60,7 +60,7 @@ target_include_directories(gert_static PUBLIC
60 )60 )
61target_compile_definitions(gert_static PRIVATE ${GERT_COMPILE_DEF})61target_compile_definitions(gert_static PRIVATE ${GERT_COMPILE_DEF})
62target_link_libraries(gert_static PRIVATE62target_link_libraries(gert_static PRIVATE
63- intf_pub63+ ge_intf_pub
64 cce_headers64 cce_headers
65 slog_headers65 slog_headers
66 msprof_headers66 msprof_headers
@@ -89,7 +89,7 @@ target_include_directories(gert PRIVATE
89)89)
90target_compile_definitions(gert PRIVATE ${GERT_COMPILE_DEF})90target_compile_definitions(gert PRIVATE ${GERT_COMPILE_DEF})
91target_link_libraries(gert PRIVATE91target_link_libraries(gert PRIVATE
92- intf_pub92+ 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_headers95 msprof_headers
Mtests/ge/st/stubs/CMakeLists.txt+1-1
@@ -38,4 +38,4 @@ target_compile_options(st_stubs PRIVATE
38target_link_libraries(st_stubs PUBLIC intf_llt_pub ge_graph_dsl ge_running_env GTestShared::gtest GTestShared::gmock GTestShared::gmock_main datagw_headers)38target_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 
40add_library(memset_stubs STATIC ${CMAKE_CURRENT_SOURCE_DIR}/src/memset.c)40add_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)
Mtests/graph_metadef/ut/expression/CMakeLists.txt+1-1
@@ -39,7 +39,7 @@ target_compile_definitions(ut_expression PRIVATE
39 LOG_CPP39 LOG_CPP
40)40)
41 41 
42-# intf_pub包含stdc++11 当前需要按照更高版本来编译ut42+# ge_intf_pub包含stdc++11 当前需要按照更高版本来编译ut
43target_link_libraries(ut_expression PRIVATE43target_link_libraries(ut_expression PRIVATE
44 -lgcov44 -lgcov
45 -Wl,--no-as-needed45 -Wl,--no-as-needed