From 9017e93701dc60af14ba2e667c17e2ac31348bd4 Mon Sep 17 00:00:00 2001
From: KeDengMS <kedeng@microsoft.com>
Date: Wed, 18 Dec 2019 16:16:46 -0800
Subject: [PATCH] [NupharEP] fix for Windows build and VS 2019 (#2694)

---
 cmake/CMakeLists.txt                                       | 7 +++++++
 onnxruntime/core/codegen/common/settings.h                 | 1 +
 .../core/providers/nuphar/common/nuphar_tvm_utils.cc       | 2 ++
 onnxruntime/core/providers/nuphar/kernel.cc                | 2 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 2a0d1b03d5..8012d178f0 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -392,6 +392,13 @@ if (onnxruntime_USE_TVM)
   set_target_properties(tvm_runtime PROPERTIES FOLDER "External/tvm")
   set_target_properties(nnvm_compiler PROPERTIES FOLDER "External/tvm")
 
+  if (onnxruntime_USE_MKLML)
+    add_dependencies(tvm project_mklml)
+    add_dependencies(tvm_topi project_mklml)
+    add_dependencies(tvm_runtime project_mklml)
+    add_dependencies(nnvm_compiler project_mklml)
+  endif()
+
   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
diff --git a/onnxruntime/core/codegen/common/settings.h b/onnxruntime/core/codegen/common/settings.h
index 4bce9a614b..e327b0e207 100644
--- a/onnxruntime/core/codegen/common/settings.h
+++ b/onnxruntime/core/codegen/common/settings.h
@@ -3,6 +3,7 @@
 
 #pragma once
 #include <map>
+#include <string>
 
 namespace onnxruntime {
 namespace codegen {
diff --git a/onnxruntime/core/providers/nuphar/common/nuphar_tvm_utils.cc b/onnxruntime/core/providers/nuphar/common/nuphar_tvm_utils.cc
index db5b9a3fc1..f0fcf46558 100644
--- a/onnxruntime/core/providers/nuphar/common/nuphar_tvm_utils.cc
+++ b/onnxruntime/core/providers/nuphar/common/nuphar_tvm_utils.cc
@@ -15,7 +15,9 @@
 #include "gsl/gsl"
 #include <topi/detail/extern.h>
 #include <tvm/ir_pass.h>
+#define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING // required by VS 2019
 #include <experimental/filesystem>
+#undef _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING
 #include <atomic>
 #include <fstream>
 namespace fs = std::experimental::filesystem;
diff --git a/onnxruntime/core/providers/nuphar/kernel.cc b/onnxruntime/core/providers/nuphar/kernel.cc
index 459894105e..781fa52369 100644
--- a/onnxruntime/core/providers/nuphar/kernel.cc
+++ b/onnxruntime/core/providers/nuphar/kernel.cc
@@ -180,7 +180,7 @@ ONNX_OPERATOR_KERNEL_EX(
     9,
     kNupharExecutionProvider,
     KernelDefBuilder()
-        .TypeConstraint("T1", DataTypeImpl::AllFixedSizeTensorTypes())
+        .TypeConstraint("T1", DataTypeImpl::AllFixedSizeTensorExceptHalfTypes())
         .TypeConstraint("T2", DataTypeImpl::AllFixedSizeTensorExceptHalfTypes()),
     nuphar::NupharKernel);