mjxntpgec
/
mindspore
forked from OSSInnovation/mindspore
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

!3642 use akg to compile gpu ops rather than _akg 

Merge pull request !3642 from lingyunli63/use_full_akg_to_support_gpu
This commit is contained in:
mindspore-ci-bot 2020-08-03 11:53:40 +08:00 committed by Gitee
parent 8cef3ad328 b38d8ee837
commit 1354cf098b
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

2
akg

@ -1 +1 @@
Subproject commit f60af9df4220bf3db5de2b224418953c0dc1f625 Subproject commit 949a45538ccb7ae94ad73386b5e3e77005112eea

6
build.sh
View File

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

2
cmake/package.cmake
View File

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

2
mindspore/ccsrc/backend/kernel_compiler/common_utils.h
View File

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