Skip to content

Commit 90efd84

Browse files
authored
Use onnxruntime v1.23.2 for Linux aarch64 (#3016)
1 parent 151dd9c commit 90efd84

6 files changed

Lines changed: 42 additions & 17 deletions

.github/workflows/aarch64-linux-gnu-shared.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,10 @@ jobs:
265265
export PATH=$PWD/build/install/bin:$PATH
266266
export EXE=sherpa-onnx-offline
267267
268+
ls -lh build/bin/sherpa-onnx-offline
269+
268270
readelf -d build/bin/sherpa-onnx-offline
269271
272+
strings build/bin/sherpa-onnx-offline | grep ^GLIBC
273+
270274
.github/scripts/test-offline-moonshine.sh

.github/workflows/aarch64-linux-gnu-static.yaml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ jobs:
4343
- name: Build sherpa-onnx
4444
uses: addnab/docker-run-action@v3
4545
with:
46-
image: quay.io/pypa/manylinux2014_aarch64
46+
# image: quay.io/pypa/manylinux2014_aarch64 # it does not have gcc 11
47+
image: ghcr.io/csukuangfj/manylinux2014-aarch64-gcc11:latest # i have built gcc 11 from source
4748
options: |
4849
--volume ${{ github.workspace }}/:/k2-fsa/sherpa-onnx
4950
shell: bash
@@ -55,6 +56,22 @@ jobs:
5556
gcc --version
5657
g++ --version
5758
59+
ldd --version
60+
61+
# ✅ FORCE GCC 11
62+
export GCC_ROOT=/opt/gcc-11.4.0
63+
export CC=$GCC_ROOT/bin/gcc
64+
export CXX=$GCC_ROOT/bin/g++
65+
export PATH=$GCC_ROOT/bin:$PATH
66+
67+
gcc --version
68+
which gcc
69+
70+
g++ --version
71+
which g++
72+
73+
ldd --version
74+
5875
echo "pwd"
5976
6077
ls -lh
@@ -179,6 +196,10 @@ jobs:
179196
export PATH=$PWD/build/bin:$PATH
180197
export EXE=sherpa-onnx-offline
181198
199+
ls -lh build/bin/sherpa-onnx-offline
200+
182201
readelf -d build/bin/sherpa-onnx-offline
183202
203+
strings build/bin/sherpa-onnx-offline | grep ^GLIBC
204+
184205
.github/scripts/test-offline-moonshine.sh

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.17.1/onnxruntime-linux-aarch64-static_lib-1.17.1.zip")
18-
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-aarch64-static_lib-1.17.1.zip")
19-
set(onnxruntime_HASH "SHA256=831b9a3869501040b4399de85f34c4f170e2bcbd41881edaeb553f8dc4080985")
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")
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.17.1.zip
26-
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
27-
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
28-
/tmp/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
29-
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
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
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.17.1/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1-patched.zip")
18-
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1-patched.zip")
19-
set(onnxruntime_HASH "SHA256=6e0e68985f8dd1f643e5a4dbe7cd54c9e176a0cc62249c6bee0699b87fc6d4fb")
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")
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.17.1-patched.zip
26-
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1-patched.zip
27-
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1-patched.zip
28-
/tmp/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1-patched.zip
29-
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1-patched.zip
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
3030
)
3131

3232
foreach(f IN LISTS possible_file_locations)

cmake/onnxruntime-linux-riscv64-spacemit.cmake

100755100644
File mode changed.

cmake/onnxruntime.cmake

100755100644
File mode changed.

0 commit comments

Comments
 (0)