From d0ff2621eeb2d965cfd8c5fc458d3f4615d6c16c Mon Sep 17 00:00:00 2001
From: KeDengMS <kedeng@microsoft.com>
Date: Fri, 13 Aug 2021 16:13:34 -0700
Subject: [PATCH] [Nuphar] Fix Windows build in VS 2019 (#8728)

Update TVM to fix c++17 build break in VS 2019
Remove tvm::nnvm from build
---
 cmake/CMakeLists.txt           | 10 ++++------
 cmake/external/tvm             |  2 +-
 cmake/onnxruntime_python.cmake |  2 +-
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 0280c5bea2..e0e09afbfc 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -861,7 +861,7 @@ set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DGSL_UNENFORCED_O
 include(eigen)
 
 #onnxruntime_EXTERNAL_LIBRARIES could contain onnx, onnx_proto,libprotobuf, cuda/cudnn,
-# dnnl/mklml, onnxruntime_codegen_tvm, tvm, nnvm_compiler and pthread
+# dnnl/mklml, onnxruntime_codegen_tvm, tvm and pthread
 # pthread is always at the last
 set(onnxruntime_EXTERNAL_LIBRARIES onnx onnx_proto ${PROTOBUF_LIB} re2::re2)
 
@@ -1263,14 +1263,12 @@ if (onnxruntime_USE_TVM)
   set_target_properties(tvm PROPERTIES FOLDER "External/tvm")
   set_target_properties(tvm_topi PROPERTIES FOLDER "External/tvm")
   set_target_properties(tvm_runtime PROPERTIES FOLDER "External/tvm")
-  set_target_properties(nnvm_compiler PROPERTIES FOLDER "External/tvm")
 
   set(TVM_INCLUDES ${PROJECT_SOURCE_DIR}/external/tvm/include
     ${PROJECT_SOURCE_DIR}/external/tvm/3rdparty/dmlc-core/include
     ${PROJECT_SOURCE_DIR}/external/tvm/3rdparty/dlpack/include
     $<TARGET_PROPERTY:tvm,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:tvm_topi,INTERFACE_INCLUDE_DIRECTORIES>
-    $<TARGET_PROPERTY:nnvm_compiler,INTERFACE_INCLUDE_DIRECTORIES>)
+    $<TARGET_PROPERTY:tvm_topi,INTERFACE_INCLUDE_DIRECTORIES>)
   add_definitions(-DUSE_TVM)
 
   set(onnxruntime_tvm_libs onnxruntime_codegen_tvm)
@@ -1280,8 +1278,8 @@ if (onnxruntime_USE_TVM)
       set(FS_STDLIB stdc++fs)
     endif()
   endif()
-  list(APPEND onnxruntime_EXTERNAL_LIBRARIES tvm nnvm_compiler ${FS_STDLIB})
-  list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES tvm nnvm_compiler)
+  list(APPEND onnxruntime_EXTERNAL_LIBRARIES tvm ${FS_STDLIB})
+  list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES tvm)
 endif()
 
 if (onnxruntime_ENABLE_EXTENSION_CUSTOM_OPS)
diff --git a/cmake/external/tvm b/cmake/external/tvm
index eab844a872..a1241a967e 160000
--- a/cmake/external/tvm
+++ b/cmake/external/tvm
@@ -1 +1 @@
-Subproject commit eab844a87298d500f1924f8a7cadb4cbee426093
+Subproject commit a1241a967ec7920310a696a6c22ae2426752e135
diff --git a/cmake/onnxruntime_python.cmake b/cmake/onnxruntime_python.cmake
index 25383bf6cd..837a87af7b 100644
--- a/cmake/onnxruntime_python.cmake
+++ b/cmake/onnxruntime_python.cmake
@@ -546,7 +546,7 @@ if (onnxruntime_USE_TVM)
   add_custom_command(
     TARGET onnxruntime_pybind11_state POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E copy
-        $<TARGET_FILE:tvm> $<TARGET_FILE:nnvm_compiler>
+        $<TARGET_FILE:tvm>
         $<TARGET_FILE_DIR:${build_output_target}>/onnxruntime/capi/
   )
 endif()