Skip to content

Commit 901b3f0

Browse files
authored
Fix publishing binaries for RKNN (#2234)
1 parent 5113094 commit 901b3f0

File tree

2 files changed

+57
-37
lines changed

2 files changed

+57
-37
lines changed

.github/workflows/build-wheels-aarch64-rknn.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ jobs:
100100
export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH
101101
export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs
102102
103-
104103
export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2
105104
export SHERPA_ONNX_RKNN_TOOLKIT2_LIB_DIR=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64
106105
export CPLUS_INCLUDE_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/include:$CPLUS_INCLUDE_PATH

.github/workflows/rknn-linux-aarch64.yaml

Lines changed: 57 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
push:
55
branches:
66
- master
7-
- rknn-c-api-2
7+
- ci-rknn-bins
88
tags:
99
- 'v[0-9]+.[0-9]+.[0-9]+*'
1010
paths:
@@ -60,51 +60,65 @@ jobs:
6060
git clone --depth 1 https://github.com/airockchip/rknn-toolkit2
6161
6262
- name: Build sherpa-onnx
63-
shell: bash
64-
run: |
65-
export CMAKE_CXX_COMPILER_LAUNCHER=ccache
66-
export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"
67-
cmake --version
63+
uses: addnab/docker-run-action@v3
64+
with:
65+
image: quay.io/pypa/manylinux_2_28_aarch64
66+
# image: quay.io/pypa/manylinux2014_aarch64 # it does not provide GLIBCXX 3.4.21+
67+
options: |
68+
--volume ${{ github.workspace }}/:/k2-fsa/sherpa-onnx
69+
shell: bash
70+
run: |
71+
uname -a
72+
which gcc
6873
69-
echo "config: ${{ matrix.config }}"
70-
uname -a
71-
which gcc
74+
gcc --version
75+
g++ --version
7276
73-
gcc --version
74-
g++ --version
7577
76-
echo "pwd"
78+
cmake --version
7779
78-
ls -lh
7980
80-
git clone --depth 1 --branch v1.2.12 https://github.com/alsa-project/alsa-lib
81-
pushd alsa-lib
82-
./gitcompile
83-
popd
81+
cd /k2-fsa/sherpa-onnx/
8482
85-
export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2
86-
export SHERPA_ONNX_RKNN_TOOLKIT2_LIB_DIR=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64
87-
export CPLUS_INCLUDE_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/include:$CPLUS_INCLUDE_PATH
88-
export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH
89-
export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs
83+
echo "pwd"
84+
85+
ls -lh
86+
87+
git clone --depth 1 --branch v1.2.12 https://github.com/alsa-project/alsa-lib
88+
pushd alsa-lib
89+
./gitcompile
90+
popd
91+
92+
ls -lh $PWD/alsa-lib/src/.libs
9093
91-
mkdir build
92-
cd build
94+
strings $PWD/alsa-lib/src/.libs/libasound.so.2.0.0 | grep "^GLIBC"
9395
94-
BUILD_SHARED_LIBS=${{ matrix.shared }}
96+
export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH
97+
export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs
9598
96-
cmake \
97-
-DBUILD_SHARED_LIBS=ON \
98-
-DCMAKE_INSTALL_PREFIX=./install \
99-
-DSHERPA_ONNX_ENABLE_RKNN=ON \
100-
-DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
101-
..
99+
export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2
100+
export SHERPA_ONNX_RKNN_TOOLKIT2_LIB_DIR=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64
101+
export CPLUS_INCLUDE_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/include:$CPLUS_INCLUDE_PATH
102102
103-
make -j4 install
103+
export SHERPA_ONNX_ENABLE_ALSA=1
104104
105-
rm -rf install/lib/pkgconfig
106-
rm -fv install/lib/cargs.h
107-
rm -fv install/lib/libcargs.so
105+
mkdir build
106+
cd build
107+
108+
BUILD_SHARED_LIBS=${{ matrix.shared }}
109+
110+
cmake \
111+
-DBUILD_SHARED_LIBS=ON \
112+
-DCMAKE_INSTALL_PREFIX=./install \
113+
-DSHERPA_ONNX_ENABLE_RKNN=ON \
114+
-DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \
115+
..
116+
117+
make -j4 install
118+
119+
rm -rf install/lib/pkgconfig
120+
rm -fv install/lib/cargs.h
121+
rm -fv install/lib/libcargs.so
108122
109123
- name: Display system info
110124
shell: bash
@@ -135,6 +149,9 @@ jobs:
135149
136150
./bin/sherpa-onnx --help
137151
152+
echo "---"
153+
strings bin/sherpa-onnx | grep "^GLIBC"
154+
138155
- name: Copy files
139156
shell: bash
140157
run: |
@@ -227,13 +244,17 @@ jobs:
227244
file: sherpa-onnx-*linux-aarch64*.tar.bz2
228245
repo_name: k2-fsa/sherpa-onnx
229246
repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
230-
tag: v1.10.45
247+
tag: v1.12.0
231248

232249
- name: Test offline Moonshine
233250
if: matrix.build_type != 'Debug'
234251
shell: bash
235252
run: |
236253
du -h -d1 .
254+
255+
export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2
256+
export LD_LIBRARY_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64:$LD_LIBRARY_PATH
257+
237258
export PATH=$PWD/build/install/bin:$PATH
238259
export EXE=sherpa-onnx-offline
239260

0 commit comments

Comments
 (0)