diff --git a/CMakeLists.txt b/CMakeLists.txt index a77cef4e..f8d419bc 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,36 +66,52 @@ if (ENABLE_OPEN_SRC) set(ASCEND_ATC_DIR ${ASCEND_DIR}/atc/lib64) set(ASCEND_ACL_DIR ${ASCEND_DIR}/acllib/lib64) if(PLATFORM STREQUAL "train") - find_module(slog libslog.so ${ASCEND_DRIVER_DIR}) - find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR}) - find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR}) + find_module(slog libslog.so ${ASCEND_ATC_DIR}) + find_module(mmpa libmmpa.so ${ASCEND_ATC_DIR}) + 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_RUNTIME_DIR}) find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR}) find_module(resource libresource.so ${ASCEND_RUNTIME_DIR}) find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR}) find_module(msprofiler libmsprofiler.a ${ASCEND_RUNTIME_DIR}) - find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}) + find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}/driver) if(PRODUCT STREQUAL "flr3") message(FATAL_ERROR "This platform is not supported in train mode, build terminated") endif() elseif(PLATFORM STREQUAL "inference") - find_module(slog libslog.so ${ASCEND_DRIVER_DIR}) - find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR}) - find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR}) + find_module(slog libslog.so ${ASCEND_ATC_DIR}) + find_module(mmpa libmmpa.so ${ASCEND_ATC_DIR}) find_module(adump_server libadump_server.a ${ASCEND_ACL_DIR}) find_module(runtime libruntime.so ${ASCEND_ACL_DIR}) find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR}) - find_module(resource libresource.so ${ASCEND_ACL_DIR}) - find_module(error_manager liberror_manager.so ${ASCEND_ACL_DIR}) + find_module(resource libresource.so ${ASCEND_ATC_DIR}) + 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}) find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR}) if(NOT PRODUCT STREQUAL "flr3") 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_ATC_DIR}) endif() + elseif(PLATFORM STREQUAL "all") + find_module(slog libslog.so ${ASCEND_DRIVER_DIR}) + find_module(mmpa libmmpa.so ${ASCEND_DRIVER_DIR}) + find_module(msprof libmsprof.so ${ASCEND_DRIVER_DIR}) + find_module(hccl libhccl.so ${ASCEND_RUNTIME_DIR}) + find_module(adump_server libadump_server.a ${ASCEND_RUNTIME_DIR}) + find_module(runtime libruntime.so ${ASCEND_RUNTIME_DIR}) + find_module(runtime_compile libruntime_compile.so ${ASCEND_ATC_DIR}) + find_module(resource libresource.so ${ASCEND_RUNTIME_DIR}) + find_module(error_manager liberror_manager.so ${ASCEND_RUNTIME_DIR}) + find_module(error_manager_static liberror_manager.a ${ASCEND_ACL_DIR}) + find_module(msprofiler libmsprofiler.a ${ASCEND_RUNTIME_DIR}) + find_module(ascend_hal_stub libascend_hal.so ${ASCEND_DRIVER_DIR}) + find_module(ascendcl_static libascendcl.a ${ASCEND_ACL_DIR}) else() - message(FATAL_ERROR "Mode param is invalid, should be train or inference, build terminated") + message(FATAL_ERROR "PLATFORM param is invalid, should be train or inference, build terminated") endif() endif() diff --git a/build.sh b/build.sh index fa123352..60ca950c 100644 --- a/build.sh +++ b/build.sh @@ -142,6 +142,10 @@ build_graphengine() elif [ "x${PLATFORM}" = "xinference" ] then TARGET="ge_compiler atc_ge_local_engine atc_ge_local_opskernel_builder atc_host_cpu_engine atc_host_cpu_opskernel_builder atc opensrc_ascendcl ${TARGET}" + elif [ "x${PLATFORM}" = "xall" ] + then + # build all the target + TARGET="" fi make ${VERBOSE} ${TARGET} -j${THREAD_NUM} && make install @@ -208,9 +212,11 @@ generate_package() GRAPHENGINE_LIB_PATH="lib" - find output/ -name graphengine_lib.tar -exec rm {} \; - cd "${OUTPUT_PATH}" + + find ./ -name graphengine_lib.tar -exec rm {} \; + + find ./bin -name atc -exec cp {} "${OUTPUT_PATH}/${GRAPHENGINE_LIB_PATH}" \; tar -cf graphengine_lib.tar "${GRAPHENGINE_LIB_PATH}" }