diff --git a/CMakeLists.txt b/CMakeLists.txt index 4443638a575c4257cf1d5697669173e9fbc11d74..60d061ee1231a6de4c3f65016673648efe86945f 100644 --- a/CMakeLists.txt +++ b/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() diff --git a/akg b/akg index 5237a9a08bfa03cc4c6be912a43d5efc0f4f153d..f60af9df4220bf3db5de2b224418953c0dc1f625 160000 --- a/akg +++ b/akg @@ -1 +1 @@ -Subproject commit 5237a9a08bfa03cc4c6be912a43d5efc0f4f153d +Subproject commit f60af9df4220bf3db5de2b224418953c0dc1f625 diff --git a/build.sh b/build.sh index 1464b63c05ffa036af3540c77c3dd0529f36feb5..146b0de1c512a75b5c9e2b871fde03b2b2e0d835 100755 --- a/build.sh +++ b/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 diff --git a/cmake/package.cmake b/cmake/package.cmake index 4999d5186055f769d4708e1377cbb9c494e63202..18e365c91e5b68ed18850ee952d5d58586ec60f5 100644 --- a/cmake/package.cmake +++ b/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 diff --git a/mindspore/ccsrc/backend/kernel_compiler/common_utils.h b/mindspore/ccsrc/backend/kernel_compiler/common_utils.h index a59b1bf387fdcb2b7dea1bbdc98e186f6b1ba6d9..f78550fb1d935ea37ed302b32f22c7a7e54ce43a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/common_utils.h +++ b/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 support_devices = {"aicore", "aicpu", "cuda"}; diff --git a/model_zoo/official/cv/maskrcnn/scripts/run_standalone_train.sh b/model_zoo/official/cv/maskrcnn/scripts/run_standalone_train.sh old mode 100755 new mode 100644