diff --git a/winml/lib/Api.Image/DeviceHelpers.cpp b/winml/lib/Api.Image/DeviceHelpers.cpp index 148e91d0d9..c07c31b08f 100644 --- a/winml/lib/Api.Image/DeviceHelpers.cpp +++ b/winml/lib/Api.Image/DeviceHelpers.cpp @@ -5,9 +5,9 @@ #ifdef USE_DML #include "DirectML.h" -#include #endif USE_DML +#include #include #include "inc/DeviceHelpers.h" @@ -301,7 +301,6 @@ HRESULT GetDXCoreHardwareAdapterWithPreference(DXGI_GPU_PREFERENCE preference, I #endif HRESULT CreateD3D11On12Device(ID3D12Device* device12, ID3D11Device** device11) { -#ifdef USE_DML return DeviceHelpers::RunDelayLoadedApi( D3D11On12CreateDevice, device12, // pointer to d3d12 device @@ -314,9 +313,6 @@ HRESULT CreateD3D11On12Device(ID3D12Device* device12, ID3D11Device** device11) { device11, // d3d11 device out param nullptr, // pointer to d3d11 device context (unused) nullptr); // pointer to the returned feature level (unused) -#else - return E_NOTIMPL; -#endif USE_DML } HRESULT GetGPUPreference(winrt::Windows::AI::MachineLearning::LearningModelDeviceKind deviceKind, DXGI_GPU_PREFERENCE* preference) noexcept { diff --git a/winml/test/collateral/models/dictvectorizer-string.onnx b/winml/test/collateral/models/dictvectorizer-string.onnx index 9146e3172d..389ec8dee7 100644 Binary files a/winml/test/collateral/models/dictvectorizer-string.onnx and b/winml/test/collateral/models/dictvectorizer-string.onnx differ diff --git a/winml/test/collateral/models/relu.onnx b/winml/test/collateral/models/relu.onnx index e316dd1eb0..ec49080b3f 100644 --- a/winml/test/collateral/models/relu.onnx +++ b/winml/test/collateral/models/relu.onnx @@ -1,4 +1,4 @@ -justoeck:0 +justoeck"onnxml:0 XY"ReluZ X diff --git a/winml/test/collateral/models/zipmap-int64.onnx b/winml/test/collateral/models/zipmap-int64.onnx index 70a0f83227..9884705603 100644 Binary files a/winml/test/collateral/models/zipmap-int64.onnx and b/winml/test/collateral/models/zipmap-int64.onnx differ diff --git a/winml/test/collateral/models/zipmap-string.onnx b/winml/test/collateral/models/zipmap-string.onnx index 07de232b1b..c29d5a72f4 100644 Binary files a/winml/test/collateral/models/zipmap-string.onnx and b/winml/test/collateral/models/zipmap-string.onnx differ diff --git a/winml/test/common/protobufHelpers.cpp b/winml/test/common/protobufHelpers.cpp index 025f8d2e73..0870b43765 100644 --- a/winml/test/common/protobufHelpers.cpp +++ b/winml/test/common/protobufHelpers.cpp @@ -182,6 +182,7 @@ winrt::Windows::AI::MachineLearning::LearningModel ProtobufHelpers::CreateModel( uint32_t num_elements) { onnx::ModelProto model; + model.set_ir_version(onnx::Version::IR_VERSION); // Set opset import auto opsetimportproto = model.add_opset_import();