Skip to content

Commit 27db015

Browse files
authored
Use a single static lib file for onnxruntime on Windows (#404)
1 parent b80b7e5 commit 27db015

File tree

6 files changed

+19
-84
lines changed

6 files changed

+19
-84
lines changed

cmake/onnxruntime-win-x64-static.cmake

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ if(BUILD_SHARED_LIBS)
1515
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
1616
endif()
1717

18-
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.0/onnxruntime-win-x64-static-1.16.0.tar.bz2")
19-
set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-static-1.16.0.tar.bz2")
20-
set(onnxruntime_HASH "SHA256=d1b87e8a438a7e31b46bf13a194c5ac38fdf60ebeefef82692008e42e3242776")
18+
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.0/onnxruntime-win-x64-static_lib-1.16.0.tar.bz2")
19+
set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x64-static_lib-1.16.0.tar.bz2")
20+
set(onnxruntime_HASH "SHA256=7b28a694178d075e6836d618613e2a0fd0046ccd9fd66bbf6a46d22e96db33b8")
2121

2222
# If you don't have access to the Internet,
2323
# please download onnxruntime to one of the following locations.
2424
# You can add more if you want.
2525
set(possible_file_locations
26-
$ENV{HOME}/Downloads/onnxruntime-win-x64-static-1.16.0.tar.bz2
27-
${PROJECT_SOURCE_DIR}/onnxruntime-win-x64-static-1.16.0.tar.bz2
28-
${PROJECT_BINARY_DIR}/onnxruntime-win-x64-static-1.16.0.tar.bz2
29-
/tmp/onnxruntime-win-x64-static-1.16.0.tar.bz2
26+
$ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-1.16.0.tar.bz2
27+
${PROJECT_SOURCE_DIR}/onnxruntime-win-x64-static_lib-1.16.0.tar.bz2
28+
${PROJECT_BINARY_DIR}/onnxruntime-win-x64-static_lib-1.16.0.tar.bz2
29+
/tmp/onnxruntime-win-x64-static_lib-1.16.0.tar.bz2
3030
)
3131

3232
foreach(f IN LISTS possible_file_locations)
@@ -57,6 +57,7 @@ message(STATUS "onnxruntime is downloaded to ${onnxruntime_SOURCE_DIR}")
5757
include_directories(${onnxruntime_SOURCE_DIR}/include)
5858

5959
file(GLOB onnxruntime_lib_files "${onnxruntime_SOURCE_DIR}/lib/*.lib")
60+
6061
set(onnxruntime_lib_files ${onnxruntime_lib_files} PARENT_SCOPE)
6162

6263
message(STATUS "onnxruntime lib files: ${onnxruntime_lib_files}")

cmake/onnxruntime-win-x86-static.cmake

+7-7
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@ if(BUILD_SHARED_LIBS)
1515
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
1616
endif()
1717

18-
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.0/onnxruntime-win-x86-static-1.16.0.tar.bz2")
19-
set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-static-1.16.0.tar.bz2")
20-
set(onnxruntime_HASH "SHA256=aedb6b5275f7832ac5117db8e40328a0842ae8ce6749a0c99bcb4218c53fdc60")
18+
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.16.0/onnxruntime-win-x86-static_lib-1.16.0.tar.bz2")
19+
set(onnxruntime_URL2 "https://huggingface.co/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-win-x86-static_lib-1.16.0.tar.bz2")
20+
set(onnxruntime_HASH "SHA256=fe78775b222244bbcb512631719a94336391b645edb23c314201a6991ddecb58")
2121

2222
# If you don't have access to the Internet,
2323
# please download onnxruntime to one of the following locations.
2424
# You can add more if you want.
2525
set(possible_file_locations
26-
$ENV{HOME}/Downloads/onnxruntime-win-x86-static-1.16.0.tar.bz2
27-
${PROJECT_SOURCE_DIR}/onnxruntime-win-x86-static-1.16.0.tar.bz2
28-
${PROJECT_BINARY_DIR}/onnxruntime-win-x86-static-1.16.0.tar.bz2
29-
/tmp/onnxruntime-win-x86-static-1.16.0.tar.bz2
26+
$ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-1.16.0.tar.bz2
27+
${PROJECT_SOURCE_DIR}/onnxruntime-win-x86-static_lib-1.16.0.tar.bz2
28+
${PROJECT_BINARY_DIR}/onnxruntime-win-x86-static_lib-1.16.0.tar.bz2
29+
/tmp/onnxruntime-win-x86-static_lib-1.16.0.tar.bz2
3030
)
3131

3232
foreach(f IN LISTS possible_file_locations)

mfc-examples/NonStreamingSpeechRecognition/sherpa-onnx-deps.props

+1-23
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,7 @@
1313
sherpa-onnx-kaldifst-core.lib;
1414
sherpa-onnx-fst.lib;
1515
kaldi-native-fbank-core.lib;
16-
absl_base.lib;
17-
absl_city.lib;
18-
absl_hash.lib;
19-
absl_low_level_hash.lib;
20-
absl_raw_hash_set.lib;
21-
absl_raw_logging_internal.lib;
22-
absl_throw_delegate.lib;
23-
clog.lib;
24-
cpuinfo.lib;
25-
flatbuffers.lib;
26-
libprotobuf-lite.lib;
27-
onnx.lib;
28-
onnx_proto.lib;
29-
onnxruntime_common.lib;
30-
onnxruntime_flatbuffers.lib;
31-
onnxruntime_framework.lib;
32-
onnxruntime_graph.lib;
33-
onnxruntime_mlas.lib;
34-
onnxruntime_optimizer.lib;
35-
onnxruntime_providers.lib;
36-
onnxruntime_session.lib;
37-
onnxruntime_util.lib;
38-
re2.lib;
16+
onnxruntime.lib;
3917
</SherpaOnnxLibraries>
4018
</PropertyGroup>
4119
<ItemDefinitionGroup>

mfc-examples/NonStreamingTextToSpeech/NonStreamingTextToSpeech.vcxproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<PlatformToolset>v143</PlatformToolset>
4040
<WholeProgramOptimization>true</WholeProgramOptimization>
4141
<CharacterSet>Unicode</CharacterSet>
42-
<UseOfMfc>Dynamic</UseOfMfc>
42+
<UseOfMfc>Static</UseOfMfc>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4545
<ConfigurationType>Application</ConfigurationType>

mfc-examples/NonStreamingTextToSpeech/sherpa-onnx-deps.props

+1-23
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,7 @@
1313
sherpa-onnx-kaldifst-core.lib;
1414
sherpa-onnx-fst.lib;
1515
kaldi-native-fbank-core.lib;
16-
absl_base.lib;
17-
absl_city.lib;
18-
absl_hash.lib;
19-
absl_low_level_hash.lib;
20-
absl_raw_hash_set.lib;
21-
absl_raw_logging_internal.lib;
22-
absl_throw_delegate.lib;
23-
clog.lib;
24-
cpuinfo.lib;
25-
flatbuffers.lib;
26-
libprotobuf-lite.lib;
27-
onnx.lib;
28-
onnx_proto.lib;
29-
onnxruntime_common.lib;
30-
onnxruntime_flatbuffers.lib;
31-
onnxruntime_framework.lib;
32-
onnxruntime_graph.lib;
33-
onnxruntime_mlas.lib;
34-
onnxruntime_optimizer.lib;
35-
onnxruntime_providers.lib;
36-
onnxruntime_session.lib;
37-
onnxruntime_util.lib;
38-
re2.lib;
16+
onnxruntime.lib;
3917
</SherpaOnnxLibraries>
4018
</PropertyGroup>
4119
<ItemDefinitionGroup>

mfc-examples/StreamingSpeechRecognition/sherpa-onnx-deps.props

+1-23
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,7 @@
1313
sherpa-onnx-kaldifst-core.lib;
1414
sherpa-onnx-fst.lib;
1515
kaldi-native-fbank-core.lib;
16-
absl_base.lib;
17-
absl_city.lib;
18-
absl_hash.lib;
19-
absl_low_level_hash.lib;
20-
absl_raw_hash_set.lib;
21-
absl_raw_logging_internal.lib;
22-
absl_throw_delegate.lib;
23-
clog.lib;
24-
cpuinfo.lib;
25-
flatbuffers.lib;
26-
libprotobuf-lite.lib;
27-
onnx.lib;
28-
onnx_proto.lib;
29-
onnxruntime_common.lib;
30-
onnxruntime_flatbuffers.lib;
31-
onnxruntime_framework.lib;
32-
onnxruntime_graph.lib;
33-
onnxruntime_mlas.lib;
34-
onnxruntime_optimizer.lib;
35-
onnxruntime_providers.lib;
36-
onnxruntime_session.lib;
37-
onnxruntime_util.lib;
38-
re2.lib;
16+
onnxruntime.lib;
3917
</SherpaOnnxLibraries>
4018
</PropertyGroup>
4119
<ItemDefinitionGroup>

0 commit comments

Comments
 (0)