Skip to content

Commit 37e65c2

Browse files
committed
Use onnxruntime v1.23.2 for Linux arm
1 parent 90efd84 commit 37e65c2

3 files changed

Lines changed: 22 additions & 23 deletions

File tree

.github/workflows/arm-linux-gnueabihf.yaml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,16 @@ jobs:
5151
uses: actions/cache@v4
5252
with:
5353
path: toolchain
54-
key: gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf
54+
key: gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf
5555

5656
- name: Download toolchain
5757
if: steps.cache-toolchain.outputs.cache-hit != 'true'
5858
shell: bash
5959
run: |
60-
git lfs install
61-
export GIT_CLONE_PROTECTION_ACTIVE=false
62-
git clone https://huggingface.co/csukuangfj/arm-linux-gcc
63-
ls -lh arm-linux-gcc
64-
60+
curl -SL -O https://huggingface.co/csukuangfj/arm-linux-gcc/resolve/main/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz
6561
mkdir $GITHUB_WORKSPACE/toolchain
66-
tar xvf ./arm-linux-gcc/gcc-arm-9.2-2019.12-x86_64-arm-none-linux-gnueabihf.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain
62+
tar xvf ./gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz --strip-components 1 -C $GITHUB_WORKSPACE/toolchain
63+
rm -v gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz
6764
6865
- name: Display toolchain info
6966
shell: bash
@@ -96,6 +93,8 @@ jobs:
9693
9794
file build-arm-linux-gnueabihf/bin/sherpa-onnx
9895
96+
strings build-arm-linux-gnueabihf/bin/sherpa-onnx | grep ^GLIBC
97+
9998
- name: Copy files
10099
shell: bash
101100
run: |

cmake/onnxruntime-linux-arm-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-arm-static_lib-1.17.1.zip")
18-
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-static_lib-1.17.1.zip")
19-
set(onnxruntime_HASH "SHA256=3f2ba38156d2facfb732c0fe53bc1eaaf2791d9a91dd240380e3d53716798b09")
17+
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.23.2/onnxruntime-linux-arm-static_lib-1.23.2.zip")
18+
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-static_lib-1.23.2.zip")
19+
set(onnxruntime_HASH "SHA256=334a51dbdc6812f91ee88356cedca14b097ed2907c80aa2b91670680e155ad9f")
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-arm-static_lib-1.17.1.zip
26-
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.17.1.zip
27-
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.17.1.zip
28-
/tmp/onnxruntime-linux-arm-static_lib-1.17.1.zip
29-
/star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.17.1.zip
25+
$ENV{HOME}/Downloads/onnxruntime-linux-arm-static_lib-1.23.2.zip
26+
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.23.2.zip
27+
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.23.2.zip
28+
/tmp/onnxruntime-linux-arm-static_lib-1.23.2.zip
29+
/star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.23.2.zip
3030
)
3131

3232
foreach(f IN LISTS possible_file_locations)

cmake/onnxruntime-linux-arm.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-arm-1.17.1-patched.zip")
18-
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/onnxruntime-linux-arm-1.17.1-patched.zip")
19-
set(onnxruntime_HASH "SHA256=4ec00f7adc7341c068babea3d0f607349655e598222d4212115ae4f52619efdb")
17+
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.23.2/onnxruntime-linux-arm-1.23.2.zip")
18+
set(onnxruntime_URL2 "https://hf-mirror.com/csukuangfj/onnxruntime-libs/resolve/main/1.23.2/onnxruntime-linux-arm-1.23.2.zip")
19+
set(onnxruntime_HASH "SHA256=c00aae409731930433badaf7d629499b9a1dcfac4dd67ad6b6a4838349bd6ba5")
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-arm-1.17.1-patched.zip
26-
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-1.17.1-patched.zip
27-
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-1.17.1-patched.zip
28-
/tmp/onnxruntime-linux-arm-1.17.1-patched.zip
29-
/star-fj/fangjun/download/github/onnxruntime-linux-arm-1.17.1-patched.zip
25+
$ENV{HOME}/Downloads/onnxruntime-linux-arm-1.23.2.zip
26+
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-1.23.2.zip
27+
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-1.23.2.zip
28+
/tmp/onnxruntime-linux-arm-1.23.2.zip
29+
/star-fj/fangjun/download/github/onnxruntime-linux-arm-1.23.2.zip
3030
)
3131

3232
foreach(f IN LISTS possible_file_locations)

0 commit comments

Comments
 (0)