Skip to content

Commit cf92d98

Browse files
vrasparfajin-corptianleiwubaijumeswaniskottmckay
authored
Cherry-picks into rel-1.22.0 (#24611)
### Description Cherry pick the following into [rel-1.22.0](https://github.com/microsoft/onnxruntime/tree/rel-1.22.0) - (#24491) - (#24509) - (#24564) - (#24574) - (#24582) - (#24584) - (#24568) - (#24587) - (#24563) - (#24592) - (#24526) - (#24552) - (#24588) - (#24605) - (#24606) --------- Co-authored-by: Jing Fang <[email protected]> Co-authored-by: Tianlei Wu <[email protected]> Co-authored-by: Baiju Meswani <[email protected]> Co-authored-by: Scott McKay <[email protected]> Co-authored-by: Mark Schofield <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Edward Chen <[email protected]> Co-authored-by: Ashwath Shankarnarayan <[email protected]> Co-authored-by: saurabh <[email protected]> Co-authored-by: Adrian Lizarraga <[email protected]> Co-authored-by: Hector Li <[email protected]>
1 parent ef546e9 commit cf92d98

97 files changed

Lines changed: 9790 additions & 789 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/windows_x64_release_ep_generic_interface_build_x64_release_ep_generic_interface.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,16 @@ jobs:
8282
core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
8383
core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
8484
85-
- name: Build
86-
shell: pwsh
87-
run: |
88-
python.exe "${{ github.workspace }}\tools\ci_build\build.py" --config RelWithDebInfo --build_dir "${{ github.workspace }}\build" --skip_submodule_sync --build_csharp --parallel --use_binskim_compliant_compile_flags --cmake_generator "Visual Studio 17 2022" --build_shared_lib --update --build --enable_generic_interface --use_vcpkg --use_vcpkg_ms_internal_asset_cache
89-
if ($LASTEXITCODE -ne 0) {
90-
exit $LASTEXITCODE
91-
}
92-
Remove-Item "${{ github.workspace }}\build\RelWithDebInfo" -Include "*.obj" -Recurse
93-
env:
94-
ALLOW_RELEASED_ONNX_OPSET_ONLY: '0'
85+
- name: Build and test
86+
shell: pwsh
87+
run: |
88+
python.exe "${{ github.workspace }}\tools\ci_build\build.py" --config RelWithDebInfo --build_dir "${{ github.workspace }}\build" --skip_submodule_sync --build_csharp --parallel --use_binskim_compliant_compile_flags --cmake_generator "Visual Studio 17 2022" --build_shared_lib --update --build --test --enable_generic_interface --use_vcpkg --use_vcpkg_ms_internal_asset_cache
89+
if ($LASTEXITCODE -ne 0) {
90+
exit $LASTEXITCODE
91+
}
92+
Remove-Item "${{ github.workspace }}\build\RelWithDebInfo" -Include "*.obj" -Recurse
93+
env:
94+
ALLOW_RELEASED_ONNX_OPSET_ONLY: '0'
9595

9696
- name: Validate C# native delegates
9797
shell: cmd

‎cmake/CMakeLists.txt‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,6 @@ endif()
856856
set(ONNXRUNTIME_PROVIDER_NAMES cpu)
857857

858858
set(ORT_PROVIDER_FLAGS)
859-
set(ORT_EXTRA_INTERFACE_FLAGS)
860859

861860
if (onnxruntime_USE_CUDA)
862861
enable_language(CUDA)
@@ -912,7 +911,7 @@ if (onnxruntime_USE_CUDA)
912911
endif()
913912

914913
if (onnxruntime_USE_CUDA_INTERFACE AND (NOT onnxruntime_USE_CUDA))
915-
list(APPEND ORT_EXTRA_INTERFACE_FLAGS -DUSE_CUDA=1)
914+
list(APPEND ORT_PROVIDER_FLAGS -DUSE_CUDA_PROVIDER_INTERFACE=1)
916915
endif()
917916

918917
if (onnxruntime_USE_VITISAI)
@@ -921,7 +920,7 @@ if (onnxruntime_USE_VITISAI)
921920
endif()
922921

923922
if (onnxruntime_USE_VITISAI_INTERFACE AND (NOT onnxruntime_USE_VITISAI))
924-
list(APPEND ORT_EXTRA_INTERFACE_FLAGS -DUSE_VITISAI=1)
923+
list(APPEND ORT_PROVIDER_FLAGS -DUSE_VITISAI_PROVIDER_INTERFACE=1)
925924
endif()
926925

927926
if (onnxruntime_USE_DNNL)
@@ -935,7 +934,7 @@ if (onnxruntime_USE_OPENVINO)
935934
endif()
936935

937936
if (onnxruntime_USE_OPENVINO_INTERFACE AND (NOT onnxruntime_USE_OPENVINO))
938-
list(APPEND ORT_EXTRA_INTERFACE_FLAGS -DUSE_OPENVINO=1)
937+
list(APPEND ORT_PROVIDER_FLAGS -DUSE_OPENVINO_PROVIDER_INTERFACE=1)
939938
endif()
940939

941940
if (onnxruntime_USE_TENSORRT)
@@ -945,7 +944,7 @@ if (onnxruntime_USE_TENSORRT)
945944
endif()
946945

947946
if (onnxruntime_USE_TENSORRT_INTERFACE AND (NOT onnxruntime_USE_TENSORRT))
948-
list(APPEND ORT_INTERFACE_FLAGS -DUSE_TENSORRT=1)
947+
list(APPEND ORT_PROVIDER_FLAGS -DUSE_TENSORRT_PROVIDER_INTERFACE=1)
949948
endif()
950949

951950
if (onnxruntime_USE_NV)
@@ -954,7 +953,7 @@ if (onnxruntime_USE_NV)
954953
endif()
955954

956955
if (onnxruntime_USE_NV_INTERFACE AND (NOT onnxruntime_USE_NV))
957-
list(APPEND ORT_INTERFACE_FLAGS -DUSE_NV=1)
956+
list(APPEND ORT_PROVIDER_FLAGS -DUSE_NV_PROVIDER_INTERFACE=1)
958957
endif()
959958

960959
if (onnxruntime_USE_RKNPU)
@@ -978,7 +977,7 @@ if (onnxruntime_USE_QNN OR onnxruntime_USE_QNN_INTERFACE)
978977
if(onnxruntime_USE_QNN)
979978
list(APPEND ORT_PROVIDER_FLAGS -DUSE_QNN=1)
980979
else()
981-
list(APPEND ORT_EXTRA_INTERFACE_FLAGS -DUSE_QNN=1)
980+
list(APPEND ORT_PROVIDER_FLAGS -DUSE_QNN_PROVIDER_INTERFACE=1)
982981
endif()
983982

984983
list(APPEND ONNXRUNTIME_PROVIDER_NAMES qnn)
@@ -1242,12 +1241,6 @@ function(onnxruntime_set_compile_flags target_name)
12421241
target_compile_definitions(${target_name} PRIVATE ${ORT_FLAG})
12431242
endforeach()
12441243

1245-
if("${target_name}" STREQUAL "onnxruntime")
1246-
foreach(ORT_EXTRA_FLAG ${ORT_EXTRA_INTERFACE_FLAGS})
1247-
target_compile_definitions(${target_name} PRIVATE ${ORT_EXTRA_FLAG})
1248-
endforeach()
1249-
endif()
1250-
12511244
if (HAS_DEPRECATED_COPY)
12521245
#too many such errors in eigen
12531246
target_compile_options(${target_name} PRIVATE "$<$<COMPILE_LANGUAGE:CUDA>:SHELL:--compiler-options -Wno-deprecated-copy>" "$<$<COMPILE_LANGUAGE:CXX>:-Wno-deprecated-copy>")
@@ -1540,11 +1533,6 @@ if (onnxruntime_USE_OPENVINO)
15401533
15411534
endif()
15421535
1543-
if (onnxruntime_USE_OPENVINO_INTERFACE AND (NOT onnxruntime_USE_OPENVINO))
1544-
add_definitions(-DUSE_OPENVINO=1)
1545-
add_definitions(-DOPENVINO_CONFIG_NPU=1)
1546-
endif()
1547-
15481536
if (onnxruntime_USE_VITISAI)
15491537
set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_LIST_DIR}")
15501538
endif()
@@ -1745,7 +1733,7 @@ if(VERSION_MAJOR_PART STREQUAL "0" AND VERSION_MINOR_PART STREQUAL "0" AND VERSI
17451733
list(GET ORT_VERSION_STRING_LIST 0 VERSION_MAJOR_PART)
17461734
list(GET ORT_VERSION_STRING_LIST 1 VERSION_MINOR_PART)
17471735
list(GET ORT_VERSION_STRING_LIST 2 VERSION_BUILD_PART)
1748-
set(VERSION_STRING ORT_VERSION)
1736+
set(VERSION_STRING ${ORT_VERSION})
17491737
endif()
17501738

17511739

‎cmake/onnxruntime_providers_cuda.cmake‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,17 +122,38 @@
122122
if (onnxruntime_REDUCED_OPS_BUILD)
123123
substitute_op_reduction_srcs(onnxruntime_providers_cuda_src)
124124
endif()
125+
125126
if(onnxruntime_ENABLE_CUDA_EP_INTERNAL_TESTS)
126127
# cuda_provider_interface.cc is removed from the object target: onnxruntime_providers_cuda_obj and
127128
# added to the lib onnxruntime_providers_cuda separately.
128129
# onnxruntime_providers_cuda_ut can share all the object files with onnxruntime_providers_cuda except cuda_provider_interface.cc.
129130
set(cuda_provider_interface_src ${ONNXRUNTIME_ROOT}/core/providers/cuda/cuda_provider_interface.cc)
130131
list(REMOVE_ITEM onnxruntime_providers_cuda_src ${cuda_provider_interface_src})
131132
onnxruntime_add_object_library(onnxruntime_providers_cuda_obj ${onnxruntime_providers_cuda_src})
132-
onnxruntime_add_shared_library_module(onnxruntime_providers_cuda ${cuda_provider_interface_src} $<TARGET_OBJECTS:onnxruntime_providers_cuda_obj>)
133+
134+
set(onnxruntime_providers_cuda_all_srcs ${cuda_provider_interface_src})
135+
if(WIN32)
136+
# Sets the DLL version info on Windows: https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
137+
list(APPEND onnxruntime_providers_cuda_all_srcs "${ONNXRUNTIME_ROOT}/core/providers/cuda/onnxruntime_providers_cuda.rc")
138+
endif()
139+
140+
onnxruntime_add_shared_library_module(onnxruntime_providers_cuda ${onnxruntime_providers_cuda_all_srcs}
141+
$<TARGET_OBJECTS:onnxruntime_providers_cuda_obj>)
133142
else()
134-
onnxruntime_add_shared_library_module(onnxruntime_providers_cuda ${onnxruntime_providers_cuda_src})
143+
set(onnxruntime_providers_cuda_all_srcs ${onnxruntime_providers_cuda_src})
144+
if(WIN32)
145+
# Sets the DLL version info on Windows: https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
146+
list(APPEND onnxruntime_providers_cuda_all_srcs "${ONNXRUNTIME_ROOT}/core/providers/cuda/onnxruntime_providers_cuda.rc")
147+
endif()
148+
149+
onnxruntime_add_shared_library_module(onnxruntime_providers_cuda ${onnxruntime_providers_cuda_all_srcs})
150+
endif()
151+
152+
if(WIN32)
153+
# FILE_NAME preprocessor definition is used in onnxruntime_providers_cuda.rc
154+
target_compile_definitions(onnxruntime_providers_cuda PRIVATE FILE_NAME=\"onnxruntime_providers_cuda.dll\")
135155
endif()
156+
136157
# config_cuda_provider_shared_module can be used to config onnxruntime_providers_cuda_obj, onnxruntime_providers_cuda & onnxruntime_providers_cuda_ut.
137158
# This function guarantees that all 3 targets have the same configurations.
138159
function(config_cuda_provider_shared_module target)

‎cmake/onnxruntime_providers_openvino.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
set_target_properties(onnxruntime_providers_openvino PROPERTIES FOLDER "ONNXRuntime")
4747

4848
target_compile_options(onnxruntime_providers_openvino PRIVATE
49-
$<$<NOT:$<CONFIG:Release>>:-DNOT_RELEASE>
49+
$<$<CONFIG:Release>:-DRELEASE>
5050
)
5151

5252
if(NOT MSVC)

‎cmake/onnxruntime_providers_qnn.cmake‎

Lines changed: 75 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,27 @@
1313
"${ONNXRUNTIME_ROOT}/core/providers/qnn/*.cc"
1414
)
1515

16+
function(extract_qnn_sdk_version_from_yaml QNN_SDK_YAML_FILE QNN_VERSION_OUTPUT)
17+
file(READ "${QNN_SDK_YAML_FILE}" QNN_SDK_YAML_CONTENT)
18+
# Match a line of text like "version: 1.33.2"
19+
string(REGEX MATCH "(^|\n|\r)version: ([0-9]+\\.[0-9]+\\.[0-9]+)" QNN_VERSION_MATCH "${QNN_SDK_YAML_CONTENT}")
20+
if(QNN_VERSION_MATCH)
21+
set(${QNN_VERSION_OUTPUT} "${CMAKE_MATCH_2}" PARENT_SCOPE)
22+
message(STATUS "Extracted QNN SDK version ${CMAKE_MATCH_2} from ${QNN_SDK_YAML_FILE}")
23+
else()
24+
message(WARNING "Failed to extract QNN SDK version from ${QNN_SDK_YAML_FILE}")
25+
endif()
26+
endfunction()
27+
28+
if(NOT QNN_SDK_VERSION)
29+
if(EXISTS "${onnxruntime_QNN_HOME}/sdk.yaml")
30+
extract_qnn_sdk_version_from_yaml("${onnxruntime_QNN_HOME}/sdk.yaml" QNN_SDK_VERSION)
31+
else()
32+
message(WARNING "Cannot open sdk.yaml to extract QNN SDK version")
33+
endif()
34+
endif()
35+
message(STATUS "QNN SDK version ${QNN_SDK_VERSION}")
36+
1637
if(onnxruntime_BUILD_QNN_EP_STATIC_LIB)
1738
#
1839
# Build QNN EP as a static library
@@ -23,7 +44,7 @@
2344
onnxruntime_add_include_to_target(onnxruntime_providers_qnn onnxruntime_common onnxruntime_framework onnx
2445
onnx_proto protobuf::libprotobuf-lite
2546
flatbuffers::flatbuffers Boost::mp11
26-
nlohmann_json::nlohmann_json)
47+
nlohmann_json::nlohmann_json)
2748
add_dependencies(onnxruntime_providers_qnn onnx ${onnxruntime_EXTERNAL_DEPENDENCIES})
2849
set_target_properties(onnxruntime_providers_qnn PROPERTIES CXX_STANDARD_REQUIRED ON)
2950
set_target_properties(onnxruntime_providers_qnn PROPERTIES FOLDER "ONNXRuntime")
@@ -36,6 +57,21 @@
3657
if(NOT MSVC)
3758
target_compile_options(onnxruntime_providers_qnn PRIVATE "-Wno-unknown-pragmas")
3859
endif()
60+
61+
set(onnxruntime_providers_qnn_target onnxruntime_providers_qnn)
62+
63+
if (MSVC OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
64+
add_custom_command(
65+
TARGET ${onnxruntime_providers_qnn_target} POST_BUILD
66+
COMMAND ${CMAKE_COMMAND} -E copy ${QNN_LIB_FILES} $<TARGET_FILE_DIR:${onnxruntime_providers_qnn_target}>
67+
)
68+
endif()
69+
if (EXISTS "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf")
70+
add_custom_command(
71+
TARGET ${onnxruntime_providers_qnn_target} POST_BUILD
72+
COMMAND ${CMAKE_COMMAND} -E copy "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf" $<TARGET_FILE_DIR:${onnxruntime_providers_qnn_target}>
73+
)
74+
endif()
3975
else()
4076
#
4177
# Build QNN EP as a shared library
@@ -46,20 +82,39 @@
4682
"${ONNXRUNTIME_ROOT}/core/providers/shared_library/*.cc"
4783
)
4884
set(onnxruntime_providers_qnn_srcs ${onnxruntime_providers_qnn_ep_srcs}
49-
${onnxruntime_providers_qnn_shared_lib_srcs})
85+
${onnxruntime_providers_qnn_shared_lib_srcs})
5086

5187
source_group(TREE ${ONNXRUNTIME_ROOT}/core FILES ${onnxruntime_providers_qnn_srcs})
52-
onnxruntime_add_shared_library_module(onnxruntime_providers_qnn ${onnxruntime_providers_qnn_srcs})
88+
89+
set(onnxruntime_providers_qnn_all_srcs ${onnxruntime_providers_qnn_srcs})
90+
if(WIN32)
91+
# Sets the DLL version info on Windows: https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
92+
list(APPEND onnxruntime_providers_qnn_all_srcs "${ONNXRUNTIME_ROOT}/core/providers/qnn/onnxruntime_providers_qnn.rc")
93+
endif()
94+
95+
onnxruntime_add_shared_library_module(onnxruntime_providers_qnn ${onnxruntime_providers_qnn_all_srcs})
5396
onnxruntime_add_include_to_target(onnxruntime_providers_qnn ${ONNXRUNTIME_PROVIDERS_SHARED} ${GSL_TARGET} onnx
54-
onnxruntime_common Boost::mp11 safeint_interface
55-
nlohmann_json::nlohmann_json)
97+
onnxruntime_common Boost::mp11 safeint_interface
98+
nlohmann_json::nlohmann_json)
5699
target_link_libraries(onnxruntime_providers_qnn PRIVATE ${ONNXRUNTIME_PROVIDERS_SHARED} ${ABSEIL_LIBS} ${CMAKE_DL_LIBS})
57100
add_dependencies(onnxruntime_providers_qnn onnxruntime_providers_shared ${onnxruntime_EXTERNAL_DEPENDENCIES})
58101
target_include_directories(onnxruntime_providers_qnn PRIVATE ${ONNXRUNTIME_ROOT}
59102
${CMAKE_CURRENT_BINARY_DIR}
60103
${onnxruntime_QNN_HOME}/include/QNN
61104
${onnxruntime_QNN_HOME}/include)
62105

106+
# Set preprocessor definitions used in onnxruntime_providers_qnn.rc
107+
if(WIN32)
108+
if(NOT QNN_SDK_VERSION)
109+
set(QNN_DLL_FILE_DESCRIPTION "ONNX Runtime QNN Provider")
110+
else()
111+
set(QNN_DLL_FILE_DESCRIPTION "ONNX Runtime QNN Provider (QAIRT ${QNN_SDK_VERSION})")
112+
endif()
113+
114+
target_compile_definitions(onnxruntime_providers_qnn PRIVATE FILE_DESC=\"${QNN_DLL_FILE_DESCRIPTION}\")
115+
target_compile_definitions(onnxruntime_providers_qnn PRIVATE FILE_NAME=\"onnxruntime_providers_qnn.dll\")
116+
endif()
117+
63118
# Set linker flags for function(s) exported by EP DLL
64119
if(UNIX)
65120
target_link_options(onnxruntime_providers_qnn PRIVATE
@@ -90,4 +145,19 @@
90145
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
91146
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
92147
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
148+
149+
set(onnxruntime_providers_qnn_target onnxruntime_providers_qnn)
150+
151+
if (MSVC OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
152+
add_custom_command(
153+
TARGET ${onnxruntime_providers_qnn_target} POST_BUILD
154+
COMMAND ${CMAKE_COMMAND} -E copy ${QNN_LIB_FILES} $<TARGET_FILE_DIR:${onnxruntime_providers_qnn_target}>
155+
)
156+
endif()
157+
if (EXISTS "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf")
158+
add_custom_command(
159+
TARGET ${onnxruntime_providers_qnn_target} POST_BUILD
160+
COMMAND ${CMAKE_COMMAND} -E copy "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf" $<TARGET_FILE_DIR:${onnxruntime_providers_qnn_target}>
161+
)
162+
endif()
93163
endif()

‎cmake/onnxruntime_providers_tensorrt.cmake‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,14 @@
166166
)
167167

168168
source_group(TREE ${ONNXRUNTIME_ROOT}/core FILES ${onnxruntime_providers_tensorrt_cc_srcs})
169-
onnxruntime_add_shared_library_module(onnxruntime_providers_tensorrt ${onnxruntime_providers_tensorrt_cc_srcs})
169+
170+
set(onnxruntime_providers_tensorrt_all_srcs ${onnxruntime_providers_tensorrt_cc_srcs})
171+
if(WIN32)
172+
# Sets the DLL version info on Windows: https://learn.microsoft.com/en-us/windows/win32/menurc/versioninfo-resource
173+
list(APPEND onnxruntime_providers_tensorrt_all_srcs "${ONNXRUNTIME_ROOT}/core/providers/tensorrt/onnxruntime_providers_tensorrt.rc")
174+
endif()
175+
176+
onnxruntime_add_shared_library_module(onnxruntime_providers_tensorrt ${onnxruntime_providers_tensorrt_all_srcs})
170177
onnxruntime_add_include_to_target(onnxruntime_providers_tensorrt onnxruntime_common)
171178
target_link_libraries(onnxruntime_providers_tensorrt PRIVATE Eigen3::Eigen onnx flatbuffers::flatbuffers Boost::mp11 safeint_interface Eigen3::Eigen)
172179
add_dependencies(onnxruntime_providers_tensorrt onnxruntime_providers_shared ${onnxruntime_EXTERNAL_DEPENDENCIES})
@@ -183,6 +190,12 @@
183190
set_target_properties(onnxruntime_providers_tensorrt PROPERTIES FOLDER "ONNXRuntime")
184191
target_compile_definitions(onnxruntime_providers_tensorrt PRIVATE ONNXIFI_BUILD_LIBRARY=1)
185192
target_compile_options(onnxruntime_providers_tensorrt PRIVATE ${DISABLED_WARNINGS_FOR_TRT})
193+
194+
if(WIN32)
195+
# FILE_NAME preprocessor definition is used in onnxruntime_providers_tensorrt.rc
196+
target_compile_definitions(onnxruntime_providers_tensorrt PRIVATE FILE_NAME=\"onnxruntime_providers_tensorrt.dll\")
197+
endif()
198+
186199
if (WIN32)
187200
target_compile_options(onnxruntime_providers_tensorrt INTERFACE /wd4456)
188201
endif()

‎cmake/onnxruntime_unittests.cmake‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,21 +1075,6 @@ if (NOT onnxruntime_ENABLE_TRAINING_TORCH_INTEROP)
10751075
)
10761076
endif()
10771077

1078-
if (onnxruntime_USE_QNN)
1079-
if (MSVC OR ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
1080-
add_custom_command(
1081-
TARGET ${test_data_target} POST_BUILD
1082-
COMMAND ${CMAKE_COMMAND} -E copy ${QNN_LIB_FILES} $<TARGET_FILE_DIR:${test_data_target}>
1083-
)
1084-
endif()
1085-
if (EXISTS "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf")
1086-
add_custom_command(
1087-
TARGET ${test_data_target} POST_BUILD
1088-
COMMAND ${CMAKE_COMMAND} -E copy "${onnxruntime_QNN_HOME}/Qualcomm AI Hub Proprietary License.pdf" $<TARGET_FILE_DIR:${test_data_target}>
1089-
)
1090-
endif()
1091-
endif()
1092-
10931078
if (onnxruntime_USE_DNNL)
10941079
if(onnxruntime_DNNL_GPU_RUNTIME STREQUAL "ocl" AND onnxruntime_DNNL_OPENCL_ROOT STREQUAL "")
10951080
message(FATAL_ERROR "--dnnl_opencl_root required")

0 commit comments

Comments
 (0)