From aecc39418dd6ab5e2d52b9a60e5fb9d836fd5c29 Mon Sep 17 00:00:00 2001 From: Fangjun Kuang Date: Mon, 22 Sep 2025 16:52:55 +0800 Subject: [PATCH] Fix building wheels (#2619) --- .github/workflows/build-wheels-aarch64-cuda.yaml | 7 +++++-- .github/workflows/build-wheels-aarch64-rknn.yaml | 2 ++ .github/workflows/build-wheels-linux-cuda.yaml | 2 +- build-aarch64-linux-gnu.sh | 2 ++ build-rknn-linux-aarch64.sh | 2 ++ cxx-api-examples/CMakeLists.txt | 2 -- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-wheels-aarch64-cuda.yaml b/.github/workflows/build-wheels-aarch64-cuda.yaml index a876f63a..3125744b 100644 --- a/.github/workflows/build-wheels-aarch64-cuda.yaml +++ b/.github/workflows/build-wheels-aarch64-cuda.yaml @@ -22,7 +22,8 @@ jobs: matrix: os: [ubuntu-22.04-arm] python-version: ["cp38", "cp39", "cp310", "cp311", "cp312", "cp313"] - manylinux: [manylinux2014] #, manylinux_2_28] + # manylinux: [manylinux2014] #, manylinux_2_28] + manylinux: [manylinux_2_28] #, manylinux_2_28] steps: - uses: actions/checkout@v4 @@ -50,7 +51,7 @@ jobs: CPLUS_INCLUDE_PATH=/project/alsa-lib/include:$CPLUS_INCLUDE_PATH C_INCLUDE_PATH=/project/alsa-lib/include:$C_INCLUDE_PATH SHERPA_ONNX_ALSA_LIB_DIR=/project/alsa-lib/src/.libs - LD_LIBRARY_PATH=/project/build/bdist.linux-x86_64/wheel/sherpa_onnx/lib:$SHERPA_ONNX_ALSA_LIB_DIR + LD_LIBRARY_PATH=/project/build/bdist.linux-x86_64/wheel/sherpa_onnx/lib:$SHERPA_ONNX_ALSA_LIB_DIR:$LD_LIBRARY_PATH SHERPA_ONNX_MAKE_ARGS="VERBOSE=1" SHERPA_ONNX_ENABLE_ALSA=1 SHERPA_ONNX_ENABLE_GPU=ON @@ -60,6 +61,8 @@ jobs: CIBW_BUILD_VERBOSITY: 3 CIBW_ARCHS_LINUX: aarch64 CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/${{ matrix.manylinux }}_aarch64 + # Don't repair Linux wheels + CIBW_REPAIR_WHEEL_COMMAND_LINUX: "" # From onnxruntime >= 1.17.0, it drops support for CentOS 7.0 and it supports only manylinux_2_28. # manylinux_2_24 is no longer supported diff --git a/.github/workflows/build-wheels-aarch64-rknn.yaml b/.github/workflows/build-wheels-aarch64-rknn.yaml index 47d8acca..e445efcf 100644 --- a/.github/workflows/build-wheels-aarch64-rknn.yaml +++ b/.github/workflows/build-wheels-aarch64-rknn.yaml @@ -118,6 +118,8 @@ jobs: export SHERPA_ONNX_ENABLE_ALSA=1 + p=$PWD + export SHERPA_ONNX_CMAKE_ARGS="-DSHERPA_ONNX_ENABLE_RKNN=ON -DALSA_INCLUDE_DIR=$p/alsa-lib/include -DALSA_LIBRARY=$p/alsa-lib/src/.libs/libasound.so" python3 setup.py bdist_wheel diff --git a/.github/workflows/build-wheels-linux-cuda.yaml b/.github/workflows/build-wheels-linux-cuda.yaml index f74f7e14..3e360466 100644 --- a/.github/workflows/build-wheels-linux-cuda.yaml +++ b/.github/workflows/build-wheels-linux-cuda.yaml @@ -71,7 +71,7 @@ jobs: export SHERPA_ONNX_MAKE_ARGS="VERBOSE=1" export SHERPA_ONNX_ENABLE_ALSA=1 - export SHERPA_ONNX_CMAKE_ARGS="-DSHERPA_ONNX_ENABLE_GPU=ON -DALSA_INCLUDE_DIR=$p/alsa-lib/include -DALSA_LIBRARY=$p/alsa-lib/src/.libs/libasound.so" + export SHERPA_ONNX_CMAKE_ARGS="-DSHERPA_ONNX_ENABLE_GPU=ON" onnxruntime_version=${{ matrix.onnxruntime_version }} if [[ $onnxruntime_version == "1.22.0" ]]; then diff --git a/build-aarch64-linux-gnu.sh b/build-aarch64-linux-gnu.sh index 7cd9aac1..23311925 100755 --- a/build-aarch64-linux-gnu.sh +++ b/build-aarch64-linux-gnu.sh @@ -96,6 +96,8 @@ if [[ x"$SHERPA_ONNX_LINUX_ARM64_GPU_ONNXRUNTIME_VERSION" == x"" ]]; then fi cmake \ + -DALSA_INCLUDE_DIR=$PWD/alsa-lib/include \ + -DALSA_LIBRARY=$PWD/alsa-lib/src/.libs/libasound.so \ -DBUILD_PIPER_PHONMIZE_EXE=OFF \ -DBUILD_PIPER_PHONMIZE_TESTS=OFF \ -DBUILD_ESPEAK_NG_EXE=OFF \ diff --git a/build-rknn-linux-aarch64.sh b/build-rknn-linux-aarch64.sh index 01f37de8..d34a8aa5 100755 --- a/build-rknn-linux-aarch64.sh +++ b/build-rknn-linux-aarch64.sh @@ -72,6 +72,8 @@ if [[ x"$BUILD_SHARED_LIBS" == x"" ]]; then fi cmake \ + -DALSA_INCLUDE_DIR=$PWD/alsa-lib/include \ + -DALSA_LIBRARY=$PWD/alsa-lib/src/.libs/libasound.so \ -DBUILD_PIPER_PHONMIZE_EXE=OFF \ -DBUILD_PIPER_PHONMIZE_TESTS=OFF \ -DBUILD_ESPEAK_NG_EXE=OFF \ diff --git a/cxx-api-examples/CMakeLists.txt b/cxx-api-examples/CMakeLists.txt index 926627fb..93c10adc 100644 --- a/cxx-api-examples/CMakeLists.txt +++ b/cxx-api-examples/CMakeLists.txt @@ -102,7 +102,6 @@ if(SHERPA_ONNX_HAS_ALSA) ) target_link_libraries(sense-voice-simulate-streaming-alsa-cxx-api sherpa-onnx-cxx-api - portaudio_static ) add_executable(zipformer-ctc-simulate-streaming-alsa-cxx-api @@ -111,7 +110,6 @@ if(SHERPA_ONNX_HAS_ALSA) ) target_link_libraries(zipformer-ctc-simulate-streaming-alsa-cxx-api sherpa-onnx-cxx-api - portaudio_static ) if(DEFINED ENV{SHERPA_ONNX_ALSA_LIB_DIR})