diff --git a/.pipelines/nuget_config/x64/packages.config b/.pipelines/nuget_config/x64/packages.config index 9e318aacb0..0cb753af5d 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 61b20269c4..db298cbb38 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 4f8a79a59f..d15a110695 100644 --- a/cmake/external/dml.cmake +++ b/cmake/external/dml.cmake @@ -40,22 +40,16 @@ 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.Preview.1.9.0-dev2b57b4f738b1d0dcc2dd31ecd502e36f4e3ea5a0) + set(DML_PACKAGE_DIR ${PACKAGES_DIR}/Microsoft.AI.DirectML.Preview.1.9.0-devd10042c94985065a565c042540e15eb75b554663) set(DML_SHARED_LIB DirectML.dll) - # If using the preview package, extract the SHA-1 from the path so we can unmangle the filenames later. - # e.g. "Microsoft.AI.DirectML.Preview.1.9.0-dev2b57b4f738b1d0dcc2dd31ecd502e36f4e3ea5a0" - if(DML_PACKAGE_DIR MATCHES ".*Preview.*-dev(.*)") - set(DML_PREVIEW_FILENAME_SUFFIX ".${CMAKE_MATCH_1}") - endif() - # Restore nuget packages, which will pull down the DirectML redist package. add_custom_command( OUTPUT - ${DML_PACKAGE_DIR}/bin/x64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib - ${DML_PACKAGE_DIR}/bin/x86-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib - ${DML_PACKAGE_DIR}/bin/arm-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib - ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib + ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.lib + ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.lib + ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.lib + ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.lib DEPENDS ${PACKAGES_CONFIG} ${NUGET_CONFIG} @@ -63,49 +57,6 @@ if (NOT onnxruntime_USE_CUSTOM_DIRECTML) VERBATIM ) - # If using a preview package, unmangle the filenames from the nuget so they're useable. - # e.g. Map DirectML.2b57b4f738b1d0dcc2dd31ecd502e36f4e3ea5a0.dll -> DirectML.dll - if(DEFINED DML_PREVIEW_FILENAME_SUFFIX) - add_custom_command( - OUTPUT - ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.lib - ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.lib - ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.lib - ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.lib - DEPENDS - ${DML_PACKAGE_DIR}/bin/x64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib - ${DML_PACKAGE_DIR}/bin/x86-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib - ${DML_PACKAGE_DIR}/bin/arm-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib - ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib - - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.lib - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.dll ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.pdb ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.pdb - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.Debug${DML_PREVIEW_FILENAME_SUFFIX}.dll ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.Debug.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.Debug${DML_PREVIEW_FILENAME_SUFFIX}.pdb ${DML_PACKAGE_DIR}/bin/x64-win/DirectML.Debug.pdb - - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x86-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.lib - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x86-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.dll ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x86-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.pdb ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.pdb - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.Debug${DML_PREVIEW_FILENAME_SUFFIX}.dll ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.Debug.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.Debug${DML_PREVIEW_FILENAME_SUFFIX}.pdb ${DML_PACKAGE_DIR}/bin/x86-win/DirectML.Debug.pdb - - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.lib - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.dll ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.pdb ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.pdb - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.Debug${DML_PREVIEW_FILENAME_SUFFIX}.dll ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.Debug.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.Debug${DML_PREVIEW_FILENAME_SUFFIX}.pdb ${DML_PACKAGE_DIR}/bin/arm-win/DirectML.Debug.pdb - - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.lib ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.lib - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.dll ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML${DML_PREVIEW_FILENAME_SUFFIX}.pdb ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.pdb - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.Debug${DML_PREVIEW_FILENAME_SUFFIX}.dll ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.Debug.dll - COMMAND ${CMAKE_COMMAND} -E copy_if_different ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.Debug${DML_PREVIEW_FILENAME_SUFFIX}.pdb ${DML_PACKAGE_DIR}/bin/arm64-win/DirectML.Debug.pdb - - VERBATIM - ) - endif() - include_directories(BEFORE "${DML_PACKAGE_DIR}/include") add_custom_target( RESTORE_PACKAGES ALL diff --git a/packages.config b/packages.config index 1df88367b9..5442a72e1a 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 f1beaf6de9..4a6b55d731 100644 --- a/tools/nuget/generate_nuspec_for_native_nuget.py +++ b/tools/nuget/generate_nuspec_for_native_nuget.py @@ -189,7 +189,7 @@ def generate_dependencies(xml_text, package_name, version, dependency_id, depend return dml_dependency = ( - '' + '' ) if package_name == "Microsoft.AI.MachineLearning":