diff --git a/CMakeLists.txt b/CMakeLists.txt index c5f5ef4b..b9e78256 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,11 +89,16 @@ if (ENABLE_OPEN_SRC) find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR}) find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR}) find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR}) - if(NOT PRODUCT STREQUAL "flr3") + if(PRODUCT STREQUAL "flr3") + find_module(msprof libmsprof.so ${ASCEND_DRIVER_SHARE_DIR}) + elseif(PRODUCT STREQUAL "flr2") + find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}/driver) + find_module(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR}) + elseif(PRODUCT STREQUAL "flr1") + # + else() find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}) find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR}) - else() - find_module(msprof libmsprof.so ${ASCEND_DRIVER_SHARE_DIR}) endif() elseif(PLATFORM STREQUAL "all") #mdc没有 dc在driver目录 diff --git a/build.sh b/build.sh index 60ca950c..6882ae0a 100644 --- a/build.sh +++ b/build.sh @@ -95,6 +95,9 @@ checkopts() } checkopts "$@" +git submodule update --init metadef +git submodule update --init parser + mk_dir() { local create_dir="$1" # the target to make @@ -211,14 +214,73 @@ generate_package() cd "${BASEPATH}" GRAPHENGINE_LIB_PATH="lib" + ACL_PATH="acllib/lib64" + FWK_PATH="fwkacllib/lib64" + ATC_PATH="atc/lib64" + ATC_BIN_PATH="atc/bin" + NNENGINE_PATH="plugin/nnengine/ge_config" + OPSKERNEL_PATH="plugin/opskernel" + + ATC_LIB=("libc_sec.so" "libge_common.so" "libge_compiler.so" "libgraph.so" "libregister.so") + FWK_LIB=("libge_common.so" "libge_runner.so" "libgraph.so" "libregister.so") + PLUGIN_OPSKERNEL=("libge_local_engine.so" "libge_local_opskernel_builder.so" "libhost_cpu_engine.so" "libhost_cpu_opskernel_builder.so" "optimizer_priority.pbtxt") + PARSER_LIB=("lib_caffe_parser.so" "libfmk_onnx_parser.so" "libfmk_parser.so" "libparser_common.so") + rm -rf ${OUTPUT_PATH:?}/${FWK_PATH}/ + rm -rf ${OUTPUT_PATH:?}/${ACL_PATH}/ + rm -rf ${OUTPUT_PATH:?}/${ATC_PATH}/ + + mk_dir "${OUTPUT_PATH}/${FWK_PATH}/${NNENGINE_PATH}" + mk_dir "${OUTPUT_PATH}/${FWK_PATH}/${OPSKERNEL_PATH}" + mk_dir "${OUTPUT_PATH}/${ATC_PATH}/${NNENGINE_PATH}" + mk_dir "${OUTPUT_PATH}/${ATC_PATH}/${OPSKERNEL_PATH}" + mk_dir "${OUTPUT_PATH}/${ACL_PATH}" + cd "${OUTPUT_PATH}" find ./ -name graphengine_lib.tar -exec rm {} \; - find ./bin -name atc -exec cp {} "${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH}" \; + cp ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH}/engine_conf.json ${OUTPUT_PATH}/${FWK_PATH}/${NNENGINE_PATH} + cp ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH}/engine_conf.json ${OUTPUT_PATH}/${ATC_PATH}/${NNENGINE_PATH} + + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name libengine.so -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH}/${NNENGINE_PATH}/../ \; + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name libengine.so -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH}/${NNENGINE_PATH}/../ \; + - tar -cf graphengine_lib.tar "${GRAPHENGINE_LIB_PATH}" + for lib in "${PLUGIN_OPSKERNEL[@]}"; + do + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH}/${OPSKERNEL_PATH} \; + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 2 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ATC_PATH}/${OPSKERNEL_PATH} \; + done + + for lib in "${PARSER_LIB[@]}"; + do + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH} \; + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ACL_PATH} \; + done + + for lib in "${FWK_LIB[@]}"; + do + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${FWK_PATH} \; + done + + for lib in "${ATC_LIB[@]}"; + do + find ${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH} -maxdepth 1 -name "$lib" -exec cp -f {} ${OUTPUT_PATH}/${ATC_LIB} \; + done + + find ./bin -name atc -exec cp {} "${OUTPUT_PATH}/${ATC_BIN_PATH}" \; + + if [ "x${PLATFORM}" = "xtrain" ] + then + tar -cf graphengine_lib.tar fwkacllib + elif [ "x${PLATFORM}" = "xinference" ] + then + tar -cf graphengine_lib.tar acllib atc + elif [ "x${PLATFORM}" = "xall" ] + then + tar -cf graphengine_lib.tar fwkacllib acllib atc + fi } if [[ "X$ENABLE_GE_UT" = "Xoff" ]]; then diff --git a/ge/CMakeLists.txt b/ge/CMakeLists.txt index fa315516..8910a122 100755 --- a/ge/CMakeLists.txt +++ b/ge/CMakeLists.txt @@ -887,6 +887,6 @@ install(TARGETS atc_stub_ge_compiler fwk_stub_ge_runner OPTIONAL install(FILES ${CMAKE_CURRENT_BINARY_DIR}/engine_conf.json - ${CMAKE_CURRENT_BINARY_DIR}/optimizer_priority.pbtxt OPTIONAL + ${CMAKE_CURRENT_BINARY_DIR}/optimizer_priority.pbtxt DESTINATION ${INSTALL_LIBRARY_DIR} )