fixs from v1.18.1 merge, bump manifest version

boris-fx · Jul 16, 2024 · 3124171 · 3124171
1 parent 1c4177d
commit 3124171
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 15 deletions.
diff --git a/bfx_ml.ort_dml_deps.runtime.manifest.in b/bfx_ml.ort_dml_deps.runtime.manifest.in
@@ -3,7 +3,7 @@
     <assemblyIdentity
         type="win32"
         name="bfx_ml.ort_dml_deps.runtime"
-        version="1.0.0.2" processorArchitecture="amd64">
+        version="1.0.0.3" processorArchitecture="amd64">
     </assemblyIdentity>
     <file name="DirectML.dll" hash="" hashalg="SHA1"></file>
     <file name="onnxruntime.dll" hash="" hashalg="SHA1"></file>

diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/OperatorRegistration.cpp b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/OperatorRegistration.cpp
@@ -531,12 +531,8 @@ DML_OP_EXTERN_CREATION_FUNCTION(Size);
 DML_OP_EXTERN_CREATION_FUNCTION(QAttention);
 DML_OP_EXTERN_CREATION_FUNCTION(Attention);
 DML_OP_EXTERN_CREATION_FUNCTION(MultiHeadAttention);
-<<<<<<< HEAD
-// DML_OP_EXTERN_CREATION_FUNCTION(NonZero);
-=======
 DML_OP_EXTERN_CREATION_FUNCTION(GroupQueryAttention);
-DML_OP_EXTERN_CREATION_FUNCTION(NonZero);
->>>>>>> origin/v1.18.1
+// DML_OP_EXTERN_CREATION_FUNCTION(NonZero);
 DML_OP_EXTERN_CREATION_FUNCTION(QuickGelu);
 DML_OP_EXTERN_CREATION_FUNCTION(BitwiseAnd);
 DML_OP_EXTERN_CREATION_FUNCTION(BitwiseOr);
@@ -646,12 +642,8 @@ constexpr static std::array<SupportedTensorDataTypes, 4> supportedTypeListQAtten
 constexpr static std::array<SupportedTensorDataTypes, 2> supportedTypeListAttention = {SupportedTensorDataTypes::Float16to32, SupportedTensorDataTypes::Int32};
 constexpr static std::array<SupportedTensorDataTypes, 2> supportedTypeListRotaryEmbedding = {SupportedTensorDataTypes::Float16to32, SupportedTensorDataTypes::Int64};
 constexpr static std::array<SupportedTensorDataTypes, 2> supportedTypeListGroupNorm = {SupportedTensorDataTypes::Float16to32, SupportedTensorDataTypes::Float16to32};
-<<<<<<< HEAD
 // constexpr static std::array<SupportedTensorDataTypes, 1> supportedTypeListNonZero = {SupportedTensorDataTypes::Float16to32 | SupportedTensorDataTypes::Ints8Bit | SupportedTensorDataTypes::Ints16Bit | SupportedTensorDataTypes::Ints32Bit | SupportedTensorDataTypes::Bool};
-=======
-constexpr static std::array<SupportedTensorDataTypes, 1> supportedTypeListNonZero = {SupportedTensorDataTypes::Float16to32 | SupportedTensorDataTypes::Ints8Bit | SupportedTensorDataTypes::Ints16Bit | SupportedTensorDataTypes::Ints32Bit | SupportedTensorDataTypes::Bool};
 constexpr static std::array<SupportedTensorDataTypes, 2> supportedTypeListMatMulNBits = {SupportedTensorDataTypes::Float16to32, SupportedTensorDataTypes::UInt8};
->>>>>>> origin/v1.18.1
 
 constexpr static std::array<SupportedTensorDataTypes, 3> supportedTypeListQLinearMatMul = {
     SupportedTensorDataTypes::Ints8Bit,

diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/bfx/bfx_ops.h b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/Operators/bfx/bfx_ops.h
@@ -89,13 +89,13 @@ void register_operator_kernel(IMLOperatorRegistry* registry, const char* opName,
         &kernelDescription,
         kernelFactory,
         shapeInferrer,
-        nullptr,
+        nullptr, // supportQuery
         false, // isInternalOperator
         false, // alias
-        false, // supportsGraph
-        nullptr,
-        nullptr,
-        0));
+        false));//, // supportsGraph
+        // nullptr,
+        // nullptr,
+        // 0));
 }
 
 template <typename op_type>