!1316 fixed compiled issue for proto files

From: @li-lei0106 Reviewed-by: @ji_chen,@wqtshg Signed-off-by: @ji_chen
4 years ago · 5367bbe395
parent 3050d3984a f0d897b0bb
commit 5367bbe395
8 changed files with 27 additions and 16 deletions
--- a/build.sh
+++ b/build.sh
@ -229,7 +229,7 @@ if [[ "X$ENABLE_GE_UT" = "Xon" || "X$ENABLE_GE_COV" = "Xon" ]]; then
    rm -rf ${BASEPATH}/cov
    mkdir ${BASEPATH}/cov
    lcov -c -d build/tests/ut/ge -d build/tests/ut/common/graph/ -o cov/tmp.info
-    lcov -r cov/tmp.info '*/output/*' '*/build/opensrc/*' '*/build/proto/*' '*/third_party/*' '*/tests/*' '/usr/local/*' -o cov/coverage.info
+    lcov -r cov/tmp.info '*/output/*' '*/build/opensrc/*' '*/build/proto/*' '*/third_party/*' '*/tests/*' '/usr/local/*' '/usr/include/*' '*/metadef/*' '*/parser/*' -o cov/coverage.info
    cd ${BASEPATH}/cov
    genhtml coverage.info
 fi
--- a/ge/CMakeLists.txt
+++ b/ge/CMakeLists.txt
@ -31,6 +31,7 @@ set(PROTO_HEADER_LIST
 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})

 if (NOT ENABLE_D AND NOT ENABLE_ACL AND NOT ENABLE_MS_TESTCASES)
 ############ libge_proto_common.a ############
@ -56,7 +57,7 @@ target_link_libraries(ge_proto_common PRIVATE

 ############ libge_proto_client.a ############
 add_library(ge_proto_client STATIC
-    ${PROTO_HEADER_HDRS}
+    ${PROTO_CLIENT_HEADER_HDRS}
    ${PROTO_CLIENT_SRCS}
 )

@ -65,6 +66,11 @@ target_compile_definitions(ge_proto_client PRIVATE
    google=ascend_private
 )

+target_include_directories(ge_proto_client PRIVATE
+    ${CMAKE_BINARY_DIR}/proto/ge_client
+    ${CMAKE_BINARY_DIR}/proto/ge_client/proto
+)
+
 target_compile_options(ge_proto_client PRIVATE
    -O2
    -fno-common
--- a/ge/common/CMakeLists.txt
+++ b/ge/common/CMakeLists.txt
@ -16,6 +16,7 @@ set(PROTO_LIST
 )

 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"
@ -127,7 +128,7 @@ target_link_libraries(ge_common PRIVATE
 )

 ############ libge_common.a ############
-add_library(ge_common_static STATIC ${SRC_LIST} ${PROTO_HDRS})
+add_library(ge_common_static STATIC ${SRC_LIST} ${PROTO_STATIC_HDRS})
 target_compile_definitions(ge_common_static PRIVATE
    PROTOBUF_INLINE_NOT_IN_HEADERS=0
    HOST_VISIBILITY
@ -158,7 +159,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
+    ${CMAKE_BINARY_DIR}/proto/ge_static
    #### yellow zone ####
    ${GE_DEPEND_DIR}/inc
    ${GE_DEPEND_DIR}/inc/cce
--- a/ge/executor/CMakeLists.txt
+++ b/ge/executor/CMakeLists.txt
@ -8,6 +8,7 @@ set(PROTO_LIST
 )

 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"
@ -162,7 +163,7 @@ set(SRC_LIST
 )

 ######## libge_executor.a ########
-add_library(ge_executor STATIC ${SRC_LIST} ${PROTO_HDRS})
+add_library(ge_executor STATIC ${SRC_LIST} ${PROTO_STATIC_HDRS})

 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>
@ -191,7 +192,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
+    ${CMAKE_BINARY_DIR}/proto/ge_static
    #### yellow zone ####
    ${GE_CODE_DIR}/../inc
    ${GE_CODE_DIR}/../inc/cce
--- a/ge/ge_local_engine/CMakeLists.txt
+++ b/ge/ge_local_engine/CMakeLists.txt
@ -20,6 +20,8 @@ set(OPS_KERNEL_SRC_LIST
 )

 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})
@ -119,7 +121,7 @@ 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_HDRS})
+add_library(ge_local_opskernel_builder SHARED ${OPS_KERNEL_SRC_LIST} ${PROTO_OPS_SHARED_HDRS})

 target_compile_options(ge_local_opskernel_builder PRIVATE
    -Werror
@ -143,7 +145,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
+    ${CMAKE_BINARY_DIR}/proto/ge_ops_shared
    #### yellow zone ####
    ${GE_CODE_DIR}/../inc
    #### blue zone ####
@ -166,7 +168,7 @@ 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_HDRS})
+add_library(atc_ge_local_opskernel_builder SHARED ${OPS_KERNEL_SRC_LIST} ${PROTO_OPS_SHARED_HDRS})

 target_compile_options(atc_ge_local_opskernel_builder PRIVATE
    -Werror
@ -190,7 +192,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
+    ${CMAKE_BINARY_DIR}/proto/ge_ops_shared
    #### yellow zone ####
    ${GE_CODE_DIR}/../inc
    #### blue zone ####
@ -218,7 +220,7 @@ 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_HDRS})
+add_library(ge_local_opskernel_builder_static STATIC ${OPS_KERNEL_SRC_LIST} ${PROTO_OPS_STATIC_HDRS})

 target_compile_options(ge_local_opskernel_builder_static PRIVATE
    -Werror
@ -243,7 +245,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
+    ${CMAKE_BINARY_DIR}/proto/ge_ops_static
    #### yellow zone ####
    ${GE_CODE_DIR}/../inc
    #### blue zone ####
--- a/ge/host_cpu_engine/CMakeLists.txt
+++ b/ge/host_cpu_engine/CMakeLists.txt
@ -3,6 +3,7 @@ set(PROTO_LIST
 )

 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"
@ -61,7 +62,7 @@ target_link_libraries(host_cpu_engine PRIVATE
 )

 ############ atcstub/libhost_cpu_engine.so ############
-add_library(atc_host_cpu_engine SHARED ${SRC_LIST} ${PROTO_HDRS})
+add_library(atc_host_cpu_engine SHARED ${SRC_LIST} ${PROTO_ATCSTUB_HDRS})

 target_compile_options(atc_host_cpu_engine PRIVATE
    -Werror
@ -84,7 +85,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
+    ${CMAKE_BINARY_DIR}/proto/ge_atcstub
    #### yellow zone ####
    ${GE_CODE_DIR}/../inc
    #### blue zone ####
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 140538eadb161278f1c733e7850bfaba65cf665e
+Subproject commit f0dd933702e5224399e757e1b6174e49eb4e71fa
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit b203d47837421b2c149f353fc0808f6a29fa584e
+Subproject commit d851e1d467768b6cefd8f5f44745be1c5312121a