From 34b1bf2db7d9b0b7a7c76b7965e9a9e4636ec5ad Mon Sep 17 00:00:00 2001
From: Brian Martin <42186431+martinb35@users.noreply.github.com>
Date: Mon, 25 Nov 2019 14:38:19 -0800
Subject: [PATCH] Brianma/testfails (#2473)

* add missing ir version to dictvectorizer-string.onnx

* add missing ir version to relu.onnx

* add missing ir version to zipmap*onnx

* add IR version to manually generated models

* remove an unnecessary ifdef dml
---
 winml/lib/Api.Image/DeviceHelpers.cpp           |   6 +-----
 .../models/dictvectorizer-string.onnx           | Bin 133 -> 143 bytes
 winml/test/collateral/models/relu.onnx          |   2 +-
 winml/test/collateral/models/zipmap-int64.onnx  | Bin 126 -> 136 bytes
 winml/test/collateral/models/zipmap-string.onnx | Bin 137 -> 147 bytes
 winml/test/common/protobufHelpers.cpp           |   1 +
 6 files changed, 3 insertions(+), 6 deletions(-)

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 <d3d11on12.h>
 #endif USE_DML
 
+#include <d3d11on12.h>
 #include <wil/winrt.h>
 #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 9146e3172db7f4a721668cbeae5799b66ec9a7f1..389ec8dee78be5853837f62b17dddb03472bfb2a 100644
GIT binary patch
delta 27
icmZo=>}M3_U>0IeDNn4-OD$4j%g@WJ$jzC^SpxuKTnHin

delta 17
YcmeBYY-QvWVoxbgtjtR-nkZZY04gg5Qvd(}

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
 
 
X
Y"ReluZ
 
X
diff --git a/winml/test/collateral/models/zipmap-int64.onnx b/winml/test/collateral/models/zipmap-int64.onnx
index 70a0f8322764c400a9a33c16819597ee1be16778..9884705603685aa6d13b4975de51f7f95d430cae 100644
GIT binary patch
delta 26
hcmb>HU=-$H7GlrNtjsUXOIKpc&&#XG&6&tq3IJgp2p9kW

delta 16
XcmeBRtm717&(5sOFU?DzC|n8vD4PXI

diff --git a/winml/test/collateral/models/zipmap-string.onnx b/winml/test/collateral/models/zipmap-string.onnx
index 07de232b1b7ddf8eed6a7d5db2fd6230ac058e8f..c29d5a72f4cabd80bc0d5c148a05f367bfc301ba 100644
GIT binary patch
delta 27
icmeBVoXjZ9!7Rj{omrV*nwPG`mY<hbk()D-vjG5O{Rlb$

delta 17
YcmbQt*vZH##Gaj5nO~ZhK2f*<04p2?YXATM

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