tr5 run package update

cmake/dependency_graphengine.cmake

@@ -38,19 +38,20 @@ elseif (DEFINED ENV{D_LINK_PATH})
     find_library(cce libcce.so ${GE_LIB_PATH})
     find_library(resource libresource.so ${GE_LIB_PATH})
 else()
-    set(HIAI_INSTALLED_DIR /usr/local/HiAI)
-    set(HIAI_DRIVER_DIR ${HIAI_INSTALLED_DIR}/driver/lib64)
-    set(HIAI_RUNTIME_DIR ${HIAI_INSTALLED_DIR}/runtime/lib64)
-    find_library(c_sec libc_sec.so ${HIAI_DRIVER_DIR})
-    find_library(slog libslog.so ${HIAI_DRIVER_DIR})
-    find_library(mmpa libmmpa.so ${HIAI_DRIVER_DIR})
+    # Ascend mode
+    set(ASCEND_PATH /usr/local/Ascend)
+    set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common)
+    set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64)
 
-    find_library(cce libcce.so ${HIAI_RUNTIME_DIR})
-    find_library(hccl libhccl.so ${HIAI_RUNTIME_DIR})
-    find_library(runtime libruntime.so ${HIAI_RUNTIME_DIR})
-    find_library(msprof libmsprof.so ${HIAI_RUNTIME_DIR})
-    find_library(register libregister.so ${HIAI_RUNTIME_DIR})
-    find_library(resource libresource.so ${HIAI_RUNTIME_DIR})
+    find_library(c_sec libc_sec.so ${ASCEND_DRIVER_PATH})
+    find_library(slog libslog.so ${ASCEND_DRIVER_PATH})
+    find_library(mmpa libmmpa.so ${ASCEND_DRIVER_PATH})
+    find_library(cce libcce.so ${ASCEND_RUNTIME_PATH})
+    find_library(hccl libhccl.so ${ASCEND_RUNTIME_PATH})
+    find_library(runtime libruntime.so ${ASCEND_RUNTIME_PATH})
+    find_library(msprof libmsprof.so ${ASCEND_RUNTIME_PATH})
+    find_library(register libregister.so ${ASCEND_RUNTIME_PATH})
+    find_library(resource libresource.so ${ASCEND_RUNTIME_PATH})
 endif()
 
 # compile libraries from following directories

graphengine

@@ -1 +1 @@
-Subproject commit 49351fb73ac7786b9ed9e807568a1a8e06183693
+Subproject commit 60b2262ce700db538e4c728619e1972c3687f633

mindspore/_extends/parallel_compile/tbe_compiler/common.py

@@ -50,7 +50,7 @@ def get_build_in_impl_path():
     tbe_impl_path = os.environ.get("TBE_IMPL_PATH")
     if tbe_impl_path is None:
         default_install_path = '/usr/local/HiAI/runtime/ops/op_impl/built-in/ai_core/tbe/'
-        backup_install_path = '/usr/local/Ascend/Ascend/opp/op_impl/built-in/ai_core/tbe/'
+        backup_install_path = '/usr/local/Ascend/opp/op_impl/built-in/ai_core/tbe/'
         if os.path.exists(default_install_path):
             tbe_impl_path = default_install_path
         elif os.path.exists(backup_install_path):

mindspore/ccsrc/CMakeLists.txt

@@ -279,15 +279,17 @@ if(ENABLE_D)
         endif()
     else()
         MESSAGE("use system default lib")
-        set(D_LIB_PATH "/usr/local/HiAI/runtime/lib64/")
+        set(ASCEND_PATH /usr/local/Ascend)
+        set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common)
+        set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64)
     endif()
 
-    MESSAGE("USE DAV LIB PATH: ${D_LIB_PATH}")
-    find_library(HCCL hccl ${D_LIB_PATH})
-    find_library(CCE_LIB cce ${D_LIB_PATH})
-    find_library(RUNTIME_LIB runtime ${D_LIB_PATH})
-    find_library(TSDCLIENT tsdclient ${D_LIB_PATH})
-    find_library(PROFILING msprof ${D_LIB_PATH})
+    MESSAGE("USE DAV LIB PATH: ${ASCEND_PATH}")
+    find_library(HCCL hccl ${ASCEND_RUNTIME_PATH})
+    find_library(CCE_LIB cce ${ASCEND_RUNTIME_PATH})
+    find_library(RUNTIME_LIB runtime ${ASCEND_RUNTIME_PATH})
+    find_library(TSDCLIENT tsdclient ${ASCEND_RUNTIME_PATH})
+    find_library(PROFILING msprof ${ASCEND_DRIVER_PATH})
     target_link_libraries(mindspore ge_runtime ${CCE_LIB} ${RUNTIME_LIB} ${TSDCLIENT} ${PROFILING} ${HCCL} ${TSDCLIENT})
 endif()
 
@@ -481,12 +483,14 @@ add_dependencies(add_ms_lib _c_expression)
 
 if (NOT ENABLE_GE)
     if (ENABLE_D)
+        set(ASCEND_PATH /usr/local/Ascend)
+        set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common)
         add_custom_target(add_ge_lib ALL
                 COMMAND cp ${MS_CCSRC_BUILD_PATH}/../../graphengine/src/common/graph/libgraph.so ${MS_LIB_PATH}
                 COMMAND cp ${MS_CCSRC_BUILD_PATH}/../../graphengine/src/ge/common/libge_common.so ${MS_LIB_PATH}
                 COMMAND cp ${MS_CCSRC_BUILD_PATH}/../../graphengine/src/ge/ge_runtime/libge_runtime.so ${MS_LIB_PATH}
-                COMMAND cp /usr/local/HiAI/driver/lib64/libslog.so ${MS_LIB_PATH}
-                COMMAND cp /usr/local/HiAI/driver/lib64/libc_sec.so ${MS_LIB_PATH}
+                COMMAND cp ${ASCEND_DRIVER_PATH}/libslog.so ${MS_LIB_PATH}
+                COMMAND cp ${ASCEND_DRIVER_PATH}/libc_sec.so ${MS_LIB_PATH}
         )
         add_dependencies(add_ge_lib add_ms_lib)
         add_dependencies(add_ge_lib graph)