From d5d9e92336e40846970fd602706b44ddd0d1caf9 Mon Sep 17 00:00:00 2001 From: Tron Zhang Date: Thu, 2 Jul 2020 11:23:52 +0800 Subject: [PATCH] remove submodule akg --- CMakeLists.txt | 4 ---- akg | 1 - build.sh | 14 +------------- cmake/options.cmake | 1 - cmake/package.cmake | 10 ---------- 5 files changed, 1 insertion(+), 29 deletions(-) delete mode 160000 akg diff --git a/CMakeLists.txt b/CMakeLists.txt index 1d6381723..3d55ff6ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,10 +83,6 @@ if (ENABLE_GE OR ENABLE_D OR ENABLE_TESTCASES) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/graphengine/third_party/fwkacllib/inc/toolchain) endif() -if (ENABLE_AKG AND ENABLE_D) - add_subdirectory("${CMAKE_SOURCE_DIR}/akg") -endif() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") add_subdirectory(mindspore/ccsrc) if (ENABLE_TESTCASES) diff --git a/akg b/akg deleted file mode 160000 index f257d67b1..000000000 --- a/akg +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f257d67b1e869b3a613cb9806b73ddc36cfe86c8 diff --git a/build.sh b/build.sh index f80ab9b10..c360b0cd3 100755 --- a/build.sh +++ b/build.sh @@ -25,7 +25,7 @@ usage() echo "Usage:" echo "bash build.sh [-d] [-r] [-v] [-c on|off] [-t on|off] [-g on|off] [-h] [-b ge] [-m infer|train] \\" echo " [-a on|off] [-Q on|off] [-p on|off] [-i] [-L] [-R] [-D on|off] [-j[n]] [-e gpu|d|cpu] \\" - echo " [-P on|off] [-z [on|off]] [-M on|off] [-V 9.2|10.1] [-I] [-K]" + echo " [-P on|off] [-z [on|off]] [-M on|off] [-V 9.2|10.1] [-I]" echo "" echo "Options:" echo " -d Debug mode" @@ -52,7 +52,6 @@ usage() echo " -M Enable MPI and NCCL for GPU training, default on" echo " -V Specify the minimum required cuda version, default CUDA 9.2" echo " -I Compile predict, default off" - echo " -K Compile with AKG, default off" } # check value of input is 'on' or 'off' @@ -91,7 +90,6 @@ checkopts() COMPILE_PREDICT="off" USE_GLOG="on" PREDICT_PLATFORM="" - ENABLE_AKG="off" # Process the options while getopts 'drvj:c:t:hsb:a:g:p:ie:m:I:LRP:Q:D:zM:V:K' opt @@ -230,10 +228,6 @@ checkopts() exit 1 fi ;; - K) - ENABLE_AKG="on" - echo "enable compile with akg" - ;; *) echo "Unknown option ${opt}!" usage @@ -245,9 +239,6 @@ checkopts "$@" 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" ]]; then - git submodule update --init --recursive akg -fi build_exit() { @@ -310,9 +301,6 @@ 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" ]]; then - CMAKE_ARGS="${CMAKE_ARGS} -DENABLE_AKG=ON" - fi echo "${CMAKE_ARGS}" if [[ "X$INC_BUILD" = "Xoff" ]]; then cmake ${CMAKE_ARGS} ../.. diff --git a/cmake/options.cmake b/cmake/options.cmake index 3e03ed333..a9801292f 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -16,7 +16,6 @@ option(ENABLE_DUMP_PROTO "Enable dump anf graph to file in ProtoBuffer format, d option(ENABLE_DUMP_E2E "Enable dump e2e file, default on" OFF) option(ENABLE_DUMP_IR "Enable dump funciton graph ir, default on" ON) option(ENABLE_MPI "enable mpi" OFF) -option(ENABLE_AKG "enable akg" OFF) if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") if (WIN32) diff --git a/cmake/package.cmake b/cmake/package.cmake index ebaec3314..875ba5217 100644 --- a/cmake/package.cmake +++ b/cmake/package.cmake @@ -222,16 +222,6 @@ if (ENABLE_GPU) endif () endif () -if (ENABLE_D AND ENABLE_AKG) - set (AKG_PATH ${CMAKE_SOURCE_DIR}/build/mindspore/akg) - install( - DIRECTORY - ${AKG_PATH}/akg - DESTINATION ${INSTALL_PY_DIR}/.. - COMPONENT mindspore - ) -endif() - if (EXISTS ${CMAKE_SOURCE_DIR}/mindspore/dataset) install( DIRECTORY ${CMAKE_SOURCE_DIR}/mindspore/dataset -- GitLab