diff --git a/CMakeLists.txt b/CMakeLists.txt index b9e78256..41aad1a9 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,17 +91,16 @@ if (ENABLE_OPEN_SRC) find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR}) if(PRODUCT STREQUAL "flr3") find_module(msprof libmsprof.so ${ASCEND_DRIVER_SHARE_DIR}) - elseif(PRODUCT STREQUAL "flr2") + elseif(PRODUCT STREQUAL "flr1") 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") - # + elseif(PRODUCT STREQUAL "flr2") + # flr2 ascend_hal_stub limsprof ? else() find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}) find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR}) endif() elseif(PLATFORM STREQUAL "all") - #mdc没有 dc在driver目录 find_module(msprof libmsprof.so ${ASCEND_DRIVER_COMMON_DIR}) find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR}) find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR}) @@ -111,7 +110,6 @@ if (ENABLE_OPEN_SRC) find_module(error_manager liberror_manager.so ${ASCEND_ATC_DIR}) find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR}) find_module(msprofiler libmsprofiler.a ${ASCEND_ACL_DIR}) - #mdc没有 dc在driver/lib64/driver find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}/driver) find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR}) else() diff --git a/build.sh b/build.sh index eff013b8..ccf736b9 100644 --- a/build.sh +++ b/build.sh @@ -137,7 +137,7 @@ build_graphengine() echo "execute command: cmake ${CMAKE_ARGS} .. failed." return 1 fi - COMMON_TARGET="ge_common engine fmk_parser parser_common _caffe_parser fmk_onnx_parser graph register " + COMMON_TARGET="ge_common engine fmk_parser parser_common _caffe_parser fmk_onnx_parser graph register engine_conf.json optimizer_priority.pbtxt " TARGET=${COMMON_TARGET} if [ "x${PLATFORM}" = "xtrain" ] then @@ -229,12 +229,14 @@ generate_package() rm -rf ${OUTPUT_PATH:?}/${FWK_PATH}/ rm -rf ${OUTPUT_PATH:?}/${ACL_PATH}/ rm -rf ${OUTPUT_PATH:?}/${ATC_PATH}/ + rm -rf ${OUTPUT_PATH:?}/${ATC_BIN_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}" + mk_dir "${OUTPUT_PATH}/${ATC_BIN_PATH}" cd "${OUTPUT_PATH}"