fixed compile issue

ge/CMakeLists.txt

@@ -10,34 +10,62 @@ elseif (ENABLE_D)
     add_subdirectory(ge_runtime)
 endif ()
 
-set(PROTO_LIST
-    "${METADEF_DIR}/proto/fusion_model.proto"
-    "${GE_CODE_DIR}/ge/proto/optimizer_priority.proto"
-)
-
-set(PROTO_CLIENT_LIST
-    "${METADEF_DIR}/proto/ge_api.proto"
-)
-
-set(PROTO_HEADER_LIST
+set(GRAPHENGINE_PROTO_LIST
     "${METADEF_DIR}/proto/om.proto"
     "${METADEF_DIR}/proto/task.proto"
     "${METADEF_DIR}/proto/insert_op.proto"
     "${METADEF_DIR}/proto/ge_ir.proto"
+    "${METADEF_DIR}/proto/ge_api.proto"
+    "${METADEF_DIR}/proto/fusion_model.proto"
+    "${METADEF_DIR}/proto/optimizer_priority.proto"
     "${METADEF_DIR}/proto/fwk_adapter.proto"
     "${METADEF_DIR}/proto/op_mapping.proto"
+    "${METADEF_DIR}/proto/dump_task.proto"
+    "${METADEF_DIR}/proto/tensorflow/graph_library.proto"
+    "${METADEF_DIR}/proto/tensorflow/graph.proto"
+    "${METADEF_DIR}/proto/tensorflow/node_def.proto"
+    "${METADEF_DIR}/proto/tensorflow/function.proto"
+    "${METADEF_DIR}/proto/tensorflow/versions.proto"
+    "${METADEF_DIR}/proto/tensorflow/attr_value.proto"
+    "${METADEF_DIR}/proto/tensorflow/op_def.proto"
+    "${METADEF_DIR}/proto/tensorflow/tensor.proto"
+    "${METADEF_DIR}/proto/tensorflow/tensor_shape.proto"
+    "${METADEF_DIR}/proto/tensorflow/types.proto"
+    "${METADEF_DIR}/proto/tensorflow/resource_handle.proto"
+)
+
+protobuf_generate(graphengine_protos GRAPHENGINE_PROTO_SRCS GRAPHENGINE_PROTO_HDRS ${GRAPHENGINE_PROTO_LIST} TARGET)
+
+set(GE_FUSION_MODEL_PROTO_SRCS
+    "${CMAKE_BINARY_DIR}/proto/graphengine_protos/proto/fusion_model.pb.cc"
+    "${CMAKE_BINARY_DIR}/proto/graphengine_protos/proto/optimizer_priority.pb.cc"
 )
 
-protobuf_generate(ge PROTO_SRCS PROTO_HDRS ${PROTO_LIST})
-protobuf_generate(ge PROTO_CLIENT_SRCS PROTO_CLIENT_HDRS ${PROTO_CLIENT_LIST})
-protobuf_generate(ge PROTO_HEADER_SRCS PROTO_HEADER_HDRS ${PROTO_HEADER_LIST})
-protobuf_generate(ge_client PROTO_CLIENT_HEADER_SRCS PROTO_CLIENT_HEADER_HDRS ${PROTO_HEADER_LIST})
+
+add_library(ge_fusion_model_protos_obj OBJECT ${GE_FUSION_MODEL_PROTO_SRCS})
+add_dependencies(ge_fusion_model_protos_obj graphengine_protos)
+target_include_directories(ge_fusion_model_protos_obj PRIVATE
+    #### blue zone ####
+    ${PROTOBUF_SHARED_PKG_DIR}/include
+    #### yellow zone ####
+    ${ASCEND_PROTOBUF_SHARED_PKG_DIR}/include
+)
+target_compile_definitions(ge_fusion_model_protos_obj PRIVATE
+    google=ascend_private
+)
+target_link_libraries(ge_fusion_model_protos_obj PRIVATE ascend_protobuf $<BUILD_INTERFACE:intf_pub>)
+target_compile_options(ge_fusion_model_protos_obj PRIVATE
+    $<$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>:-O2 -fPIC>
+    $<$<OR:$<STREQUAL:${PRODUCT_SIDE},host>,$<STREQUAL:${ENABLE_OPEN_SRC},True>>:-fexceptions>
+    $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>: -Wno-deprecated-declarations -fno-common>
+    $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Debug>>:/MTd>
+    $<$<AND:$<STREQUAL:${TARGET_SYSTEM_NAME},Windows>,$<STREQUAL:${CMAKE_CONFIGURATION_TYPES},Release>>:/MT>
+)
 
 if (NOT ENABLE_D AND NOT ENABLE_ACL AND NOT ENABLE_MS_TESTCASES)
 ############ libge_proto_common.a ############
 add_library(ge_proto_common STATIC
-    ${PROTO_HEADER_HDRS}
-    ${PROTO_SRCS}
+    $<TARGET_OBJECTS:ge_fusion_model_protos_obj>
 )
 
 target_compile_definitions(ge_proto_common PRIVATE
@@ -57,8 +85,7 @@ target_link_libraries(ge_proto_common PRIVATE
 
 ############ libge_proto_client.a ############
 add_library(ge_proto_client STATIC
-    ${PROTO_CLIENT_HEADER_HDRS}
-    ${PROTO_CLIENT_SRCS}
+    $<TARGET_OBJECTS:ge_fusion_model_protos_obj>
 )
 
 target_compile_definitions(ge_proto_client PRIVATE
@@ -67,8 +94,8 @@ target_compile_definitions(ge_proto_client PRIVATE
 )
 
 target_include_directories(ge_proto_client PRIVATE
-    ${CMAKE_BINARY_DIR}/proto/ge_client
-    ${CMAKE_BINARY_DIR}/proto/ge_client/proto
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos/proto
 )
 
 target_compile_options(ge_proto_client PRIVATE
@@ -742,7 +769,7 @@ target_include_directories(ge_runner SYSTEM PRIVATE
     ${METADEF_DIR}/inc/external
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../inc/external
@@ -787,6 +814,10 @@ add_library(ge_compiler SHARED
     ${INFER_SRC_LIST}
 )
 
+add_dependencies(ge_compiler
+    graphengine_protos
+)
+
 target_compile_definitions(ge_compiler PRIVATE
     PROTOBUF_INLINE_NOT_IN_HEADERS=0
     REUSE_MEMORY=1
@@ -819,7 +850,7 @@ target_include_directories(ge_compiler SYSTEM PRIVATE
     ${METADEF_DIR}/inc/external
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../inc/external

ge/common/CMakeLists.txt

@@ -1,23 +1,3 @@
-set(PROTO_LIST
-    "${METADEF_DIR}/proto/om.proto"
-    "${METADEF_DIR}/proto/ge_ir.proto"
-    "${METADEF_DIR}/proto/insert_op.proto"
-    "${METADEF_DIR}/proto/task.proto"
-    "${METADEF_DIR}/proto/tensorflow/attr_value.proto"
-    "${METADEF_DIR}/proto/tensorflow/function.proto"
-    "${METADEF_DIR}/proto/tensorflow/graph.proto"
-    "${METADEF_DIR}/proto/tensorflow/node_def.proto"
-    "${METADEF_DIR}/proto/tensorflow/op_def.proto"
-    "${METADEF_DIR}/proto/tensorflow/resource_handle.proto"
-    "${METADEF_DIR}/proto/tensorflow/tensor.proto"
-    "${METADEF_DIR}/proto/tensorflow/tensor_shape.proto"
-    "${METADEF_DIR}/proto/tensorflow/types.proto"
-    "${METADEF_DIR}/proto/tensorflow/versions.proto"
-)
-
-protobuf_generate(ge PROTO_SRCS PROTO_HDRS ${PROTO_LIST})
-protobuf_generate(ge_static PROTO_STATIC_SRCS PROTO_STATIC_HDRS ${PROTO_LIST})
-
 set(SRC_LIST
     "context/ctx.cc"
     "model_saver.cc"
@@ -67,7 +47,12 @@ set(SRC_LIST
 
 if (NOT ENABLE_D AND NOT ENABLE_ACL)
 ############ libge_common.so ############
-add_library(ge_common SHARED ${SRC_LIST} ${PROTO_HDRS})
+add_library(ge_common SHARED ${SRC_LIST})
+
+add_dependencies(ge_common
+    graphengine_protos
+)
+
 target_compile_definitions(ge_common PRIVATE
     PROTOBUF_INLINE_NOT_IN_HEADERS=0
     HOST_VISIBILITY
@@ -97,7 +82,7 @@ target_include_directories(ge_common PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_DEPEND_DIR}/inc
     ${GE_DEPEND_DIR}/inc/cce
@@ -128,7 +113,12 @@ target_link_libraries(ge_common PRIVATE
 )
 
 ############ libge_common.a ############
-add_library(ge_common_static STATIC ${SRC_LIST} ${PROTO_STATIC_HDRS})
+add_library(ge_common_static STATIC ${SRC_LIST})
+
+add_dependencies(ge_common_static
+    graphengine_protos
+)
+
 target_compile_definitions(ge_common_static PRIVATE
     PROTOBUF_INLINE_NOT_IN_HEADERS=0
     HOST_VISIBILITY
@@ -159,7 +149,7 @@ target_include_directories(ge_common_static PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge_static
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_DEPEND_DIR}/inc
     ${GE_DEPEND_DIR}/inc/cce
@@ -180,7 +170,12 @@ target_link_libraries(ge_common_static PRIVATE
 
 else ()
 ############ libge_common.so w/static protobuf ############
-add_library(ge_common SHARED ${SRC_LIST} ${PROTO_HDRS})
+add_library(ge_common SHARED ${SRC_LIST})
+
+add_dependencies(ge_common
+    graphengine_protos
+)
+
 target_compile_definitions(ge_common PRIVATE
     PROTOBUF_INLINE_NOT_IN_HEADERS=0
     HOST_VISIBILITY
@@ -211,7 +206,7 @@ target_include_directories(ge_common PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     ${GE_CODE_DIR}/third_party/fwkacllib/inc
     ${GE_CODE_DIR}/third_party/fwkacllib/inc/toolchain
 )

ge/executor/CMakeLists.txt

@@ -1,15 +1,3 @@
-set(PROTO_LIST
-    "${METADEF_DIR}/proto/om.proto"
-    "${METADEF_DIR}/proto/ge_ir.proto"
-    "${METADEF_DIR}/proto/insert_op.proto"
-    "${METADEF_DIR}/proto/task.proto"
-    "${METADEF_DIR}/proto/op_mapping.proto"
-    "${METADEF_DIR}/proto/dump_task.proto"
-)
-
-protobuf_generate(ge PROTO_SRCS PROTO_HDRS ${PROTO_LIST})
-protobuf_generate(ge_static PROTO_STATIC_SRCS PROTO_STATIC_HDRS ${PROTO_LIST})
-
 set(SRC_LIST
     "ge_executor.cc"
     "../common/profiling/profiling_manager.cc"
@@ -168,7 +156,11 @@ set(SRC_LIST
 )
 
 ######## libge_executor.a ########
-add_library(ge_executor STATIC ${SRC_LIST} ${PROTO_STATIC_HDRS})
+add_library(ge_executor STATIC ${SRC_LIST})
+
+add_dependencies(ge_executor
+    graphengine_protos
+)
 
 target_compile_options(ge_executor PRIVATE
     $<$<OR:$<STREQUAL:${TARGET_SYSTEM_NAME},Linux>,$<STREQUAL:${TARGET_SYSTEM_NAME},Android>>:-fvisibility=hidden -O2 -Werror -Wno-deprecated-declarations -fno-common>
@@ -198,7 +190,7 @@ target_include_directories(ge_executor SYSTEM PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge_static
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../inc/cce
@@ -217,7 +209,11 @@ target_link_libraries(ge_executor PRIVATE
 )
 
 ######## libge_executor.so ########
-add_library(ge_executor_shared SHARED ${SRC_LIST} ${PROTO_HDRS})
+add_library(ge_executor_shared SHARED ${SRC_LIST})
+
+add_dependencies(ge_executor_shared
+    graphengine_protos
+)
 
 target_compile_options(ge_executor_shared PRIVATE
     -fno-common
@@ -245,7 +241,7 @@ target_include_directories(ge_executor_shared PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../inc/cce

ge/ge_local_engine/CMakeLists.txt

@@ -1,7 +1,3 @@
-set(PROTO_LIST
-    "${METADEF_DIR}/proto/task.proto"
-)
-
 set(SRC_LIST
     "engine/ge_local_engine.cc"
     "ops_kernel_store/ge_local_ops_kernel_info.cc"
@@ -19,12 +15,12 @@ set(OPS_KERNEL_SRC_LIST
     "ops_kernel_store/op/no_op.cc"
 )
 
-protobuf_generate(ge PROTO_SRCS PROTO_HDRS ${PROTO_LIST})
-protobuf_generate(ge_ops_shared PROTO_OPS_SHARED_SRCS PROTO_OPS_SHARED_HDRS ${PROTO_LIST})
-protobuf_generate(ge_ops_static PROTO_OPS_STATIC_SRCS PROTO_OPS_STATIC_HDRS ${PROTO_LIST})
-
 ############ libge_local_engine.so ############
-add_library(ge_local_engine SHARED ${SRC_LIST} ${PROTO_HDRS})
+add_library(ge_local_engine SHARED ${SRC_LIST})
+
+add_dependencies(ge_local_engine
+    graphengine_protos
+)
 
 target_compile_options(ge_local_engine PRIVATE
     -Werror
@@ -48,7 +44,7 @@ target_include_directories(ge_local_engine PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####
@@ -70,7 +66,11 @@ target_link_libraries(ge_local_engine PRIVATE
 )
 
 ######### atclib/libge_local_engine.so #############
-add_library(atc_ge_local_engine SHARED ${SRC_LIST} ${PROTO_HDRS})
+add_library(atc_ge_local_engine SHARED ${SRC_LIST})
+
+add_dependencies(atc_ge_local_engine
+    graphengine_protos
+)
 
 target_compile_options(atc_ge_local_engine PRIVATE
     -Werror
@@ -94,7 +94,7 @@ target_include_directories(atc_ge_local_engine PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####
@@ -121,7 +121,11 @@ set_target_properties(atc_ge_local_engine PROPERTIES
 )
 
 ############ libge_local_opskernel_builder.so ############
-add_library(ge_local_opskernel_builder SHARED ${OPS_KERNEL_SRC_LIST} ${PROTO_OPS_SHARED_HDRS})
+add_library(ge_local_opskernel_builder SHARED ${OPS_KERNEL_SRC_LIST})
+
+add_dependencies(ge_local_opskernel_builder
+    graphengine_protos
+)
 
 target_compile_options(ge_local_opskernel_builder PRIVATE
     -Werror
@@ -145,7 +149,7 @@ target_include_directories(ge_local_opskernel_builder PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge_ops_shared
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####
@@ -168,7 +172,11 @@ target_link_libraries(ge_local_opskernel_builder PRIVATE
 )
 
 ############ atclib/libge_local_opskernel_builder.so ############
-add_library(atc_ge_local_opskernel_builder SHARED ${OPS_KERNEL_SRC_LIST} ${PROTO_OPS_SHARED_HDRS})
+add_library(atc_ge_local_opskernel_builder SHARED ${OPS_KERNEL_SRC_LIST})
+
+add_dependencies(atc_ge_local_opskernel_builder
+    graphengine_protos
+)
 
 target_compile_options(atc_ge_local_opskernel_builder PRIVATE
     -Werror
@@ -192,7 +200,7 @@ target_include_directories(atc_ge_local_opskernel_builder PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge_ops_shared
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####
@@ -220,7 +228,11 @@ set_target_properties(atc_ge_local_opskernel_builder PROPERTIES
 )
 
 ############ libge_local_opskernel_builder.a ############
-add_library(ge_local_opskernel_builder_static STATIC ${OPS_KERNEL_SRC_LIST} ${PROTO_OPS_STATIC_HDRS})
+add_library(ge_local_opskernel_builder_static STATIC ${OPS_KERNEL_SRC_LIST})
+
+add_dependencies(ge_local_opskernel_builder_static
+    graphengine_protos
+)
 
 target_compile_options(ge_local_opskernel_builder_static PRIVATE
     -Werror
@@ -245,7 +257,7 @@ target_include_directories(ge_local_opskernel_builder_static PRIVATE
     ${METADEF_DIR}/inc/external/graph
     ${METADEF_DIR}/inc/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge_ops_static
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####

ge/host_cpu_engine/CMakeLists.txt

@@ -1,10 +1,3 @@
-set(PROTO_LIST
-    "${METADEF_DIR}/proto/task.proto"
-)
-
-protobuf_generate(ge PROTO_SRCS PROTO_HDRS ${PROTO_LIST})
-protobuf_generate(ge_atcstub PROTO_ATCSTUB_SRCS PROTO_ATCSTUB_HDRS ${PROTO_LIST})
-
 set(SRC_LIST
     "engine/host_cpu_engine.cc"
     "ops_kernel_store/host_cpu_ops_kernel_info.cc"
@@ -17,7 +10,11 @@ set(CPU_OPS_KERNEL_LIST
 )
 
 ############ libhost_cpu_engine.so ############
-add_library(host_cpu_engine SHARED ${SRC_LIST} ${PROTO_HDRS})
+add_library(host_cpu_engine SHARED ${SRC_LIST})
+
+add_dependencies(host_cpu_engine
+    graphengine_protos
+)
 
 target_compile_options(host_cpu_engine PRIVATE
     -Werror
@@ -40,7 +37,7 @@ target_include_directories(host_cpu_engine PRIVATE
     ${METADEF_DIR}/inc/external
     ${METADEF_DIR}/inc/external/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####
@@ -62,7 +59,11 @@ target_link_libraries(host_cpu_engine PRIVATE
 )
 
 ############ atcstub/libhost_cpu_engine.so ############
-add_library(atc_host_cpu_engine SHARED ${SRC_LIST} ${PROTO_ATCSTUB_HDRS})
+add_library(atc_host_cpu_engine SHARED ${SRC_LIST})
+
+add_dependencies(atc_host_cpu_engine
+    graphengine_protos
+)
 
 target_compile_options(atc_host_cpu_engine PRIVATE
     -Werror
@@ -85,7 +86,7 @@ target_include_directories(atc_host_cpu_engine PRIVATE
     ${METADEF_DIR}/inc/external
     ${METADEF_DIR}/inc/external/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge_atcstub
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####
@@ -114,6 +115,10 @@ set_target_properties(atc_host_cpu_engine PROPERTIES
 ############ libhost_cpu_opskernel_builder.so ############
 add_library(host_cpu_opskernel_builder SHARED ${CPU_OPS_KERNEL_LIST})
 
+add_dependencies(host_cpu_opskernel_builder
+    graphengine_protos
+)
+
 target_compile_options(host_cpu_opskernel_builder PRIVATE
     -Werror
     -fno-common
@@ -135,7 +140,7 @@ target_include_directories(host_cpu_opskernel_builder PRIVATE
     ${METADEF_DIR}/inc/external
     ${METADEF_DIR}/inc/external/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####
@@ -160,6 +165,10 @@ target_link_libraries(host_cpu_opskernel_builder PRIVATE
 ############ atclib/libhost_cpu_opskernel_builder.so ############
 add_library(atc_host_cpu_opskernel_builder SHARED ${CPU_OPS_KERNEL_LIST})
 
+add_dependencies(atc_host_cpu_opskernel_builder
+    graphengine_protos
+)
+
 target_compile_options(atc_host_cpu_opskernel_builder PRIVATE
     -Werror
     -fno-common
@@ -181,7 +190,7 @@ target_include_directories(atc_host_cpu_opskernel_builder PRIVATE
     ${METADEF_DIR}/inc/external
     ${METADEF_DIR}/inc/external/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####
@@ -211,6 +220,10 @@ set_target_properties(atc_host_cpu_opskernel_builder PROPERTIES
 ############ libhost_cpu_opskernel_builder.a ############
 add_library(host_cpu_opskernel_builder_static STATIC ${CPU_OPS_KERNEL_LIST})
 
+add_dependencies(host_cpu_opskernel_builder_static
+    graphengine_protos
+)
+
 target_compile_options(host_cpu_opskernel_builder_static PRIVATE
     -Werror
     -fno-common
@@ -233,7 +246,7 @@ target_include_directories(host_cpu_opskernel_builder_static PRIVATE
     ${METADEF_DIR}/inc/external
     ${METADEF_DIR}/inc/external/graph
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####

ge/offline/CMakeLists.txt

@@ -1,12 +1,3 @@
-set(PROTO_LIST
-    "${METADEF_DIR}/proto/om.proto"
-    "${METADEF_DIR}/proto/ge_ir.proto"
-    "${METADEF_DIR}/proto/insert_op.proto"
-    "${METADEF_DIR}/proto/task.proto"
-)
-
-protobuf_generate(ge PROTO_SRCS PROTO_HDRS ${PROTO_LIST})
-
 set(SRC_LIST
     "main.cc"
     "single_op_parser.cc"
@@ -15,7 +6,11 @@ set(SRC_LIST
 )
 
 ############ atc_atc.bin ############
-add_executable(atc_atc.bin ${SRC_LIST} ${PROTO_HDRS})
+add_executable(atc_atc.bin ${SRC_LIST})
+
+add_dependencies(atc_atc.bin
+    graphengine_protos
+)
 
 target_compile_options(atc_atc.bin PRIVATE
     -Werror
@@ -50,7 +45,7 @@ target_include_directories(atc_atc.bin PRIVATE
     ${METADEF_DIR}/inc/external/register
     ${PARSER_DIR}
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../inc/common
@@ -88,7 +83,11 @@ set_target_properties(atc_atc.bin PROPERTIES
 )
 
 ############ fwk_atc.bin ############
-add_executable(fwk_atc.bin ${SRC_LIST} ${PROTO_HDRS})
+add_executable(fwk_atc.bin ${SRC_LIST})
+
+add_dependencies(fwk_atc.bin
+    graphengine_protos
+)
 
 target_compile_options(fwk_atc.bin PRIVATE
     -Werror
@@ -123,7 +122,7 @@ target_include_directories(fwk_atc.bin PRIVATE
     ${METADEF_DIR}/inc/external/register
     ${PARSER_DIR}
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     ${GE_CODE_DIR}/../inc/common

ge/plugin/engine/CMakeLists.txt

@@ -6,6 +6,10 @@ set(SRC_LIST
 ############ libengine.so ############
 add_library(engine SHARED ${SRC_LIST})
 
+add_dependencies(engine
+    graphengine_protos
+)
+
 target_compile_options(engine PRIVATE
     -Werror
     -fno-common
@@ -27,7 +31,7 @@ target_include_directories(engine PRIVATE
     ${METADEF_DIR}/inc
     ${METADEF_DIR}/inc/external
     ${CMAKE_BINARY_DIR}
-    ${CMAKE_BINARY_DIR}/proto/ge
+    ${CMAKE_BINARY_DIR}/proto/graphengine_protos
     #### yellow zone ####
     ${GE_CODE_DIR}/../inc
     #### blue zone ####

metadef

@@ -1 +1 @@
-Subproject commit 7cb171b9c511fec57ccc0ad746ef2126267fe18b
+Subproject commit b27915cd37919430a61953f8998b7acce4a60177

parser

@@ -1 +1 @@
-Subproject commit 8d44bebfeeb71b793bc7325acc95345090789e19
+Subproject commit e75eda62de2b51a0bded5481ca81eb8fc7bf376e