fix dml with preinstall ort (#2066)
This commit is contained in:
@@ -37,6 +37,8 @@ option(SHERPA_ONNX_ENABLE_C_API "Whether to build C API" ON)
|
||||
option(SHERPA_ONNX_ENABLE_WEBSOCKET "Whether to build webscoket server/client" ON)
|
||||
option(SHERPA_ONNX_ENABLE_GPU "Enable ONNX Runtime GPU support" OFF)
|
||||
option(SHERPA_ONNX_ENABLE_DIRECTML "Enable ONNX Runtime DirectML support" OFF)
|
||||
option(SHERPA_ONNX_LINK_D3D "Whether static ONNX runtime lib with DML" OFF)
|
||||
|
||||
option(SHERPA_ONNX_ENABLE_WASM "Whether to enable WASM" OFF)
|
||||
option(SHERPA_ONNX_ENABLE_WASM_SPEAKER_DIARIZATION "Whether to enable WASM for speaker diarization" OFF)
|
||||
option(SHERPA_ONNX_ENABLE_WASM_TTS "Whether to enable WASM for TTS" OFF)
|
||||
@@ -165,6 +167,7 @@ message(STATUS "SHERPA_ONNX_USE_PRE_INSTALLED_ONNXRUNTIME_IF_AVAILABLE ${SHERPA_
|
||||
message(STATUS "SHERPA_ONNX_ENABLE_SANITIZER: ${SHERPA_ONNX_ENABLE_SANITIZER}")
|
||||
message(STATUS "SHERPA_ONNX_BUILD_C_API_EXAMPLES: ${SHERPA_ONNX_BUILD_C_API_EXAMPLES}")
|
||||
message(STATUS "SHERPA_ONNX_ENABLE_RKNN: ${SHERPA_ONNX_ENABLE_RKNN}")
|
||||
message(STATUS "SHERPA_ONNX_LINK_D3D: ${SHERPA_ONNX_LINK_D3D}")
|
||||
|
||||
if(BUILD_SHARED_LIBS OR SHERPA_ONNX_ENABLE_JNI)
|
||||
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
|
||||
@@ -311,6 +314,7 @@ if(WIN32)
|
||||
add_definitions(-DNOMINMAX) # Otherwise, std::max() and std::min() won't work
|
||||
endif()
|
||||
|
||||
|
||||
if(WIN32 AND MSVC)
|
||||
# disable various warnings for MSVC
|
||||
# 4244: 'return': conversion from 'unsigned __int64' to 'int', possible loss of data
|
||||
|
||||
@@ -19,6 +19,10 @@ if(NOT SHERPA_ONNX_ENABLE_DIRECTML)
|
||||
message(FATAL_ERROR "This file is for DirectML. Given SHERPA_ONNX_ENABLE_DIRECTML: ${SHERPA_ONNX_ENABLE_DIRECTML}")
|
||||
endif()
|
||||
|
||||
if(location_onnxruntime_header_dir AND location_onnxruntime_lib)
|
||||
message("Use preinstall onnxruntime with directml: ${location_onnxruntime_lib}")
|
||||
else()
|
||||
|
||||
set(onnxruntime_URL "https://globalcdn.nuget.org/packages/microsoft.ml.onnxruntime.directml.1.14.1.nupkg")
|
||||
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/sherpa-onnx-cmake-deps/resolve/main/microsoft.ml.onnxruntime.directml.1.14.1.nupkg")
|
||||
set(onnxruntime_HASH "SHA256=c8ae7623385b19cd5de968d0df5383e13b97d1b3a6771c9177eac15b56013a5a")
|
||||
@@ -94,6 +98,8 @@ endif()
|
||||
|
||||
install(FILES ${onnxruntime_lib_files} DESTINATION bin)
|
||||
|
||||
endif()
|
||||
|
||||
# Setup DirectML
|
||||
|
||||
set(directml_URL "https://www.nuget.org/api/v2/package/Microsoft.AI.DirectML/1.15.0")
|
||||
|
||||
@@ -154,6 +154,9 @@ if(SHERPA_ONNX_USE_PRE_INSTALLED_ONNXRUNTIME_IF_AVAILABLE)
|
||||
set(location_onnxruntime_lib $ENV{SHERPA_ONNXRUNTIME_LIB_DIR}/libonnxruntime.dylib)
|
||||
elseif(WIN32)
|
||||
set(location_onnxruntime_lib $ENV{SHERPA_ONNXRUNTIME_LIB_DIR}/onnxruntime.lib)
|
||||
if(SHERPA_ONNX_ENABLE_DIRECTML)
|
||||
include(onnxruntime-win-x64-directml)
|
||||
endif()
|
||||
else()
|
||||
set(location_onnxruntime_lib $ENV{SHERPA_ONNXRUNTIME_LIB_DIR}/libonnxruntime.so)
|
||||
endif()
|
||||
|
||||
@@ -216,6 +216,16 @@ endif()
|
||||
# Always static build
|
||||
add_library(sherpa-onnx-core STATIC ${sources})
|
||||
|
||||
|
||||
if(WIN32 AND SHERPA_ONNX_LINK_D3D)
|
||||
target_link_libraries(sherpa-onnx-core dxguid.lib d3d12.lib dxgi.lib dxcore.lib)
|
||||
endif()
|
||||
|
||||
|
||||
if(TARGET directml)
|
||||
target_link_libraries(sherpa-onnx-core directml)
|
||||
endif()
|
||||
|
||||
set_target_properties(
|
||||
sherpa-onnx-core
|
||||
PROPERTIES
|
||||
|
||||
Reference in New Issue
Block a user