This commit is contained in:
Dwayne Robinson 2020-08-27 21:01:19 -07:00
parent f68d5263b7
commit 79429c934b
3 changed files with 3 additions and 3 deletions

View file

@ -20,7 +20,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}/DirectML.2.1.0)
set(DML_PACKAGE_DIR ${PACKAGES_DIR}/DirectML.3.0.0)
# Restore nuget packages, which will pull down the DirectML redist package
add_custom_command(

View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DirectML" version="2.1.0" targetFramework="native" />
<package id="DirectML" version="3.0.0" targetFramework="native" />
<package id="GoogleTestAdapter" version="0.17.1" targetFramework="net46" />
</packages>

View file

@ -245,7 +245,7 @@ def generate_files(list, args):
'" target="runtimes\\win-' + args.target_architecture + '\\native" />')
files_list.append('<file src=' + '"' + os.path.join(args.native_build_path, 'DirectML.pdb') +
'" target="runtimes\\win-' + args.target_architecture + '\\native" />')
files_list.append('<file src=' + '"' + os.path.join(args.packages_path, 'DirectML.2.1.0\\LICENSE.txt') +
files_list.append('<file src=' + '"' + os.path.join(args.packages_path, 'DirectML.2.1.1\\LICENSE.txt') +
'" target="DirectML_LICENSE.txt" />')
if includes_winml: