diff --git a/cmake/dependency_graphengine.cmake b/cmake/dependency_graphengine.cmake index 51c62e0278e..9ed90a66a31 100644 --- a/cmake/dependency_graphengine.cmake +++ b/cmake/dependency_graphengine.cmake @@ -56,6 +56,15 @@ else() find_library(register libregister.so ${ASCEND_RUNTIME_PATH}) find_library(resource libresource.so ${ASCEND_RUNTIME_PATH}) find_library(error_manager liberror_manager.so ${ASCEND_RUNTIME_PATH}) + # for Atlas env + set(ASCEND_TOOLKIT_RUNTIME_PATH ${ASCEND_PATH}/ascend-toolkit/latest/fwkacllib/lib64) + find_library(cce libcce.so ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(hccl libhccl.so ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(runtime libruntime.so ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(msprof libmsprof.so ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(register libregister.so ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(resource libresource.so ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(error_manager liberror_manager.so ${ASCEND_TOOLKIT_RUNTIME_PATH}) endif() # compile libraries from following directories diff --git a/graphengine b/graphengine index 1b479e5d03a..433521ddbf3 160000 --- a/graphengine +++ b/graphengine @@ -1 +1 @@ -Subproject commit 1b479e5d03a7a69555484fb4834b973f88c3e0f9 +Subproject commit 433521ddbf33918a86d0a16bafa200c95baa4eea diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index 2916a085f7a..b60de02baed 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -220,6 +220,7 @@ if (ENABLE_D) set(ASCEND_DRIVER_BACK_PATH ${ASCEND_PATH}/driver/lib64/driver) set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64) set(ASCEND_OPP_PATH ${ASCEND_PATH}/opp/op_impl/built-in/ai_core/tbe/op_tiling) + set(ASCEND_TOOLKIT_RUNTIME_PATH ${ASCEND_PATH}/ascend-toolkit/latest/fwkacllib/lib64) endif() MESSAGE("USE DAV LIB PATH: ${ASCEND_PATH}") @@ -229,6 +230,14 @@ if (ENABLE_D) find_library(TSDCLIENT tsdclient HINTS ${ASCEND_RUNTIME_PATH} ${ASCEND_DRIVER_BACK_PATH}) find_library(DATATRANSFER datatransfer HINTS ${ASCEND_RUNTIME_PATH} ${ASCEND_DRIVER_BACK_PATH}) find_library(PROFILING msprofiler ${ASCEND_RUNTIME_PATH}) + # for atlas env + find_library(HCCL hccl ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(CCE_LIB cce ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(RUNTIME_LIB runtime ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(TSDCLIENT tsdclient HINTS ${ASCEND_TOOLKIT_RUNTIME_PATH} ${ASCEND_DRIVER_BACK_PATH}) + find_library(DATATRANSFER datatransfer HINTS ${ASCEND_TOOLKIT_RUNTIME_PATH} ${ASCEND_DRIVER_BACK_PATH}) + find_library(PROFILING msprofiler ${ASCEND_TOOLKIT_RUNTIME_PATH}) + find_library(PROFILING_SHARED msprof ${ASCEND_DRIVER_PATH}) find_library(REGISTER register ${ASCEND_RUNTIME_PATH}) find_library(OPTILING optiling ${ASCEND_OPP_PATH}) @@ -332,8 +341,9 @@ target_link_libraries(inference PRIVATE ${PYTHON_LIBRARIES} ${SECUREC_LIBRARY} -Wl,--whole-archive mindspore proto_input -Wl,--no-whole-archive mindspore_gvar) if (ENABLE_D) - target_link_libraries(_c_expression PRIVATE ${ASCEND_PATH}/fwkacllib/lib64/libadump_server.a) - target_link_libraries(inference PRIVATE ${ASCEND_PATH}/fwkacllib/lib64/libadump_server.a) + find_library(adump_server libadump_server.a ${ASCEND_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH}) + target_link_libraries(_c_expression PRIVATE ${adump_server}) + target_link_libraries(inference PRIVATE ${adump_server}) endif() if (ENABLE_CPU)