From 0d979a11342901f4948c8692d8228134409b6d65 Mon Sep 17 00:00:00 2001
From: wenfangpei <peiwenfang@huawei.com>
Date: Sat, 20 Jun 2020 17:16:25 +0800
Subject: [PATCH] Modify reason:adapt building AKG in MindSpore Modify content:
 Submitter:wenfangpei Reviewer:

---
 CMakeLists.txt                | 9 +++++----
 cmake/external_libs/isl.cmake | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ee0155..f48f0f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,18 +25,19 @@ project(akg C CXX)
 
 set(AKG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
 
+include(cmake/utils.cmake)
+include(cmake/external_libs/isl.cmake)
 if(ENABLE_AKG)
   message("-- Build akg in Mindspore")
   execute_process(COMMAND bash ${AKG_SOURCE_DIR}/third_party/apply_patches.sh ${CMAKE_CURRENT_BINARY_DIR} "1")
+  set(TVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/ktvm")
 else()
   message("-- Build akg alone")
-  include(cmake/utils.cmake)
-  include(cmake/external_libs/isl.cmake)
   execute_process(COMMAND bash ${AKG_SOURCE_DIR}/third_party/apply_patches.sh ${CMAKE_CURRENT_BINARY_DIR} "akg")
+  set(TVM_DIR "${CMAKE_BINARY_DIR}/ktvm")
 endif()
 
-set(TVM_DIR "${CMAKE_CURRENT_BINARY_DIR}/ktvm")
-set(ISL_DIR "${CMAKE_CURRENT_BINARY_DIR}/_deps/isl-src")
+set(ISL_DIR "${CMAKE_BINARY_DIR}/_deps/isl-src")
 
 file(COPY ${AKG_SOURCE_DIR}/python/akg DESTINATION
     ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/cmake/external_libs/isl.cmake b/cmake/external_libs/isl.cmake
index 8298c2b..5b3fd56 100644
--- a/cmake/external_libs/isl.cmake
+++ b/cmake/external_libs/isl.cmake
@@ -4,4 +4,4 @@ mindspore_add_pkg(isl
         VER 0.22
         URL http://isl.gforge.inria.fr/isl-0.22.tar.gz
         MD5 671d0a5e10467a5c6db0893255278845
-        PATCHES ${CMAKE_SOURCE_DIR}/third_party/patch/isl/isl.patch)
+        PATCHES ${CMAKE_CURRENT_SOURCE_DIR}/third_party/patch/isl/isl.patch)
-- 
GitLab