diff --git a/.github/workflows/build-wheels-aarch64.yaml b/.github/workflows/build-wheels-aarch64.yaml index b76e2b57..cbd3a422 100644 --- a/.github/workflows/build-wheels-aarch64.yaml +++ b/.github/workflows/build-wheels-aarch64.yaml @@ -36,7 +36,7 @@ jobs: # see https://cibuildwheel.readthedocs.io/en/stable/changelog/ # for a list of versions - name: Build wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_BEFORE_ALL: | git clone --depth 1 https://github.com/alsa-project/alsa-lib @@ -51,6 +51,9 @@ jobs: CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686" CIBW_BUILD_VERBOSITY: 3 CIBW_ARCHS_LINUX: aarch64 + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64 + # 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 - name: Display wheels shell: bash @@ -90,6 +93,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: wheel-${{ matrix.python-version }} path: ./wheelhouse/*.whl - name: Publish wheels to PyPI diff --git a/.github/workflows/build-wheels-linux.yaml b/.github/workflows/build-wheels-linux.yaml index 382811d3..329beb37 100644 --- a/.github/workflows/build-wheels-linux.yaml +++ b/.github/workflows/build-wheels-linux.yaml @@ -31,7 +31,7 @@ jobs: # see https://cibuildwheel.readthedocs.io/en/stable/changelog/ # for a list of versions - name: Build wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_BEFORE_ALL: | git clone --depth 1 https://github.com/alsa-project/alsa-lib @@ -46,6 +46,9 @@ jobs: CIBW_BUILD: "${{ matrix.python-version}}-* " CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686" CIBW_BUILD_VERBOSITY: 3 + CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64 + # 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 - name: Display wheels shell: bash @@ -73,6 +76,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: wheel-${{ matrix.python-version }} path: ./wheelhouse/*.whl - name: Publish to huggingface diff --git a/.github/workflows/build-wheels-macos-arm64.yaml b/.github/workflows/build-wheels-macos-arm64.yaml index df6440be..cd1fdcc5 100644 --- a/.github/workflows/build-wheels-macos-arm64.yaml +++ b/.github/workflows/build-wheels-macos-arm64.yaml @@ -62,6 +62,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: wheel-${{ matrix.python-version }} path: ./wheelhouse/*.whl - name: Publish to huggingface diff --git a/.github/workflows/build-wheels-macos-x64.yaml b/.github/workflows/build-wheels-macos-x64.yaml index 911f2c61..162bf9f9 100644 --- a/.github/workflows/build-wheels-macos-x64.yaml +++ b/.github/workflows/build-wheels-macos-x64.yaml @@ -62,6 +62,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: wheel-${{ matrix.python-version }} path: ./wheelhouse/*.whl - name: Publish to huggingface diff --git a/.github/workflows/build-wheels-win32.yaml b/.github/workflows/build-wheels-win32.yaml index ffd43c2b..87905dc9 100644 --- a/.github/workflows/build-wheels-win32.yaml +++ b/.github/workflows/build-wheels-win32.yaml @@ -31,7 +31,7 @@ jobs: # see https://cibuildwheel.readthedocs.io/en/stable/changelog/ # for a list of versions - name: Build wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_ENVIRONMENT: SHERPA_ONNX_CMAKE_ARGS="-A Win32" CIBW_BUILD: "${{ matrix.python-version}}-* " @@ -47,6 +47,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: wheel-${{ matrix.python-version }} path: ./wheelhouse/*.whl - name: Publish to huggingface diff --git a/.github/workflows/build-wheels-win64.yaml b/.github/workflows/build-wheels-win64.yaml index f2572c01..bcaad229 100644 --- a/.github/workflows/build-wheels-win64.yaml +++ b/.github/workflows/build-wheels-win64.yaml @@ -31,7 +31,7 @@ jobs: # see https://cibuildwheel.readthedocs.io/en/stable/changelog/ # for a list of versions - name: Build wheels - uses: pypa/cibuildwheel@v2.15.0 + uses: pypa/cibuildwheel@v2.16.5 env: CIBW_BUILD: "${{ matrix.python-version}}-* " CIBW_SKIP: "cp27-* cp35-* *-win32 pp* *-musllinux*" @@ -46,6 +46,7 @@ jobs: - uses: actions/upload-artifact@v4 with: + name: wheel-${{ matrix.python-version }} path: ./wheelhouse/*.whl - name: Publish to huggingface diff --git a/scripts/dotnet/run.sh b/scripts/dotnet/run.sh index 5021d399..f469efe4 100755 --- a/scripts/dotnet/run.sh +++ b/scripts/dotnet/run.sh @@ -18,8 +18,8 @@ mkdir -p linux macos windows # You can pre-download the required wheels to /tmp src_dir=/tmp -linux_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl -macos_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl +linux_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl +macos_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl windows_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-win_amd64.whl if [ ! -f /tmp/linux/libsherpa-onnx-core.so ]; then @@ -30,9 +30,9 @@ if [ ! -f /tmp/linux/libsherpa-onnx-core.so ]; then if [ -f $linux_wheel ]; then cp -v $linux_wheel . else - curl -OL https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + curl -OL https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl fi - unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl cp -v sherpa_onnx/lib/*.so* ../ cd .. rm -v libpiper_phonemize.so libpiper_phonemize.so.1.2.0 @@ -52,9 +52,9 @@ if [ ! -f /tmp/macos/libsherpa-onnx-core.dylib ]; then if [ -f $macos_wheel ]; then cp -v $macos_wheel . else - curl -OL https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl + curl -OL https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl fi - unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl + unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl cp -v sherpa_onnx/lib/*.dylib ../ cd .. diff --git a/scripts/go/release.sh b/scripts/go/release.sh index 376849ad..8961868e 100755 --- a/scripts/go/release.sh +++ b/scripts/go/release.sh @@ -24,8 +24,8 @@ function linux() { dst=$(realpath sherpa-onnx-go-linux/lib/x86_64-unknown-linux-gnu) mkdir t cd t - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl cp -v sherpa_onnx/lib/*.so* $dst @@ -36,8 +36,8 @@ function linux() { dst=$(realpath sherpa-onnx-go-linux/lib/aarch64-unknown-linux-gnu) mkdir t cd t - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_aarch64.whl + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_aarch64.whl cp -v sherpa_onnx/lib/*.so* $dst @@ -79,8 +79,8 @@ function osx() { mkdir t cd t - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl cp -v sherpa_onnx/lib/*.dylib $dst/ diff --git a/scripts/nodejs/run.sh b/scripts/nodejs/run.sh index d8464b36..5ce3034d 100755 --- a/scripts/nodejs/run.sh +++ b/scripts/nodejs/run.sh @@ -56,8 +56,8 @@ function linux_x64() { dst=$(realpath lib/linux-x64) mkdir t cd t - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl cp -v sherpa_onnx/lib/*.so* $dst rm -v $dst/libcargs.so @@ -75,8 +75,8 @@ function osx_x64() { dst=$(realpath lib/osx-x64) mkdir t cd t - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl cp -v sherpa_onnx/lib/*.dylib $dst/ rm -v $dst/libonnxruntime.dylib