diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e2490bb499..1d6381723e9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,20 +84,7 @@ if (ENABLE_GE OR ENABLE_D OR ENABLE_TESTCASES) endif() if (ENABLE_AKG AND ENABLE_D) - set(AKG_PATH "${CMAKE_SOURCE_DIR}/akg/mindspore/ccsrc/akg") - add_subdirectory(${AKG_PATH}) - set(TVM_PATH "${CMAKE_CURRENT_BINARY_DIR}/akg/mindspore/ccsrc/akg/incubator-tvm") - include_directories("${TVM_PATH}/include") - include_directories("${TVM_PATH}") - include_directories("${TVM_PATH}/src") - include_directories("${TVM_PATH}/src/schedule") - include_directories("${TVM_PATH}/3rdparty/dmlc-core/include") - include_directories("${TVM_PATH}/3rdparty/dlpack/include") - include_directories("${TVM_PATH}/3rdparty/compiler-rt") - include_directories("${TVM_PATH}/3rdparty/rang/include") - include_directories("${TVM_PATH}/3rdparty/picojson") - include_directories("${AKG_PATH}") - include_directories("${AKG_PATH}/include") + add_subdirectory("${CMAKE_SOURCE_DIR}/akg") endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden") diff --git a/akg b/akg index 02133cc7637..f257d67b1e8 160000 --- a/akg +++ b/akg @@ -1 +1 @@ -Subproject commit 02133cc76374b8c2d6c73f24a58d3c28e1e4d14e +Subproject commit f257d67b1e869b3a613cb9806b73ddc36cfe86c8 diff --git a/build.sh b/build.sh index 7f17467aa42..f80ab9b10c5 100755 --- a/build.sh +++ b/build.sh @@ -454,11 +454,4 @@ fi cp -rf ${BUILD_PATH}/package/mindspore/lib ${BUILD_PATH}/../mindspore cp -rf ${BUILD_PATH}/package/mindspore/*.so ${BUILD_PATH}/../mindspore -if [[ "X$ENABLE_AKG" = "Xon" ]] && [[ "X$ENABLE_D" = "Xon" ]]; then - so_lib_dir=${BUILD_PATH}/package/mindspore/lib - akg_build_dir=${BUILD_PATH}/mindspore/akg/mindspore/ccsrc/akg - mkdir -p ${so_lib_dir} - cp ${akg_build_dir}/*.so ${so_lib_dir} -fi - echo "---------------- mindspore: build end ----------------" diff --git a/cmake/package.cmake b/cmake/package.cmake index ea1e06161a5..ebaec331465 100644 --- a/cmake/package.cmake +++ b/cmake/package.cmake @@ -223,21 +223,13 @@ if (ENABLE_GPU) endif () if (ENABLE_D AND ENABLE_AKG) - set (AKG_PATH ${CMAKE_SOURCE_DIR}/akg) - set (TVM_PATH ${CMAKE_SOURCE_DIR}/build/mindspore/akg/mindspore/ccsrc/akg/incubator-tvm) + set (AKG_PATH ${CMAKE_SOURCE_DIR}/build/mindspore/akg) install( DIRECTORY - ${AKG_PATH}/mindspore/akg + ${AKG_PATH}/akg DESTINATION ${INSTALL_PY_DIR}/.. COMPONENT mindspore ) - install( - DIRECTORY - ${TVM_PATH}/topi/python/topi - ${TVM_PATH}/python/tvm - DESTINATION ${INSTALL_PY_DIR}/../akg - COMPONENT mindspore - ) endif() if (EXISTS ${CMAKE_SOURCE_DIR}/mindspore/dataset)