saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-31 23:27:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

various changes to unblock windowsai ADO build

Browse source
This commit is contained in:
Ori Levari 2019-12-05 13:50:13 -08:00 committed by GitHub
parent 8fb7b88e0a
commit 8294fa72a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/CMakeLists.txt
View file

@ -686,11 +686,6 @@ if (onnxruntime_USE_DML)
include(dml)
endif()
# allow the caller to tell us where the nuget packages are going
if ("${REPO_PACKAGE_LOCATION}" STREQUAL "")
set(REPO_PACKAGE_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/packages)
endif()
#names in this var must match the directory names under onnxruntime/core/providers
set(ONNXRUNTIME_PROVIDER_NAMES cpu)

1
cmake/external/dml.cmake vendored
View file

@ -35,5 +35,4 @@ if (NOT onnxruntime_USE_CUSTOM_DIRECTML)
list(APPEND onnxruntime_EXTERNAL_DEPENDENCIES RESTORE_PACKAGES)
else()
include_directories(${dml_INCLUDE_DIR})
link_directories(${dml_LIB_DIR})
endif()

2
cmake/onnxruntime_providers.cmake
View file

@ -430,7 +430,7 @@ if (onnxruntime_USE_DML)
add_dependencies(onnxruntime_providers_dml ${onnxruntime_EXTERNAL_DEPENDENCIES})
target_include_directories(onnxruntime_providers_dml PRIVATE ${ONNXRUNTIME_ROOT} ${ONNXRUNTIME_ROOT}/../cmake/external/wil/include)
target_link_libraries(onnxruntime_providers_dml ${REPO_PACKAGE_LOCATION}/DirectML.0.0.1/build/DirectML.targets)
target_link_libraries(onnxruntime_providers_dml ${CMAKE_CURRENT_BINARY_DIR}/packages/DirectML.0.0.1/build/DirectML.targets)
target_link_libraries(onnxruntime_providers_dml d3d12.lib dxgi.lib)
list(APPEND ONNXRUNTIME_LINKER_FLAGS "/DELAYLOAD:DirectML.dll /DELAYLOAD:d3d12.dll /DELAYLOAD:dxgi.dll")

3
cmake/winml.cmake
View file

@ -162,7 +162,7 @@ add_dependencies(winml_adapter winml_api_native_internal)
# Link libraries
target_link_libraries(winml_adapter PRIVATE wil)
if (onnxruntime_USE_DML)
target_link_libraries(winml_adapter PRIVATE ${REPO_PACKAGE_LOCATION}/DirectML.0.0.1/build/DirectML.targets)
target_link_libraries(winml_adapter PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/packages/DirectML.0.0.1/build/DirectML.targets)
endif(onnxruntime_USE_DML)
# add it to the onnxruntime shared library
@ -329,6 +329,7 @@ set_target_properties(winml_lib_api
${target_folder})
# Add deps
add_dependencies(winml_lib_api onnx)
add_dependencies(winml_lib_api winml_sdk_cppwinrt)
add_dependencies(winml_lib_api winml_api)
add_dependencies(winml_lib_api winml_api_native)