Fangjun Kuang
Committed by GitHub

Fix publishing binaries for RKNN (#2234)

@@ -100,7 +100,6 @@ jobs: @@ -100,7 +100,6 @@ jobs:
100 export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH 100 export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH
101 export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs 101 export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs
102 102
103 -  
104 export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2 103 export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2
105 export SHERPA_ONNX_RKNN_TOOLKIT2_LIB_DIR=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64 104 export SHERPA_ONNX_RKNN_TOOLKIT2_LIB_DIR=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64
106 export CPLUS_INCLUDE_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/include:$CPLUS_INCLUDE_PATH 105 export CPLUS_INCLUDE_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/include:$CPLUS_INCLUDE_PATH
@@ -4,7 +4,7 @@ on: @@ -4,7 +4,7 @@ on:
4 push: 4 push:
5 branches: 5 branches:
6 - master 6 - master
7 - - rknn-c-api-2 7 + - ci-rknn-bins
8 tags: 8 tags:
9 - 'v[0-9]+.[0-9]+.[0-9]+*' 9 - 'v[0-9]+.[0-9]+.[0-9]+*'
10 paths: 10 paths:
@@ -60,19 +60,26 @@ jobs: @@ -60,19 +60,26 @@ jobs:
60 git clone --depth 1 https://github.com/airockchip/rknn-toolkit2 60 git clone --depth 1 https://github.com/airockchip/rknn-toolkit2
61 61
62 - name: Build sherpa-onnx 62 - name: Build sherpa-onnx
  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
63 shell: bash 69 shell: bash
64 run: | 70 run: |
65 - export CMAKE_CXX_COMPILER_LAUNCHER=ccache  
66 - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH"  
67 - cmake --version  
68 -  
69 - echo "config: ${{ matrix.config }}"  
70 uname -a 71 uname -a
71 which gcc 72 which gcc
72 73
73 gcc --version 74 gcc --version
74 g++ --version 75 g++ --version
75 76
  77 +
  78 + cmake --version
  79 +
  80 +
  81 + cd /k2-fsa/sherpa-onnx/
  82 +
76 echo "pwd" 83 echo "pwd"
77 84
78 ls -lh 85 ls -lh
@@ -82,11 +89,18 @@ jobs: @@ -82,11 +89,18 @@ jobs:
82 ./gitcompile 89 ./gitcompile
83 popd 90 popd
84 91
  92 + ls -lh $PWD/alsa-lib/src/.libs
  93 +
  94 + strings $PWD/alsa-lib/src/.libs/libasound.so.2.0.0 | grep "^GLIBC"
  95 +
  96 + export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH
  97 + export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs
  98 +
85 export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2 99 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 100 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 101 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 102 +
  103 + export SHERPA_ONNX_ENABLE_ALSA=1
90 104
91 mkdir build 105 mkdir build
92 cd build 106 cd build
@@ -135,6 +149,9 @@ jobs: @@ -135,6 +149,9 @@ jobs:
135 149
136 ./bin/sherpa-onnx --help 150 ./bin/sherpa-onnx --help
137 151
  152 + echo "---"
  153 + strings bin/sherpa-onnx | grep "^GLIBC"
  154 +
138 - name: Copy files 155 - name: Copy files
139 shell: bash 156 shell: bash
140 run: | 157 run: |
@@ -227,13 +244,17 @@ jobs: @@ -227,13 +244,17 @@ jobs:
227 file: sherpa-onnx-*linux-aarch64*.tar.bz2 244 file: sherpa-onnx-*linux-aarch64*.tar.bz2
228 repo_name: k2-fsa/sherpa-onnx 245 repo_name: k2-fsa/sherpa-onnx
229 repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }} 246 repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
230 - tag: v1.10.45 247 + tag: v1.12.0
231 248
232 - name: Test offline Moonshine 249 - name: Test offline Moonshine
233 if: matrix.build_type != 'Debug' 250 if: matrix.build_type != 'Debug'
234 shell: bash 251 shell: bash
235 run: | 252 run: |
236 du -h -d1 . 253 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 +
237 export PATH=$PWD/build/install/bin:$PATH 258 export PATH=$PWD/build/install/bin:$PATH
238 export EXE=sherpa-onnx-offline 259 export EXE=sherpa-onnx-offline
239 260