You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tvm.apache.org by ar...@apache.org on 2022/11/28 18:20:54 UTC
[tvm] 01/01: Revert "[microTVM] enable building microTVM components by default (#13073)"
This is an automated email from the ASF dual-hosted git repository.
areusch pushed a commit to branch revert-13073-micro-always-on
in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 5be8107847ada08e85be3bfc7389e0e06f30df76
Author: Andrew Reusch <ar...@gmail.com>
AuthorDate: Mon Nov 28 10:20:47 2022 -0800
Revert "[microTVM] enable building microTVM components by default (#13073)"
This reverts commit e6629706479421783d7ee5fa29eb3fe862d9b981.
---
CMakeLists.txt | 7 +------
cmake/config.cmake | 3 +++
conda/recipe/build.sh | 3 ---
conda/recipe/meta.yaml | 3 ---
tests/scripts/task_config_build_arm.sh | 1 +
tests/scripts/task_config_build_cortexm.sh | 1 +
tests/scripts/task_config_build_cpu.sh | 1 +
tests/scripts/task_config_build_gpu.sh | 1 +
tests/scripts/task_config_build_gpu_other.sh | 1 +
tests/scripts/task_config_build_hexagon.sh | 2 ++
tests/scripts/task_config_build_i386.sh | 1 +
tests/scripts/task_config_build_riscv.sh | 1 +
tests/scripts/task_config_build_wasm.sh | 1 +
13 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cb0bad8a50..736d516fa1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ tvm_option(USE_OPENMP "Build with OpenMP thread pool implementation" OFF)
tvm_option(USE_RELAY_DEBUG "Building Relay in debug mode..." OFF)
tvm_option(USE_RTTI "Build with RTTI" ON)
tvm_option(USE_MSVC_MT "Build with MT" OFF)
-tvm_option(USE_MICRO "Build with Micro TVM support" ON)
+tvm_option(USE_MICRO "Build with Micro TVM support" OFF)
tvm_option(INSTALL_DEV "Install compiler infrastructure" OFF)
tvm_option(HIDE_PRIVATE_SYMBOLS "Compile with -fvisibility=hidden." OFF)
tvm_option(USE_TF_TVMDSOOP "Build with TensorFlow TVMDSOOp" OFF)
@@ -118,11 +118,6 @@ tvm_option(USE_CLML "Build with CLML Codegen support" OFF)
tvm_option(USE_CLML_GRAPH_EXECUTOR "Build with CLML graph runtime" OFF)
tvm_option(USE_UMA "Build with UMA support" OFF)
-# disable microTVM for iOS and hexagon builds
-if(${CMAKE_SYSTEM_NAME} MATCHES "iOS" OR USE_HEXAGON)
- set(USE_MICRO OFF)
-endif()
-
# include directories
include_directories(${CMAKE_INCLUDE_PATH})
include_directories("include")
diff --git a/cmake/config.cmake b/cmake/config.cmake
index 0c803c0b6a..679f5c459e 100644
--- a/cmake/config.cmake
+++ b/cmake/config.cmake
@@ -96,6 +96,9 @@ set(USE_SPIRV_KHR_INTEGER_DOT_PRODUCT OFF)
# Whether enable OpenGL runtime
set(USE_OPENGL OFF)
+# Whether enable MicroTVM runtime
+set(USE_MICRO OFF)
+
# Whether enable RPC runtime
set(USE_RPC ON)
diff --git a/conda/recipe/build.sh b/conda/recipe/build.sh
index aa2d2f3d5f..0131fd65a4 100755
--- a/conda/recipe/build.sh
+++ b/conda/recipe/build.sh
@@ -45,9 +45,6 @@ rm -rf build || true
mkdir -p build
cd build
-export PREFIX="${PREFIX}/"
-cp -f ${PREFIX}/bin/ranlib $PREFIX
-
cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" \
-DCMAKE_BUILD_TYPE=Release \
-DUSE_RPC=ON \
diff --git a/conda/recipe/meta.yaml b/conda/recipe/meta.yaml
index b8463ebdd0..519b84c570 100644
--- a/conda/recipe/meta.yaml
+++ b/conda/recipe/meta.yaml
@@ -45,7 +45,6 @@ requirements:
host:
- zlib
- llvmdev >=11
- - cctools # [not win]
outputs:
- name: {{ pkg_name }}-libs
@@ -63,12 +62,10 @@ outputs:
- llvmdev >=11
- {{ pin_compatible('cudatoolkit', lower_bound=cuda_version, max_pin='x.x') }} # [cuda]
- cudnn >=7.6.0 # [cuda]
- - cctools # [not win]
run:
- llvmdev >=11
- {{ pin_compatible('cudatoolkit', lower_bound=cuda_version, max_pin='x.x') }} # [cuda]
- cudnn >=7.6.0 # [cuda]
- - cctools # [not win]
- name: {{ pkg_name }}
script: install_tvm_python.sh # [not win]
diff --git a/tests/scripts/task_config_build_arm.sh b/tests/scripts/task_config_build_arm.sh
index 35ecde2904..516e6ac867 100755
--- a/tests/scripts/task_config_build_arm.sh
+++ b/tests/scripts/task_config_build_arm.sh
@@ -25,6 +25,7 @@ cp ../cmake/config.cmake .
echo set\(USE_SORT ON\) >> config.cmake
echo set\(USE_RPC ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
echo set\(USE_PROFILER ON\) >> config.cmake
echo set\(USE_LLVM llvm-config-8\) >> config.cmake
diff --git a/tests/scripts/task_config_build_cortexm.sh b/tests/scripts/task_config_build_cortexm.sh
index 5407079c1a..f15ed81711 100755
--- a/tests/scripts/task_config_build_cortexm.sh
+++ b/tests/scripts/task_config_build_cortexm.sh
@@ -24,6 +24,7 @@ cd "$BUILD_DIR"
cp ../cmake/config.cmake .
echo set\(USE_SORT ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_CMSISNN ON\) >> config.cmake
echo set\(USE_ETHOSU ON\) >> config.cmake
echo set\(USE_UMA ON\) >> config.cmake
diff --git a/tests/scripts/task_config_build_cpu.sh b/tests/scripts/task_config_build_cpu.sh
index 66fc161ece..e3d8aa9a1d 100755
--- a/tests/scripts/task_config_build_cpu.sh
+++ b/tests/scripts/task_config_build_cpu.sh
@@ -24,6 +24,7 @@ cd "$BUILD_DIR"
cp ../cmake/config.cmake .
echo set\(USE_SORT ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
echo set\(USE_PROFILER ON\) >> config.cmake
echo set\(USE_DNNL ON\) >> config.cmake
diff --git a/tests/scripts/task_config_build_gpu.sh b/tests/scripts/task_config_build_gpu.sh
index 0b8be8ac4c..ca5f3e935c 100755
--- a/tests/scripts/task_config_build_gpu.sh
+++ b/tests/scripts/task_config_build_gpu.sh
@@ -29,6 +29,7 @@ echo set\(USE_CUDA ON\) >> config.cmake
echo set\(USE_VULKAN ON\) >> config.cmake
echo set\(USE_OPENGL ON\) >> config.cmake
echo set\(USE_OPENCL ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
echo set\(USE_LLVM \"/usr/bin/llvm-config-9 --link-static\"\) >> config.cmake
echo set\(USE_NNPACK ON\) >> config.cmake
diff --git a/tests/scripts/task_config_build_gpu_other.sh b/tests/scripts/task_config_build_gpu_other.sh
index 747e1006e5..6fb10d4450 100755
--- a/tests/scripts/task_config_build_gpu_other.sh
+++ b/tests/scripts/task_config_build_gpu_other.sh
@@ -27,6 +27,7 @@ cp ../cmake/config.cmake .
echo set\(USE_OPENCL ON\) >> config.cmake
echo set\(USE_ROCM ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_PROFILER ON\) >> config.cmake
echo set\(USE_LIBBACKTRACE OFF\) >> config.cmake
echo set\(CMAKE_CXX_FLAGS -Werror\) >> config.cmake
diff --git a/tests/scripts/task_config_build_hexagon.sh b/tests/scripts/task_config_build_hexagon.sh
index c8e70c00f9..0736ed6b53 100755
--- a/tests/scripts/task_config_build_hexagon.sh
+++ b/tests/scripts/task_config_build_hexagon.sh
@@ -25,6 +25,8 @@ cp ../cmake/config.cmake .
echo set\(USE_SORT ON\) >> config.cmake
echo set\(USE_RPC ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
+echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
echo set\(USE_LLVM "${CLANG_LLVM_HOME}/bin/llvm-config"\) >> config.cmake
if [[ ${CI:-false} == "true" ]]; then
diff --git a/tests/scripts/task_config_build_i386.sh b/tests/scripts/task_config_build_i386.sh
index 18a7189e14..369706dfd3 100755
--- a/tests/scripts/task_config_build_i386.sh
+++ b/tests/scripts/task_config_build_i386.sh
@@ -25,6 +25,7 @@ cp ../cmake/config.cmake .
echo set\(USE_SORT ON\) >> config.cmake
echo set\(USE_RPC ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
echo set\(USE_PROFILER ON\) >> config.cmake
echo set\(USE_LLVM llvm-config-4.0\) >> config.cmake
diff --git a/tests/scripts/task_config_build_riscv.sh b/tests/scripts/task_config_build_riscv.sh
index b39cb4b28e..9e11e5e255 100755
--- a/tests/scripts/task_config_build_riscv.sh
+++ b/tests/scripts/task_config_build_riscv.sh
@@ -24,6 +24,7 @@ cd "$BUILD_DIR"
cp ../cmake/config.cmake .
echo set\(USE_SORT ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_CMSISNN ON\) >> config.cmake
echo set\(USE_UMA ON\) >> config.cmake
echo set\(USE_PROFILER ON\) >> config.cmake
diff --git a/tests/scripts/task_config_build_wasm.sh b/tests/scripts/task_config_build_wasm.sh
index e96288e36b..daa5481bea 100755
--- a/tests/scripts/task_config_build_wasm.sh
+++ b/tests/scripts/task_config_build_wasm.sh
@@ -24,6 +24,7 @@ cd "$BUILD_DIR"
cp ../cmake/config.cmake .
echo set\(USE_SORT ON\) >> config.cmake
+echo set\(USE_MICRO ON\) >> config.cmake
echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
echo set\(USE_PROFILER ON\) >> config.cmake
echo set\(USE_LLVM llvm-config-11\) >> config.cmake