From 3e8768d1b8f26d01b7d375d8872c3b3f0792f143 Mon Sep 17 00:00:00 2001
From: Jeff Bloomfield <jeffbloo@ntdev.microsoft.com>
Date: Mon, 13 Jan 2020 17:58:02 -0800
Subject: [PATCH] Merge fixes

---
 .../dml/DmlExecutionProvider/src/ExecutionProvider.h          | 2 +-
 .../providers/dml/DmlExecutionProvider/src/GraphDescBuilder.h | 2 +-
 .../providers/dml/DmlExecutionProvider/src/GraphPartitioner.h | 4 ++--
 .../dml/OperatorAuthorHelper/SchemaInferenceOverrider.h       | 2 +-
 winml/adapter/AbiCustomRegistryImpl.cpp                       | 4 +++-
 winml/adapter/AbiCustomRegistryImpl.h                         | 1 +
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/ExecutionProvider.h b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/ExecutionProvider.h
index 52986d1faa..4c14420441 100644
--- a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/ExecutionProvider.h
+++ b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/ExecutionProvider.h
@@ -170,7 +170,7 @@ namespace Dml
         std::shared_ptr<CPUAllocator> m_cpuInputAllocator;
         std::shared_ptr<CPUAllocator> m_cpuOutputAllocator;
         std::shared_ptr<onnxruntime::KernelRegistry> m_kernelRegistry;
-        std::shared_ptr<const winrt::Windows::AI::MachineLearning::implementation::InternalRegistrationInfoMap> m_internalRegInfoMap;
+        std::shared_ptr<const Windows::AI::MachineLearning::Adapter::InternalRegistrationInfoMap> m_internalRegInfoMap;
         mutable uint64_t m_partitionKernelPrefixVal = 0;
 
         bool m_closed = false;
diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphDescBuilder.h b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphDescBuilder.h
index 9d58622657..02319daab0 100644
--- a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphDescBuilder.h
+++ b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphDescBuilder.h
@@ -9,7 +9,7 @@ namespace Dml
 {
     struct GraphNodeProperties
     {
-        std::shared_ptr<const winrt::Windows::AI::MachineLearning::implementation::InternalRegistrationInfo> 
+        std::shared_ptr<const Windows::AI::MachineLearning::Adapter::InternalRegistrationInfo> 
             internalRegInfo;
 
         // These are currently passed from the partitioning step since the only DML operators current 
diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphPartitioner.h b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphPartitioner.h
index 2227a2e67b..cba44ccb6f 100644
--- a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphPartitioner.h
+++ b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/GraphPartitioner.h
@@ -43,7 +43,7 @@ namespace Dml
     std::vector<std::unique_ptr<GraphPartition>>
     BuildPartitions(
         const onnxruntime::GraphViewer& graph,
-        const winrt::Windows::AI::MachineLearning::implementation::InternalRegistrationInfoMap& internalRegInfoMap,
+        const Windows::AI::MachineLearning::Adapter::InternalRegistrationInfoMap& internalRegInfoMap,
         const std::vector<const onnxruntime::KernelRegistry*>& registries,
         uint32_t supportedDeviceDataTypeMask, // Each bit corresponds to each DML_TENSOR_DATA_TYPE.
         std::unordered_map<const onnxruntime::Node*, GraphNodeProperties>& graphNodePropertyMap,
@@ -53,7 +53,7 @@ namespace Dml
     std::vector<std::unique_ptr<onnxruntime::ComputeCapability>>
     PartitionGraph(
         const onnxruntime::GraphViewer& graph,
-        const winrt::Windows::AI::MachineLearning::implementation::InternalRegistrationInfoMap& internalRegInfoMap,
+        const Windows::AI::MachineLearning::Adapter::InternalRegistrationInfoMap& internalRegInfoMap,
         const std::vector<const onnxruntime::KernelRegistry*>& registries,
         uint32_t supportedDeviceDataTypeMask, // Each bit corresponds to each DML_TENSOR_DATA_TYPE.
         onnxruntime::KernelRegistry* registryForPartitionKernels,
diff --git a/onnxruntime/core/providers/dml/OperatorAuthorHelper/SchemaInferenceOverrider.h b/onnxruntime/core/providers/dml/OperatorAuthorHelper/SchemaInferenceOverrider.h
index 19fc628024..62e8c30cd1 100644
--- a/onnxruntime/core/providers/dml/OperatorAuthorHelper/SchemaInferenceOverrider.h
+++ b/onnxruntime/core/providers/dml/OperatorAuthorHelper/SchemaInferenceOverrider.h
@@ -80,7 +80,7 @@ OverrideSchemaInferenceFunction<OperatorHelper::ShapeInferenceHelper_##shapeInfe
         OVERRIDE_SCHEMA(    7,  true,  Crop);
         OVERRIDE_SCHEMA(    7,  false, Upsample);
         OVERRIDE_SCHEMA_EX( 9,  true,  Upsample, Resize, 1); // Upsample v9 uses Resize's shape inference function.
-        OVERRIDE_SCHEMA(    7,  true,  Slice);
+        OVERRIDE_SCHEMA_EX( 7,  true,  Slice, Slice7);
         OVERRIDE_SCHEMA(    7,  true,  Split);
         OVERRIDE_SCHEMA_EX( 7,  true,  Tile, Tile, 1);
         OVERRIDE_SCHEMA_EX( 8,  true,  Expand, Expand, 1);
diff --git a/winml/adapter/AbiCustomRegistryImpl.cpp b/winml/adapter/AbiCustomRegistryImpl.cpp
index d81512a682..7242ca121f 100644
--- a/winml/adapter/AbiCustomRegistryImpl.cpp
+++ b/winml/adapter/AbiCustomRegistryImpl.cpp
@@ -43,13 +43,14 @@ HRESULT STDMETHODCALLTYPE AbiCustomRegistryImpl::RegisterOperatorKernel(
     const MLOperatorKernelDescription* opKernel,
     IMLOperatorKernelFactory* operatorKernelFactory,
     _In_opt_ IMLOperatorShapeInferrer* shapeInferrer) const noexcept {
-  return RegisterOperatorKernel(opKernel, operatorKernelFactory, shapeInferrer, false, false, false);
+  return RegisterOperatorKernel(opKernel, operatorKernelFactory, shapeInferrer, nullptr, false, false, false);
 }
 
 HRESULT STDMETHODCALLTYPE AbiCustomRegistryImpl::RegisterOperatorKernel(
     const MLOperatorKernelDescription* opKernel,
     IMLOperatorKernelFactory* operatorKernelFactory,
     _In_opt_ IMLOperatorShapeInferrer* shapeInferrer,
+    _In_opt_ IMLOperatorSupportQueryPrivate* supportQuery,
     bool isInternalOperator,
     bool canAliasFirstInput,
     bool supportsGraph,
@@ -72,6 +73,7 @@ HRESULT STDMETHODCALLTYPE AbiCustomRegistryImpl::RegisterOperatorKernel(
       opKernel,
       operatorKernelFactory,
       shapeInferrer,
+      supportQuery,
       isInternalOperator,
       canAliasFirstInput,
       supportsGraph,
diff --git a/winml/adapter/AbiCustomRegistryImpl.h b/winml/adapter/AbiCustomRegistryImpl.h
index 747dd65d5a..a07f51cacd 100644
--- a/winml/adapter/AbiCustomRegistryImpl.h
+++ b/winml/adapter/AbiCustomRegistryImpl.h
@@ -23,6 +23,7 @@ class AbiCustomRegistryImpl : public AbiCustomRegistry {
       const MLOperatorKernelDescription* operator_kernel,
       IMLOperatorKernelFactory* operator_kernel_factory,
       _In_opt_ IMLOperatorShapeInferrer* shape_inferrer,
+      _In_opt_ IMLOperatorSupportQueryPrivate* supportQuery,
       bool is_internal_operator,
       bool can_alias_first_input,
       bool supports_graph,