From a9290e94035c50c76c9b684e888bb3f7ded36e4a Mon Sep 17 00:00:00 2001 From: raoanag <127366241+raoanag@users.noreply.github.com> Date: Tue, 10 Oct 2023 21:40:48 -0700 Subject: [PATCH] Update to use DirectML Preview package (#17868) ### Description Updating to use [**`Microsoft.AI.DirectML.Preview 1.13.0-deveb7a0e89e82dcf90ae58761b35fb3aebc2275ef5`**](https://www.nuget.org/packages/Microsoft.AI.DirectML.Preview/1.13.0-deveb7a0e89e82dcf90ae58761b35fb3aebc2275ef5) ### Motivation and Context --- .pipelines/nuget_config/x64/packages.config | 2 +- .pipelines/nuget_config/x86/packages.config | 2 +- cmake/external/dml.cmake | 2 +- .../src/External/DirectMLHelpers/ApiTraits.h | 35 ------------------- packages.config | 2 +- .../nuget/generate_nuspec_for_native_nuget.py | 2 +- 6 files changed, 5 insertions(+), 40 deletions(-) diff --git a/.pipelines/nuget_config/x64/packages.config b/.pipelines/nuget_config/x64/packages.config index 8eef0b5bac..04c49f40ec 100644 --- a/.pipelines/nuget_config/x64/packages.config +++ b/.pipelines/nuget_config/x64/packages.config @@ -1,6 +1,6 @@  - + diff --git a/.pipelines/nuget_config/x86/packages.config b/.pipelines/nuget_config/x86/packages.config index 81f97948f1..ad0ea2196a 100644 --- a/.pipelines/nuget_config/x86/packages.config +++ b/.pipelines/nuget_config/x86/packages.config @@ -1,6 +1,6 @@  - + diff --git a/cmake/external/dml.cmake b/cmake/external/dml.cmake index f446c2be98..7cab605143 100644 --- a/cmake/external/dml.cmake +++ b/cmake/external/dml.cmake @@ -41,7 +41,7 @@ if (NOT onnxruntime_USE_CUSTOM_DIRECTML) set(NUGET_CONFIG ${PROJECT_SOURCE_DIR}/../NuGet.config) set(PACKAGES_CONFIG ${PROJECT_SOURCE_DIR}/../packages.config) get_filename_component(PACKAGES_DIR ${CMAKE_CURRENT_BINARY_DIR}/../packages ABSOLUTE) - set(DML_PACKAGE_DIR ${PACKAGES_DIR}/Microsoft.AI.DirectML.1.12.0) + set(DML_PACKAGE_DIR ${PACKAGES_DIR}/Microsoft.AI.DirectML.Preview.1.13.0-deveb7a0e89e82dcf90ae58761b35fb3aebc2275ef5) # Restore nuget packages, which will pull down the DirectML redist package. add_custom_command( diff --git a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/External/DirectMLHelpers/ApiTraits.h b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/External/DirectMLHelpers/ApiTraits.h index 570a0f82b6..8558e33aaa 100644 --- a/onnxruntime/core/providers/dml/DmlExecutionProvider/src/External/DirectMLHelpers/ApiTraits.h +++ b/onnxruntime/core/providers/dml/DmlExecutionProvider/src/External/DirectMLHelpers/ApiTraits.h @@ -3,38 +3,6 @@ #pragma once -struct DML_MATRIX_MULTIPLY_INTEGER_TO_FLOAT_OPERATOR_DESC -{ - const DML_TENSOR_DESC* ATensor; - const DML_TENSOR_DESC* AScaleTensor; - _Maybenull_ const DML_TENSOR_DESC* AZeroPointTensor; - const DML_TENSOR_DESC* BTensor; - const DML_TENSOR_DESC* BScaleTensor; - _Maybenull_ const DML_TENSOR_DESC* BZeroPointTensor; - _Maybenull_ const DML_TENSOR_DESC* BiasTensor; - const DML_TENSOR_DESC* OutputTensor; -}; -const int DML_OPERATOR_MATRIX_MULTIPLY_INTEGER_TO_FLOAT = 0x80000011; - -struct DML_QUANTIZED_LINEAR_AVERAGE_POOLING_OPERATOR_DESC -{ - const DML_TENSOR_DESC* InputTensor; - const DML_TENSOR_DESC* InputScaleTensor; - _Maybenull_ const DML_TENSOR_DESC* InputZeroPointTensor; - const DML_TENSOR_DESC* OutputScaleTensor; - _Maybenull_ const DML_TENSOR_DESC* OutputZeroPointTensor; - const DML_TENSOR_DESC* OutputTensor; - UINT DimensionCount; - _Field_size_(DimensionCount) const UINT* Strides; - _Field_size_(DimensionCount) const UINT* WindowSize; - _Field_size_(DimensionCount) const UINT* StartPadding; - _Field_size_(DimensionCount) const UINT* EndPadding; - _Field_size_(DimensionCount) const UINT* Dilations; - BOOL IncludePadding; -}; -const int DML_OPERATOR_QUANTIZED_LINEAR_AVERAGE_POOLING = 0x8000000B; - - namespace ApiTraits { template @@ -2711,11 +2679,8 @@ inline gsl::czstring ToString(DML_OPERATOR_TYPE value) case DML_OPERATOR_RESAMPLE2: return "DML_OPERATOR_RESAMPLE2"; case DML_OPERATOR_RESAMPLE_GRAD1: return "DML_OPERATOR_RESAMPLE_GRAD1"; case DML_OPERATOR_DIAGONAL_MATRIX1: return "DML_OPERATOR_DIAGONAL_MATRIX1"; -#pragma warning(push) -#pragma warning(disable: 4063) case DML_OPERATOR_MATRIX_MULTIPLY_INTEGER_TO_FLOAT: return "DML_OPERATOR_MATRIX_MULTIPLY_INTEGER_TO_FLOAT"; case DML_OPERATOR_MULTIHEAD_ATTENTION: return "DML_OPERATOR_MULTIHEAD_ATTENTION"; -#pragma warning(pop) default: assert(false); return ""; diff --git a/packages.config b/packages.config index b2c918c414..54c8c14872 100644 --- a/packages.config +++ b/packages.config @@ -1,6 +1,6 @@  - + diff --git a/tools/nuget/generate_nuspec_for_native_nuget.py b/tools/nuget/generate_nuspec_for_native_nuget.py index a4e00b9282..f1f6273884 100644 --- a/tools/nuget/generate_nuspec_for_native_nuget.py +++ b/tools/nuget/generate_nuspec_for_native_nuget.py @@ -192,7 +192,7 @@ def generate_repo_url(line_list, repo_url, commit_id): def generate_dependencies(xml_text, package_name, version): - dml_dependency = '' + dml_dependency = '' if package_name == "Microsoft.AI.MachineLearning": xml_text.append("")