saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-06-08 00:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Brianma/testfails (#2473)

Browse source 
* 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
This commit is contained in:
Brian Martin 2019-11-25 14:38:19 -08:00 committed by GitHub
parent befe933b86
commit 34b1bf2db7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
winml/lib/Api.Image/DeviceHelpers.cpp
View file

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

BIN
winml/test/collateral/models/dictvectorizer-string.onnx
View file

Binary file not shown.

2
winml/test/collateral/models/relu.onnx
View file

@ -1,4 +1,4 @@
justoeck:0
justoeck"onnxml:0
XY"ReluZ
X

BIN
winml/test/collateral/models/zipmap-int64.onnx
View file

Binary file not shown.

BIN
winml/test/collateral/models/zipmap-string.onnx
View file

Binary file not shown.

1
winml/test/common/protobufHelpers.cpp
View file

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