diff --git a/.github/workflows/build-wheels-aarch64-rknn.yaml b/.github/workflows/build-wheels-aarch64-rknn.yaml index 14907f46..ab872e9b 100644 --- a/.github/workflows/build-wheels-aarch64-rknn.yaml +++ b/.github/workflows/build-wheels-aarch64-rknn.yaml @@ -100,7 +100,6 @@ jobs: export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs - export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2 export SHERPA_ONNX_RKNN_TOOLKIT2_LIB_DIR=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64 export CPLUS_INCLUDE_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/include:$CPLUS_INCLUDE_PATH diff --git a/.github/workflows/rknn-linux-aarch64.yaml b/.github/workflows/rknn-linux-aarch64.yaml index d413ddef..422212cf 100644 --- a/.github/workflows/rknn-linux-aarch64.yaml +++ b/.github/workflows/rknn-linux-aarch64.yaml @@ -4,7 +4,7 @@ on: push: branches: - master - - rknn-c-api-2 + - ci-rknn-bins tags: - 'v[0-9]+.[0-9]+.[0-9]+*' paths: @@ -60,51 +60,65 @@ jobs: git clone --depth 1 https://github.com/airockchip/rknn-toolkit2 - name: Build sherpa-onnx - shell: bash - run: | - export CMAKE_CXX_COMPILER_LAUNCHER=ccache - export PATH="/usr/lib/ccache:/usr/local/opt/ccache/libexec:$PATH" - cmake --version + uses: addnab/docker-run-action@v3 + with: + image: quay.io/pypa/manylinux_2_28_aarch64 + # image: quay.io/pypa/manylinux2014_aarch64 # it does not provide GLIBCXX 3.4.21+ + options: | + --volume ${{ github.workspace }}/:/k2-fsa/sherpa-onnx + shell: bash + run: | + uname -a + which gcc - echo "config: ${{ matrix.config }}" - uname -a - which gcc + gcc --version + g++ --version - gcc --version - g++ --version - echo "pwd" + cmake --version - ls -lh - git clone --depth 1 --branch v1.2.12 https://github.com/alsa-project/alsa-lib - pushd alsa-lib - ./gitcompile - popd + cd /k2-fsa/sherpa-onnx/ - export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2 - export SHERPA_ONNX_RKNN_TOOLKIT2_LIB_DIR=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64 - export CPLUS_INCLUDE_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/include:$CPLUS_INCLUDE_PATH - export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH - export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs + echo "pwd" - mkdir build - cd build + ls -lh - BUILD_SHARED_LIBS=${{ matrix.shared }} + git clone --depth 1 --branch v1.2.12 https://github.com/alsa-project/alsa-lib + pushd alsa-lib + ./gitcompile + popd - cmake \ - -DBUILD_SHARED_LIBS=ON \ - -DCMAKE_INSTALL_PREFIX=./install \ - -DSHERPA_ONNX_ENABLE_RKNN=ON \ - -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \ - .. + ls -lh $PWD/alsa-lib/src/.libs - make -j4 install + strings $PWD/alsa-lib/src/.libs/libasound.so.2.0.0 | grep "^GLIBC" - rm -rf install/lib/pkgconfig - rm -fv install/lib/cargs.h - rm -fv install/lib/libcargs.so + export CPLUS_INCLUDE_PATH=$PWD/alsa-lib/include:$CPLUS_INCLUDE_PATH + export SHERPA_ONNX_ALSA_LIB_DIR=$PWD/alsa-lib/src/.libs + + export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2 + export SHERPA_ONNX_RKNN_TOOLKIT2_LIB_DIR=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64 + export CPLUS_INCLUDE_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/include:$CPLUS_INCLUDE_PATH + + export SHERPA_ONNX_ENABLE_ALSA=1 + + mkdir build + cd build + + BUILD_SHARED_LIBS=${{ matrix.shared }} + + cmake \ + -DBUILD_SHARED_LIBS=ON \ + -DCMAKE_INSTALL_PREFIX=./install \ + -DSHERPA_ONNX_ENABLE_RKNN=ON \ + -DBUILD_SHARED_LIBS=$BUILD_SHARED_LIBS \ + .. + + make -j4 install + + rm -rf install/lib/pkgconfig + rm -fv install/lib/cargs.h + rm -fv install/lib/libcargs.so - name: Display system info shell: bash @@ -135,6 +149,9 @@ jobs: ./bin/sherpa-onnx --help + echo "---" + strings bin/sherpa-onnx | grep "^GLIBC" + - name: Copy files shell: bash run: | @@ -227,13 +244,17 @@ jobs: file: sherpa-onnx-*linux-aarch64*.tar.bz2 repo_name: k2-fsa/sherpa-onnx repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }} - tag: v1.10.45 + tag: v1.12.0 - name: Test offline Moonshine if: matrix.build_type != 'Debug' shell: bash run: | du -h -d1 . + + export SHERPA_ONNX_RKNN_TOOLKIT2_PATH=$PWD/rknn-toolkit2 + export LD_LIBRARY_PATH=$SHERPA_ONNX_RKNN_TOOLKIT2_PATH/rknpu2/runtime/Linux/librknn_api/aarch64:$LD_LIBRARY_PATH + export PATH=$PWD/build/install/bin:$PATH export EXE=sherpa-onnx-offline