From 4bc8e39125a3965732a7409c188fe3e830c58888 Mon Sep 17 00:00:00 2001 From: reminisce Date: Mon, 11 Nov 2019 00:40:31 -0800 Subject: [PATCH] Update tvm --- .gitmodules | 2 +- 3rdparty/tvm | 2 +- Makefile | 2 +- cmake/BuildTVM.cmake | 3 +++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 90ef157f0eec..1900820d4c86 100644 --- a/.gitmodules +++ b/.gitmodules @@ -19,7 +19,7 @@ branch = master [submodule "3rdparty/tvm"] path = 3rdparty/tvm - url = https://github.com/dmlc/tvm + url = https://github.com/apache/incubator-tvm.git [submodule "3rdparty/onnx-tensorrt"] path = 3rdparty/onnx-tensorrt url = https://github.com/onnx/onnx-tensorrt.git diff --git a/3rdparty/tvm b/3rdparty/tvm index afd4b3e44509..cff62bdbd20b 160000 --- a/3rdparty/tvm +++ b/3rdparty/tvm @@ -1 +1 @@ -Subproject commit afd4b3e4450984358e9d79a7e8e578483cb7b017 +Subproject commit cff62bdbd20bab3ebcc27213be1e6d79da00c842 diff --git a/Makefile b/Makefile index 4746cc434de2..ced0dbf97b9f 100644 --- a/Makefile +++ b/Makefile @@ -617,7 +617,7 @@ lib/libtvm_runtime.so: [ -e $(LLVM_PATH)/bin/llvm-config ] || sh $(ROOTDIR)/contrib/tvmop/prepare_tvm.sh; \ cd $(TVM_PATH)/build; \ cmake -DUSE_LLVM="$(LLVM_PATH)/bin/llvm-config" \ - -DUSE_SORT=OFF -DUSE_CUDA=$(TVM_USE_CUDA) -DUSE_CUDNN=OFF ..; \ + -DUSE_SORT=OFF -DUSE_CUDA=$(TVM_USE_CUDA) -DUSE_CUDNN=OFF -DUSE_OPENMP=ON ..; \ $(MAKE) VERBOSE=1; \ mkdir -p $(ROOTDIR)/lib; \ cp $(TVM_PATH)/build/libtvm_runtime.so $(ROOTDIR)/lib/libtvm_runtime.so; \ diff --git a/cmake/BuildTVM.cmake b/cmake/BuildTVM.cmake index db8b33b84596..7fcf706ffb7c 100644 --- a/cmake/BuildTVM.cmake +++ b/cmake/BuildTVM.cmake @@ -133,3 +133,6 @@ set(USE_VTA_TSIM OFF) # Whether use Relay debug mode set(USE_RELAY_DEBUG OFF) + +# Use OPENMP thread pool to be compatible with MXNet +set(USE_OPENMP ON)