diff --git a/build.sh b/build.sh index 7b1c0792..138db9cc 100644 --- a/build.sh +++ b/build.sh @@ -250,6 +250,7 @@ generate_package() NNENGINE_PATH="plugin/nnengine/ge_config" OPSKERNEL_PATH="plugin/opskernel" + ACL_LIB=("libgraph.so") ATC_LIB=("libc_sec.so" "libge_common.so" "libge_compiler.so" "libgraph.so" "libregister.so" "liberror_manager.so") FWK_LIB=("libge_common.so" "libge_runner.so" "libgraph.so" "libregister.so" "liberror_manager.so") PLUGIN_OPSKERNEL=("libge_local_engine.so" "libge_local_opskernel_builder.so" "libhost_cpu_engine.so" "libhost_cpu_opskernel_builder.so" "optimizer_priority.pbtxt") @@ -303,6 +304,11 @@ generate_package() find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH} \; done + for lib in "${ACL_LIB[@]}"; + do + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \; + done + for lib in "${ATC_LIB[@]}"; do find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH} \; diff --git a/ge/executor/CMakeLists.txt b/ge/executor/CMakeLists.txt index 3094429f..d215b7ef 100644 --- a/ge/executor/CMakeLists.txt +++ b/ge/executor/CMakeLists.txt @@ -12,8 +12,66 @@ set(DUMP_PROTO_LIST protobuf_generate(ge PROTO_SRCS PROTO_HDRS ${PROTO_LIST}) protobuf_generate(ge_static PROTO_STATIC_SRCS PROTO_STATIC_HDRS ${PROTO_LIST}) -protobuf_generate(ge DUMP_PROTO_SRCS DUMP_PROTO_HDRS ${DUMP_PROTO_LIST}) -protobuf_generate(ge_static DUMP_PROTO_STATIC_SRCS DUMP_PROTO_STATIC_HDRS ${DUMP_PROTO_LIST}) +protobuf_generate(ge_dump DUMP_PROTO_SRCS DUMP_PROTO_HDRS ${DUMP_PROTO_LIST}) + +############ libge_proto_dump.a ############ +add_library(ge_proto_dump STATIC + ${DUMP_PROTO_SRCS} +) + +target_compile_definitions(ge_proto_dump PRIVATE + PROTOBUF_INLINE_NOT_IN_HEADERS=0 + google=ascend_private + $,OS_TYPE=WIN,OS_TYPE=0> + $<$:SECUREC_USING_STD_SECURE_LIB=0 NOMINMAX> +) + +target_compile_options(ge_proto_dump PRIVATE + -O2 + -fno-common + -fvisibility=hidden + $<$,$>:/MTd> + $<$,$>:/MT> +) + +target_link_libraries(ge_proto_dump PRIVATE + $ + ascend_protobuf +) + +target_link_options(ge_proto_dump PRIVATE + -Wl,-Bsymbolic +) + +add_library(ge_proto_dump_static STATIC + ${DUMP_PROTO_SRCS} +) + +target_compile_definitions(ge_proto_dump_static PRIVATE + PROTOBUF_INLINE_NOT_IN_HEADERS=0 + google=ascend_private + $,OS_TYPE=WIN,OS_TYPE=0> + $<$:SECUREC_USING_STD_SECURE_LIB=0 NOMINMAX> +) + +target_compile_options(ge_proto_dump_static PRIVATE + -O2 + -fno-common + -fvisibility=hidden + $<$,$>:/MTd> + $<$,$>:/MT> +) + +target_link_libraries(ge_proto_dump_static PRIVATE + $ + ascend_protobuf_static +) + +target_link_options(ge_proto_dump_static PRIVATE + -Wl,-Bsymbolic +) + +################################################################## set(SRC_LIST "ge_executor.cc" @@ -169,7 +227,7 @@ set(SRC_LIST ) ######## libge_executor.a ######## -add_library(ge_executor STATIC ${SRC_LIST} ${PROTO_STATIC_HDRS} ${DUMP_PROTO_STATIC_SRCS}) +add_library(ge_executor STATIC ${SRC_LIST} ${PROTO_STATIC_HDRS}) target_compile_options(ge_executor PRIVATE $<$,$>:-fvisibility=hidden -O2 -Werror -Wno-deprecated-declarations -fno-common> @@ -199,6 +257,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_dump ${CMAKE_BINARY_DIR}/proto/ge_static #### yellow zone #### ${GE_CODE_DIR}/../inc @@ -211,13 +270,14 @@ target_link_libraries(ge_executor PRIVATE $ json ascend_protobuf_static + ge_proto_dump_static c_sec $<$>:-lrt> -ldl ) ######## libge_executor.so ######## -add_library(ge_executor_shared SHARED ${SRC_LIST} ${PROTO_HDRS} ${DUMP_PROTO_SRCS}) +add_library(ge_executor_shared SHARED ${SRC_LIST} ${PROTO_HDRS}) target_compile_options(ge_executor_shared PRIVATE -fno-common @@ -245,6 +305,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_dump ${CMAKE_BINARY_DIR}/proto/ge #### yellow zone #### ${GE_CODE_DIR}/../inc @@ -255,12 +316,14 @@ target_include_directories(ge_executor_shared PRIVATE target_link_options(ge_executor_shared PRIVATE -Wl,-Bsymbolic + -Wl,--exclude-libs,ALL ) target_link_libraries(ge_executor_shared PRIVATE $ msprofiler static_mmpa + ge_proto_dump -Wl,--no-as-needed ge_common runtime