Skip to content

Commit 48a3e36

Browse files
csukuangfjcsukuangfj
authored
Update onnxruntime to use v1.24.4 (#3501)
1 parent aa9019c commit 48a3e36

31 files changed

Lines changed: 218 additions & 217 deletions

‎.github/workflows/build-wheels-linux-cuda.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
os: [ubuntu-22.04]
2424
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
25-
onnxruntime_version: ["1.17.1", "1.23.2"]
25+
onnxruntime_version: ["1.17.1", "1.24.4"]
2626

2727
steps:
2828
- uses: actions/checkout@v4
@@ -80,7 +80,7 @@ jobs:
8080
export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/onnxruntime-linux-x64-gpu-$onnxruntime_version-patched/lib
8181
export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$PWD/onnxruntime-linux-x64-gpu-$onnxruntime_version-patched/include
8282
83-
if [[ $onnxruntime_version == "1.23.2" ]]; then
83+
if [[ $onnxruntime_version == "1.24.4" ]]; then
8484
export SHERPA_ONNX_CUDA_VERSION="12.cudnn9"
8585
fi
8686

‎.github/workflows/build-wheels-win64-cuda.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
os: [windows-2022]
2424
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "3.13", "3.14"]
25-
onnxruntime_version: ["1.17.1", "1.23.2"]
25+
onnxruntime_version: ["1.17.1", "1.24.4"]
2626

2727
steps:
2828
- uses: actions/checkout@v4
@@ -52,7 +52,7 @@ jobs:
5252
export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/onnxruntime-win-x64-gpu-$onnxruntime_version/lib
5353
export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$PWD/onnxruntime-win-x64-gpu-$onnxruntime_version/include
5454
55-
if [[ $onnxruntime_version == "1.23.2" ]]; then
55+
if [[ $onnxruntime_version == "1.24.4" ]]; then
5656
export SHERPA_ONNX_CUDA_VERSION="12.cudnn9"
5757
fi
5858

‎.github/workflows/jar.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
dst=sherpa-onnx/java-api/resources/sherpa-onnx/native/osx-aarch64
102102
103103
mkdir -p $dst
104-
cp -v $src/lib/libonnxruntime.1.23.2.dylib $dst/
104+
cp -v $src/lib/libonnxruntime.1.24.4.dylib $dst/
105105
cp -v $src/lib/libsherpa-onnx-jni.dylib $dst/
106106
107107
ls -lh $dst
@@ -119,7 +119,7 @@ jobs:
119119
dst=sherpa-onnx/java-api/resources/sherpa-onnx/native/osx-x64
120120
121121
mkdir -p $dst
122-
cp -v $src/lib/libonnxruntime.1.23.2.dylib $dst/
122+
cp -v $src/lib/libonnxruntime.1.24.4.dylib $dst/
123123
cp -v $src/lib/libsherpa-onnx-jni.dylib $dst/
124124
125125
ls -lh $dst

‎.github/workflows/linux-gpu.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
os: [ubuntu-latest]
3737
# build_type: [Release, Debug]
3838
build_type: [Release]
39-
onnxruntime_version: ["1.17.1", "1.23.2"]
39+
onnxruntime_version: ["1.17.1", "1.24.4"]
4040

4141
steps:
4242
- uses: actions/checkout@v4
@@ -143,7 +143,7 @@ jobs:
143143
dst=sherpa-onnx-${SHERPA_ONNX_VERSION}-linux-x64-gpu
144144
145145
onnxruntime_version=${{ matrix.onnxruntime_version }}
146-
if [[ $onnxruntime_version == "1.23.2" ]]; then
146+
if [[ $onnxruntime_version == "1.24.4" ]]; then
147147
dst=sherpa-onnx-${SHERPA_ONNX_VERSION}-cuda-12.x-cudnn-9.x-linux-x64-gpu
148148
fi
149149

‎.github/workflows/test-go.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
rm ./lib/*.a
138138
rm ./lib/libonnxruntime.dylib
139139
cd lib
140-
ln -s libonnxruntime.1.23.2.dylib libonnxruntime.dylib
140+
ln -s libonnxruntime.1.24.4.dylib libonnxruntime.dylib
141141
cd ..
142142
fi
143143

‎.github/workflows/test-onnxruntime-version.yaml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ jobs:
2222
fail-fast: false
2323
matrix:
2424
os: [macos-latest]
25-
version: ["1.11.0", "1.11.1", "1.12.0", "1.12.1", "1.13.1", "1.14.0", "1.14.1", "1.15.0", "1.15.1", "1.16.1", "1.16.2", "1.17.0", "1.17.1", "1.17.3", "1.18.0", "1.18.1", "1.19.0", "1.19.2", "1.20.0", "1.20.1", "1.20.2", "1.21.0", "1.21.1", "1.22.0", "1.22.1", "1.22.2", "1.23.0", "1.23.1", "1.23.2"]
25+
# version: ["1.11.0", "1.11.1", "1.12.0", "1.12.1", "1.13.1", "1.14.0", "1.14.1", "1.15.0", "1.15.1", "1.16.1", "1.16.2", "1.17.0", "1.17.1", "1.17.3", "1.18.0", "1.18.1", "1.19.0", "1.19.2", "1.20.0", "1.20.1", "1.20.2", "1.21.0", "1.21.1", "1.22.0", "1.22.1", "1.22.2", "1.23.0", "1.23.1", "1.23.2", "1.24.4"]
26+
version: ["1.24.4"]
2627

2728
steps:
2829
- uses: actions/checkout@v4
@@ -44,21 +45,22 @@ jobs:
4445
shell: bash
4546
run: |
4647
version=${{ matrix.version }}
47-
curl -SL -O https://github.com/microsoft/onnxruntime/releases/download/v${version}/onnxruntime-osx-universal2-${version}.tgz
48-
tar xvf onnxruntime-osx-universal2-${version}.tgz
49-
ls -lh onnxruntime-osx-universal2-${version}
48+
curl -SL -O https://github.com/microsoft/onnxruntime/releases/download/v${version}/onnxruntime-osx-arm64-${version}.tgz
5049
51-
ls -lh onnxruntime-osx-universal2-${version}
50+
tar xvf onnxruntime-osx-arm64-${version}.tgz
51+
ls -lh onnxruntime-osx-arm64-${version}
52+
53+
ls -lh onnxruntime-osx-arm64-${version}
5254
echo "---"
53-
ls -lh onnxruntime-osx-universal2-${version}/include
55+
ls -lh onnxruntime-osx-arm64-${version}/include
5456
echo "---"
55-
ls -lh onnxruntime-osx-universal2-${version}/lib
57+
ls -lh onnxruntime-osx-arm64-${version}/lib
5658
5759
- name: Configure CMake
5860
shell: bash
5961
run: |
6062
version=${{ matrix.version }}
61-
onnxruntime_dir=$PWD/onnxruntime-osx-universal2-${version}
63+
onnxruntime_dir=$PWD/onnxruntime-osx-arm64-${version}
6264
export SHERPA_ONNXRUNTIME_LIB_DIR=$onnxruntime_dir/lib/
6365
export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$onnxruntime_dir/include/
6466
@@ -71,15 +73,14 @@ jobs:
7173
7274
cmake \
7375
-D BUILD_SHARED_LIBS=ON \
74-
-D CMAKE_OSX_ARCHITECTURES='arm64;x86_64' \
7576
-D CMAKE_INSTALL_PREFIX=./install \
7677
..
7778
7879
- name: Build sherpa-onnx for macos
7980
shell: bash
8081
run: |
8182
version=${{ matrix.version }}
82-
onnxruntime_dir=$PWD/onnxruntime-osx-universal2-${version}
83+
onnxruntime_dir=$PWD/onnxruntime-osx-arm64-${version}
8384
export SHERPA_ONNXRUNTIME_LIB_DIR=$onnxruntime_dir/lib/
8485
export SHERPA_ONNXRUNTIME_INCLUDE_DIR=$onnxruntime_dir/include/
8586
@@ -112,7 +113,7 @@ jobs:
112113
run: |
113114
SHERPA_ONNX_VERSION=v$(grep "SHERPA_ONNX_VERSION" ./CMakeLists.txt | cut -d " " -f 2 | cut -d '"' -f 2)
114115
115-
dst=sherpa-onnx-${SHERPA_ONNX_VERSION}-onnxruntime-${{ matrix.version }}-osx-universal2-shared
116+
dst=sherpa-onnx-${SHERPA_ONNX_VERSION}-onnxruntime-${{ matrix.version }}-osx-arm64-shared
116117
mkdir $dst
117118
118119
cp -a build/install/bin $dst/
@@ -131,7 +132,7 @@ jobs:
131132
with:
132133
file_glob: true
133134
overwrite: true
134-
file: sherpa-onnx-*osx-universal2*.tar.bz2
135+
file: sherpa-onnx-*osx-arm64*.tar.bz2
135136

136137
- name: Test offline Cohere Transcribe
137138
if: matrix.build_type != 'Debug' && !startsWith(github.ref, 'refs/tags/')

‎.github/workflows/windows-x64-cuda.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
fail-fast: false
3333
matrix:
3434
os: [windows-2022]
35-
onnxruntime_version: ["1.17.1", "1.23.2"]
35+
onnxruntime_version: ["1.17.1", "1.24.4"]
3636

3737
steps:
3838
- uses: actions/checkout@v4
@@ -84,7 +84,7 @@ jobs:
8484
dst=sherpa-onnx-${SHERPA_ONNX_VERSION}-win-x64-cuda
8585
8686
onnxruntime_version=${{ matrix.onnxruntime_version }}
87-
if [[ $onnxruntime_version == "1.23.2" ]]; then
87+
if [[ $onnxruntime_version == "1.24.4" ]]; then
8888
dst=sherpa-onnx-${SHERPA_ONNX_VERSION}-cuda-12.x-cudnn-9.x-win-x64-cuda
8989
fi
9090

‎cmake/onnxruntime-linux-aarch64-static.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS)
1414
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
1515
endif()
1616

17-
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.23.2/onnxruntime-linux-aarch64-static_lib-1.23.2-glibc2_17.zip")
18-
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/1.23.2/onnxruntime-linux-aarch64-static_lib-1.23.2-glibc2_17.zip")
19-
set(onnxruntime_HASH "SHA256=7a603d836aa27d37197eb76f055d3c9e4e81d3a5a343c60000d7b6345bc6c80f")
17+
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.24.4/onnxruntime-linux-aarch64-static_lib-1.24.4-glibc2_17.zip")
18+
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/1.24.4/onnxruntime-linux-aarch64-static_lib-1.24.4-glibc2_17.zip")
19+
set(onnxruntime_HASH "SHA256=14fb3e231f33ceab1d488d3f5daf0549e48202420f52a6b9d8eb582809506f85")
2020

2121
# If you don't have access to the Internet,
2222
# please download onnxruntime to one of the following locations.
2323
# You can add more if you want.
2424
set(possible_file_locations
25-
$ENV{HOME}/Downloads/onnxruntime-linux-aarch64-static_lib-1.23.2-glibc2_17.zip
26-
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.23.2-glibc2_17.zip
27-
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.23.2-glibc2_17.zip
28-
/tmp/onnxruntime-linux-aarch64-static_lib-1.23.2-glibc2_17.zip
29-
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.23.2-glibc2_17.zip
25+
$ENV{HOME}/Downloads/onnxruntime-linux-aarch64-static_lib-1.24.4-glibc2_17.zip
26+
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.24.4-glibc2_17.zip
27+
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.24.4-glibc2_17.zip
28+
/tmp/onnxruntime-linux-aarch64-static_lib-1.24.4-glibc2_17.zip
29+
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.24.4-glibc2_17.zip
3030
)
3131

3232
foreach(f IN LISTS possible_file_locations)

‎cmake/onnxruntime-linux-aarch64.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS)
1414
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
1515
endif()
1616

17-
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.23.2/onnxruntime-linux-aarch64-glibc2_17-Release-1.23.2.zip")
18-
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/1.23.2/onnxruntime-linux-aarch64-glibc2_17-Release-1.23.2.zip")
19-
set(onnxruntime_HASH "SHA256=2a40a5323827bc59844d00ffdd3697d5e30dccb691233054bace0dc61cfa8341")
17+
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.24.4/onnxruntime-linux-aarch64-glibc2_17-Release-1.24.4.zip")
18+
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/1.24.4/onnxruntime-linux-aarch64-glibc2_17-Release-1.24.4.zip")
19+
set(onnxruntime_HASH "SHA256=c6a1971a8bfc8eaa07d48478d796245a747e75f510859574c9253dc7f1e9dc9a")
2020

2121
# If you don't have access to the Internet,
2222
# please download onnxruntime to one of the following locations.
2323
# You can add more if you want.
2424
set(possible_file_locations
25-
$ENV{HOME}/Downloads/onnxruntime-linux-aarch64-glibc2_17-Release-1.23.2.zip
26-
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.23.2.zip
27-
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.23.2.zip
28-
/tmp/onnxruntime-linux-aarch64-glibc2_17-Release-1.23.2.zip
29-
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-glibc2_17-Release-1.23.2.zip
25+
$ENV{HOME}/Downloads/onnxruntime-linux-aarch64-glibc2_17-Release-1.24.4.zip
26+
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.24.4.zip
27+
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.24.4.zip
28+
/tmp/onnxruntime-linux-aarch64-glibc2_17-Release-1.24.4.zip
29+
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-glibc2_17-Release-1.24.4.zip
3030
)
3131

3232
foreach(f IN LISTS possible_file_locations)

‎cmake/onnxruntime-linux-arm-static.cmake‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ if(BUILD_SHARED_LIBS)
1515
endif()
1616

1717
# requires gcc 11
18-
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.23.2/onnxruntime-linux-arm-static_lib-1.23.2.zip")
19-
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-static_lib-1.23.2.zip")
20-
set(onnxruntime_HASH "SHA256=334a51dbdc6812f91ee88356cedca14b097ed2907c80aa2b91670680e155ad9f")
18+
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.24.4/onnxruntime-linux-arm-static_lib-1.24.4.zip")
19+
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/1.24.4/onnxruntime-linux-arm-static_lib-1.24.4.zip")
20+
set(onnxruntime_HASH "SHA256=c21be2d3321e845faf675900e68c0fed30ac7b0712c7ae2fe1c1c72d592f6439")
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-linux-arm-static_lib-1.23.2.zip
27-
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.23.2.zip
28-
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.23.2.zip
29-
/tmp/onnxruntime-linux-arm-static_lib-1.23.2.zip
30-
/star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.23.2.zip
26+
$ENV{HOME}/Downloads/onnxruntime-linux-arm-static_lib-1.24.4.zip
27+
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.24.4.zip
28+
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.24.4.zip
29+
/tmp/onnxruntime-linux-arm-static_lib-1.24.4.zip
30+
/star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.24.4.zip
3131
)
3232

3333
foreach(f IN LISTS possible_file_locations)

0 commit comments

Comments
 (0)