!3607 回退 'Pull Request !3236 : use akg to compile gpu ops rather than _akg'

Merge pull request !3607 from xsmq/revert-merge-3236-master

CMakeLists.txt

@@ -42,7 +42,7 @@ if (NOT Patch_FOUND)
 endif ()
 message(PATCH_EXECUTABLE = ${Patch_EXECUTABLE})
 
-if (ENABLE_AKG AND (ENABLE_D OR ENABLE_GPU))
+if (ENABLE_AKG AND ENABLE_D)
     add_subdirectory("${CMAKE_SOURCE_DIR}/akg")
 endif()
 

akg

@@ -1 +1 @@
-Subproject commit 5237a9a08bfa03cc4c6be912a43d5efc0f4f153d
+Subproject commit f60af9df4220bf3db5de2b224418953c0dc1f625

build.sh

@@ -285,7 +285,7 @@ fi
 echo "---------------- MindSpore: build start ----------------"
 mkdir -pv "${BUILD_PATH}/package/mindspore/lib"
 git submodule update --init graphengine
-if [[ "X$ENABLE_AKG" = "Xon" ]] && [[ "X$ENABLE_D" = "Xon" || "X$ENABLE_GPU" = "Xon" ]]; then
+if [[ "X$ENABLE_AKG" = "Xon" ]] && [[ "X$ENABLE_D" = "Xon" ]]; then
     git submodule update --init --recursive akg
 fi
 
@@ -340,7 +340,7 @@ build_mindspore()
         CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_D=ON"
     fi
     if [[ "X$ENABLE_GPU" = "Xon" ]]; then
-        CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_GPU=ON -DUSE_CUDA=ON -DUSE_CUDNN=ON -DCUDA_PATH=$CUDA_PATH -DCUDNN_PATH=$CUDNN_PATH -DMS_REQUIRE_CUDA_VERSION=${CUDA_VERSION}"
+        CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_GPU=ON -DCUDA_PATH=$CUDA_PATH -DCUDNN_PATH=$CUDNN_PATH -DMS_REQUIRE_CUDA_VERSION=${CUDA_VERSION}"
     fi
     if [[ "X$ENABLE_CPU" = "Xon" ]]; then
         CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_CPU=ON"
@@ -351,7 +351,7 @@ build_mindspore()
     if [[ "X$USE_GLOG" = "Xon" ]]; then
         CMAKE_ARGS="${CMAKE_ARGS} -DUSE_GLOG=ON"
     fi
-    if [[ "X$ENABLE_AKG" = "Xon" ]] && [[ "X$ENABLE_D" = "Xon" || "X$ENABLE_GPU" = "Xon" ]]; then
+    if [[ "X$ENABLE_AKG" = "Xon" ]] && [[ "X$ENABLE_D" = "Xon" ]]; then
         CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_AKG=ON"
     fi
     if [[ "X$ENABLE_SERVING" = "Xon" ]]; then

cmake/package.cmake

@@ -253,7 +253,7 @@ if (ENABLE_GPU)
     endif ()
 endif ()
 
-if (ENABLE_AKG AND (ENABLE_D OR ENABLE_GPU))
+if (ENABLE_D AND ENABLE_AKG)
     set (AKG_PATH ${CMAKE_SOURCE_DIR}/build/mindspore/akg)
     install(
         DIRECTORY

mindspore/ccsrc/backend/kernel_compiler/common_utils.h

@@ -40,7 +40,7 @@ constexpr auto kProcessorCuda = "cuda";
 constexpr auto kJsonSuffix = ".json";
 constexpr auto kInfoSuffix = ".info";
 constexpr unsigned int AUTODIFF_COMPILE_OVERTIME = 600;
-constexpr auto kAkgModule = "akg.ms";
+constexpr auto kAkgModule = "_akg";
 constexpr auto kArgDataformat = "data_format";
 
 const std::vector<std::string> support_devices = {"aicore", "aicpu", "cuda"};