saymrwulf/onnxruntime
1
0
Fork 0
mirror of https://github.com/saymrwulf/onnxruntime.git synced 2026-05-24 22:17:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Brianma/cpu (#2583)

Browse source 
* don't include dml stuff in cpu builds

* tests that link the image lib also need the telemetry lib now
This commit is contained in:
Brian Martin 2019-12-07 08:59:42 -08:00 committed by GitHub
parent 09ca58044e
commit 09c9caab2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
cmake/winml.cmake
View file

@ -120,11 +120,30 @@ target_link_libraries(winml_lib_telemetry PRIVATE wil)
# Add winml_adapter
###########################
file(GLOB winml_adapter_files CONFIGURE_DEPENDS
"${winml_adapter_dir}/*.h"
"${winml_adapter_dir}/*.cpp"
list(APPEND winml_adapter_files
${winml_adapter_dir}/CpuOrtSessionBuilder.cpp
${winml_adapter_dir}/CpuOrtSessionBuilder.h
${winml_adapter_dir}/CustomRegistryHelper.h
${winml_adapter_dir}/FeatureDescriptorFactory.cpp
${winml_adapter_dir}/FeatureDescriptorFactory.h
${winml_adapter_dir}/LotusEnvironment.cpp
${winml_adapter_dir}/LotusEnvironment.h
${winml_adapter_dir}/pch.h
${winml_adapter_dir}/WinMLAdapter.cpp
${winml_adapter_dir}/WinMLAdapter.h
${winml_adapter_dir}/ZeroCopyInputStreamWrapper.cpp
${winml_adapter_dir}/ZeroCopyInputStreamWrapper.h
)
if (onnxruntime_USE_DML)
list(APPEND winml_adapter_files
${winml_adapter_dir}/AbiCustomRegistryImpl.cpp
${winml_adapter_dir}/AbiCustomRegistryImpl.h
${winml_adapter_dir}/DmlOrtSessionBuilder.cpp
${winml_adapter_dir}/DmlOrtSessionBuilder.h
)
endif(onnxruntime_USE_DML)
add_library(winml_adapter ${winml_adapter_files})
# wil requires C++17

2
cmake/winml_unittests.cmake
View file

@ -44,7 +44,7 @@ function(add_winml_test)
if (_UT_DEPENDS)
add_dependencies(${_UT_TARGET} ${_UT_DEPENDS})
endif()
target_link_libraries(${_UT_TARGET} PRIVATE ${_UT_LIBS} gtest windowsapp winml_lib_image ${onnxruntime_EXTERNAL_LIBRARIES})
target_link_libraries(${_UT_TARGET} PRIVATE ${_UT_LIBS} gtest windowsapp winml_lib_image ${onnxruntime_EXTERNAL_LIBRARIES} winml_lib_telemetry)
add_test(NAME ${_UT_TARGET}
COMMAND ${_UT_TARGET}