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

Use onecore umbrella lib in onecore builds (#5182)

Browse source 
* delayload hack

* Skip tests

* Onecore uses onecore umbrella

* Uncomment tests

* cleanup

* Disable dev mode for WinML
This commit is contained in:
Tiago Koji Castro Shibata 2020-09-16 10:46:27 -07:00 committed by edgchen1
parent 393ff2f434
commit b523fa08bc
6 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/CMakeLists.txt
View file

@ -1287,7 +1287,7 @@ else()
endif()
if (WIN32)
if (onnxruntime_BUILD_FOR_WINDOWS_STORE)
if (WINDOWS_STORE)
# Setting WINAPI_FAMILY, WINVER and _WIN32_WINNT restrict the APIs exposed in Windows headers to those available
# in store or desktop, and that support at least the version of Windows specified
# add_compile_definitions(WINAPI_FAMILY=2)
@ -1365,10 +1365,7 @@ if (onnxruntime_BUILD_CSHARP)
include(onnxruntime_csharp.cmake)
endif()
if (onnxruntime_BUILD_FOR_WINDOWS_STORE)
set_target_properties(onnxruntime PROPERTIES VS_GLOBAL_AppContainerApplication true)
set_target_properties(winml_dll PROPERTIES VS_GLOBAL_AppContainerApplication true)
if (WINDOWS_STORE)
target_link_options(onnxruntime PRIVATE /DYNAMICBASE /NXCOMPAT /APPCONTAINER)
target_link_options(winml_dll PRIVATE /DYNAMICBASE /NXCOMPAT /APPCONTAINER)

2
cmake/onnxruntime_providers.cmake
View file

@ -689,7 +689,7 @@ if (onnxruntime_USE_DML)
target_add_dml(onnxruntime_providers_dml)
target_link_libraries(onnxruntime_providers_dml PRIVATE d3d12.lib dxgi.lib)
if (onnxruntime_BUILD_FOR_WINDOWS_STORE)
if (WINDOWS_STORE)
target_link_libraries(onnxruntime_providers_dml PRIVATE dloadhelper.lib)
else()
target_link_libraries(onnxruntime_providers_dml PRIVATE delayimp.lib)

3
cmake/wcos_toolchain.cmake → cmake/store_toolchain.cmake
View file

@ -3,6 +3,3 @@ set(CMAKE_SYSTEM_VERSION 10.0)
if (NOT DEFINED CMAKE_SYSTEM_PROCESSOR)
set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_HOST_SYSTEM_PROCESSOR})
endif()
if (NOT onnxruntime_BUILD_FOR_WINDOWS_STORE)
set(CMAKE_VS_GLOBALS "AppContainerApplication=false")
endif()

2
cmake/target_delayload.cmake
View file

@ -9,7 +9,7 @@ function(target_delayload target_name)
foreach(lib ${ARGN})
target_link_options(${target_name} PRIVATE /DELAYLOAD:"${lib}")
endforeach()
if (onnxruntime_BUILD_FOR_WINDOWS_STORE)
if (WINDOWS_STORE)
target_link_libraries(${target_name} PRIVATE dloadhelper.lib)
else()
target_link_libraries(${target_name} PRIVATE delayimp.lib)

2
cmake/wcos_rules_override.cmake Normal file
View file

@ -0,0 +1,2 @@
set(CMAKE_C_STANDARD_LIBRARIES_INIT onecoreuap_apiset.lib)
set(CMAKE_CXX_STANDARD_LIBRARIES_INIT onecoreuap_apiset.lib)

9
tools/ci_build/build.py
View file

@ -570,7 +570,7 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home
"OFF" if args.skip_winml_tests else "ON"),
"-Donnxruntime_GENERATE_TEST_REPORTS=ON",
"-Donnxruntime_DEV_MODE=" + (
"OFF" if args.use_acl or args.use_armnn or
"OFF" if args.use_acl or args.use_armnn or args.use_winml or
(args.ios and is_macOS()) else "ON"),
"-DPYTHON_EXECUTABLE=" + sys.executable,
"-Donnxruntime_USE_CUDA=" + ("ON" if args.use_cuda else "OFF"),
@ -638,7 +638,6 @@ def generate_build_tree(cmake_path, source_dir, build_dir, cuda_home, cudnn_home
"ON" if args.enable_language_interop_ops else "OFF"),
"-Donnxruntime_USE_DML=" + ("ON" if args.use_dml else "OFF"),
"-Donnxruntime_USE_WINML=" + ("ON" if args.use_winml else "OFF"),
"-Donnxruntime_BUILD_FOR_WINDOWS_STORE=" + ("ON" if args.enable_windows_store else "OFF"),
"-Donnxruntime_USE_TELEMETRY=" + (
"ON" if args.use_telemetry else "OFF"),
"-Donnxruntime_ENABLE_LTO=" + ("ON" if args.enable_lto else "OFF"),
@ -1676,10 +1675,12 @@ def main():
cmake_extra_args = [
'-A', 'x64', '-T', toolset, '-G', args.cmake_generator
]
if args.enable_wcos:
if args.enable_windows_store:
cmake_extra_args.append(
'-DCMAKE_TOOLCHAIN_FILE=' + os.path.join(
source_dir, 'cmake', 'wcos_toolchain.cmake'))
source_dir, 'cmake', 'store_toolchain.cmake'))
if args.enable_wcos:
cmake_extra_args.append('-DCMAKE_USER_MAKE_RULES_OVERRIDE=wcos_rules_override.cmake')
elif args.cmake_generator is not None and not (is_macOS() and args.use_xcode):
cmake_extra_args += ['-G', args.cmake_generator]
elif is_macOS() and args.use_xcode: