synchronize Ascend software suite 07 Jul 2020

cmake/dependency_graphengine.cmake

@@ -15,6 +15,7 @@ include(${GE_SOURCE_DIR}/cmake/external_libs/securec.cmake)
 if (NOT ENABLE_D)
     set(GE_PREBUILD_PATH ${GE_SOURCE_DIR}/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR})
     find_library(slog libslog.so ${GE_PREBUILD_PATH})
+    find_library(error_manager liberror_manager.so ${GE_PREBUILD_PATH})
 elseif (DEFINED ENV{D_LINK_PATH})
     set(GE_LIB_PATH $ENV{D_LINK_PATH})
     set(GE_SYS_ARCH "")

cmake/package.cmake

@@ -156,6 +156,7 @@ if (NOT ENABLE_GE)
             set(ASCEND_PATH /usr/local/Ascend)
         endif ()
         set(ASCEND_DRIVER_PATH ${ASCEND_PATH}/driver/lib64/common)
+        set(ASCEND_FWK_PATH ${ASCEND_PATH}/fwkacllib/lib64)
 
         install(
             FILES
@@ -164,6 +165,7 @@ if (NOT ENABLE_GE)
                 ${CMAKE_BINARY_DIR}/graphengine/src/ge/ge_runtime/libge_runtime.so
                 ${ASCEND_DRIVER_PATH}/libslog.so
                 ${ASCEND_DRIVER_PATH}/libc_sec.so
+                ${ASCEND_FWK_PATH}/liberror_manager.so
             DESTINATION ${INSTALL_LIB_DIR}
             COMPONENT mindspore
         )
@@ -172,6 +174,7 @@ if (NOT ENABLE_GE)
             FILES
                 ${CMAKE_BINARY_DIR}/graphengine/src/common/graph/libgraph.so
                 ${CMAKE_SOURCE_DIR}/graphengine/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR}/libslog.so
+                ${CMAKE_SOURCE_DIR}/graphengine/third_party/prebuild/${CMAKE_HOST_SYSTEM_PROCESSOR}/liberror_manager.so
                 ${CMAKE_SOURCE_DIR}/build/graphengine/libc_sec.so
             DESTINATION ${INSTALL_LIB_DIR}
             COMPONENT mindspore

graphengine @ 4084909d

-Subproject commit 8891f0546c4a250095ff68e1262f58772b938fd9
+Subproject commit 4084909d62c159da6ba316f61ad3d02a4857b34b

mindspore/_extends/parallel_compile/tbe_compiler/common.py

@@ -40,7 +40,7 @@ def get_ddk_version():
             with open(backup_ddk_info_file, "r") as fp:
                 ddk_version = json.load(fp)["VERSION"]
         else:
-            ddk_version = "1.60.T17.B830"
+            ddk_version = "Ascend910"
     return ddk_version
 
 

mindspore/ccsrc/CMakeLists.txt

@@ -192,8 +192,9 @@ if (ENABLE_D)
     find_library(CCE_LIB cce ${ASCEND_RUNTIME_PATH})
     find_library(RUNTIME_LIB runtime ${ASCEND_RUNTIME_PATH})
     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 msprof ${ASCEND_DRIVER_PATH})
-    target_link_libraries(mindspore ge_runtime ${CCE_LIB} ${RUNTIME_LIB} ${TSDCLIENT} ${PROFILING} ${HCCL} ${TSDCLIENT})
+    target_link_libraries(mindspore ge_runtime ${CCE_LIB} ${RUNTIME_LIB} ${TSDCLIENT} ${PROFILING} ${HCCL} ${DATATRANSFER})
 endif()
 
 # link protobuf

mindspore/ccsrc/utils/context/ms_context.cc

@@ -186,28 +186,18 @@ bool MsContext::OpenTsd() {
   }
 
   MS_LOG(INFO) << "Device id = " << device_id << ", rank size = " << rank_size << ".";
-#if (defined(ENABLE_TDTQUE) && defined(ENABLE_GE))
   int32_t initStatus = tdt::TdtHostInit(device_id);
   if (initStatus != TDT_OK_CODE) {
     MS_LOG(EXCEPTION) << "Init tsd failed, status = " << initStatus << ".";
     return false;
   }
   tdt_print_ = std::thread(TensorPrint());
-#endif
   TDT_StatusT status = tdt::TsdClient::GetInstance()->Open(device_id, rank_size);
   if (status != TDT_OK) {
     MS_LOG(EXCEPTION) << "Device " << device_id << " is occupied, open tsd failed, status = " << status << ".";
     return false;
   }
   tsd_ref_++;
-#if (defined(ENABLE_TDTQUE) && !defined(ENABLE_GE))
-  int32_t initStatus = tdt::TdtHostInit(device_id);
-  if (initStatus != TDT_OK_CODE) {
-    MS_LOG(EXCEPTION) << "Init tsd failed, status = " << initStatus << ".";
-    return false;
-  }
-  tdt_print_ = std::thread(TensorPrint());
-#endif
   MS_LOG(INFO) << "Open and init tsd successful, tsd reference = " << tsd_ref_ << ".";
   return true;
 }

tests/ut/cpp/stub/hccl/hccl_stub.cc

@@ -103,7 +103,8 @@ hcclResult_t hcom_receive(const char *tag, void *outputPtr, u64 count, hcclDataT
 
 /* 获取梯度参数切分方案 */
 hcclResult_t hcom_get_split_strategy(const char *group, const struct model_feature *feature, u32 maxSegmentNum,
-                                     u32 *segmentNum, u32 *segmentIdx, GradSplitForceMode force) {
+                                     u32 *segmentNum, u32 *segmentIdx, GradSplitForceMode force,
+                                     OriginalGraphShapeType shapeType) {
   return HCCL_SUCCESS;
 }