[NupharEP] fix for Windows build and VS 2019 (#2694)

This commit is contained in:
KeDengMS 2019-12-18 16:16:46 -08:00 committed by Changming Sun
parent 89d6bfaa94
commit 9017e93701
4 changed files with 11 additions and 1 deletions

View file

@ -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

View file

@ -3,6 +3,7 @@
#pragma once
#include <map>
#include <string>
namespace onnxruntime {
namespace codegen {

View file

@ -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;

View file

@ -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);