Brian Martin 6c236fd939 Merged PR 6622174: merge latest onnxruntime into dmldev ... there was a merge conflict in onnxruntime/core/providers/dml/OperatorAuthorHelper/Common.h that required manual merging. Related work items: #36867798		2021-10-30 19:59:33 +00:00
..
inc	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00
shaders	Merge windowsai (winml layering) into master (#2956)	2020-02-04 17:12:19 -08:00
ConverterResourceStore.cpp	Merged PR 6622174: merge latest onnxruntime into dmldev	2021-10-30 19:59:33 +00:00
CpuDetensorizer.h	expose learningmodelpixelrange property (#5877)	2021-01-28 15:29:55 -08:00
CpuTensorizer.h	expose learningmodelpixelrange property (#5877)	2021-01-28 15:29:55 -08:00
D3DDeviceCache.cpp	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00
DeviceHelpers.cpp	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00
DisjointBufferHelpers.cpp	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00
EventTimer.h	make (de)tensorization events measure level events (#4958)	2020-08-28 16:49:32 -07:00
ImageConversionHelpers.cpp	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00
ImageConverter.cpp	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00
NominalRangeConverter.cpp	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00
pch.h	Merge windowsai (winml layering) into master (#2956)	2020-02-04 17:12:19 -08:00
TensorToVideoFrameConverter.cpp	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00
VideoFrameToTensorConverter.cpp	Merged PR 6524907: Fix merge conflicts from public ORT to WindowsAI ORT	2021-10-01 22:47:52 +00:00