xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
c093880d 1 parent 734bbd91

Fix building wheels (#620)

内嵌 并排对比
正在显示 9 个修改的文件 包含 32 行增加 和 20 行删除
@@ -36,7 +36,7 @@ jobs: @@ -36,7 +36,7 @@ jobs:
36 # see https://cibuildwheel.readthedocs.io/en/stable/changelog/ 36 # see https://cibuildwheel.readthedocs.io/en/stable/changelog/
37 # for a list of versions 37 # for a list of versions
38 - name: Build wheels 38 - name: Build wheels
39 - uses: pypa/cibuildwheel@v2.15.0 39 + uses: pypa/cibuildwheel@v2.16.5
40 env: 40 env:
41 CIBW_BEFORE_ALL: | 41 CIBW_BEFORE_ALL: |
42 git clone --depth 1 https://github.com/alsa-project/alsa-lib 42 git clone --depth 1 https://github.com/alsa-project/alsa-lib
@@ -51,6 +51,9 @@ jobs: @@ -51,6 +51,9 @@ jobs:
51 CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686" 51 CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686"
52 CIBW_BUILD_VERBOSITY: 3 52 CIBW_BUILD_VERBOSITY: 3
53 CIBW_ARCHS_LINUX: aarch64 53 CIBW_ARCHS_LINUX: aarch64
  54 + CIBW_MANYLINUX_AARCH64_IMAGE: quay.io/pypa/manylinux_2_28_aarch64
  55 + # From onnxruntime >= 1.17.0, it drops support for CentOS 7.0 and it supports only manylinux_2_28.
  56 + # manylinux_2_24 is no longer supported
54 57
55 - name: Display wheels 58 - name: Display wheels
56 shell: bash 59 shell: bash
@@ -90,6 +93,7 @@ jobs: @@ -90,6 +93,7 @@ jobs:
90 93
91 - uses: actions/upload-artifact@v4 94 - uses: actions/upload-artifact@v4
92 with: 95 with:
  96 + name: wheel-${{ matrix.python-version }}
93 path: ./wheelhouse/*.whl 97 path: ./wheelhouse/*.whl
94 98
95 - name: Publish wheels to PyPI 99 - name: Publish wheels to PyPI
@@ -31,7 +31,7 @@ jobs: @@ -31,7 +31,7 @@ jobs:
31 # see https://cibuildwheel.readthedocs.io/en/stable/changelog/ 31 # see https://cibuildwheel.readthedocs.io/en/stable/changelog/
32 # for a list of versions 32 # for a list of versions
33 - name: Build wheels 33 - name: Build wheels
34 - uses: pypa/cibuildwheel@v2.15.0 34 + uses: pypa/cibuildwheel@v2.16.5
35 env: 35 env:
36 CIBW_BEFORE_ALL: | 36 CIBW_BEFORE_ALL: |
37 git clone --depth 1 https://github.com/alsa-project/alsa-lib 37 git clone --depth 1 https://github.com/alsa-project/alsa-lib
@@ -46,6 +46,9 @@ jobs: @@ -46,6 +46,9 @@ jobs:
46 CIBW_BUILD: "${{ matrix.python-version}}-* " 46 CIBW_BUILD: "${{ matrix.python-version}}-* "
47 CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686" 47 CIBW_SKIP: "cp27-* cp35-* cp36-* *-win32 pp* *-musllinux* *-manylinux_i686"
48 CIBW_BUILD_VERBOSITY: 3 48 CIBW_BUILD_VERBOSITY: 3
  49 + CIBW_MANYLINUX_X86_64_IMAGE: quay.io/pypa/manylinux_2_28_x86_64
  50 + # From onnxruntime >= 1.17.0, it drops support for CentOS 7.0 and it supports only manylinux_2_28.
  51 + # manylinux_2_24 is no longer supported
49 52
50 - name: Display wheels 53 - name: Display wheels
51 shell: bash 54 shell: bash
@@ -73,6 +76,7 @@ jobs: @@ -73,6 +76,7 @@ jobs:
73 76
74 - uses: actions/upload-artifact@v4 77 - uses: actions/upload-artifact@v4
75 with: 78 with:
  79 + name: wheel-${{ matrix.python-version }}
76 path: ./wheelhouse/*.whl 80 path: ./wheelhouse/*.whl
77 81
78 - name: Publish to huggingface 82 - name: Publish to huggingface
@@ -62,6 +62,7 @@ jobs: @@ -62,6 +62,7 @@ jobs:
62 62
63 - uses: actions/upload-artifact@v4 63 - uses: actions/upload-artifact@v4
64 with: 64 with:
  65 + name: wheel-${{ matrix.python-version }}
65 path: ./wheelhouse/*.whl 66 path: ./wheelhouse/*.whl
66 67
67 - name: Publish to huggingface 68 - name: Publish to huggingface
@@ -62,6 +62,7 @@ jobs: @@ -62,6 +62,7 @@ jobs:
62 62
63 - uses: actions/upload-artifact@v4 63 - uses: actions/upload-artifact@v4
64 with: 64 with:
  65 + name: wheel-${{ matrix.python-version }}
65 path: ./wheelhouse/*.whl 66 path: ./wheelhouse/*.whl
66 67
67 - name: Publish to huggingface 68 - name: Publish to huggingface
@@ -31,7 +31,7 @@ jobs: @@ -31,7 +31,7 @@ jobs:
31 # see https://cibuildwheel.readthedocs.io/en/stable/changelog/ 31 # see https://cibuildwheel.readthedocs.io/en/stable/changelog/
32 # for a list of versions 32 # for a list of versions
33 - name: Build wheels 33 - name: Build wheels
34 - uses: pypa/cibuildwheel@v2.15.0 34 + uses: pypa/cibuildwheel@v2.16.5
35 env: 35 env:
36 CIBW_ENVIRONMENT: SHERPA_ONNX_CMAKE_ARGS="-A Win32" 36 CIBW_ENVIRONMENT: SHERPA_ONNX_CMAKE_ARGS="-A Win32"
37 CIBW_BUILD: "${{ matrix.python-version}}-* " 37 CIBW_BUILD: "${{ matrix.python-version}}-* "
@@ -47,6 +47,7 @@ jobs: @@ -47,6 +47,7 @@ jobs:
47 47
48 - uses: actions/upload-artifact@v4 48 - uses: actions/upload-artifact@v4
49 with: 49 with:
  50 + name: wheel-${{ matrix.python-version }}
50 path: ./wheelhouse/*.whl 51 path: ./wheelhouse/*.whl
51 52
52 - name: Publish to huggingface 53 - name: Publish to huggingface
@@ -31,7 +31,7 @@ jobs: @@ -31,7 +31,7 @@ jobs:
31 # see https://cibuildwheel.readthedocs.io/en/stable/changelog/ 31 # see https://cibuildwheel.readthedocs.io/en/stable/changelog/
32 # for a list of versions 32 # for a list of versions
33 - name: Build wheels 33 - name: Build wheels
34 - uses: pypa/cibuildwheel@v2.15.0 34 + uses: pypa/cibuildwheel@v2.16.5
35 env: 35 env:
36 CIBW_BUILD: "${{ matrix.python-version}}-* " 36 CIBW_BUILD: "${{ matrix.python-version}}-* "
37 CIBW_SKIP: "cp27-* cp35-* *-win32 pp* *-musllinux*" 37 CIBW_SKIP: "cp27-* cp35-* *-win32 pp* *-musllinux*"
@@ -46,6 +46,7 @@ jobs: @@ -46,6 +46,7 @@ jobs:
46 46
47 - uses: actions/upload-artifact@v4 47 - uses: actions/upload-artifact@v4
48 with: 48 with:
  49 + name: wheel-${{ matrix.python-version }}
49 path: ./wheelhouse/*.whl 50 path: ./wheelhouse/*.whl
50 51
51 - name: Publish to huggingface 52 - name: Publish to huggingface
@@ -18,8 +18,8 @@ mkdir -p linux macos windows @@ -18,8 +18,8 @@ mkdir -p linux macos windows
18 # You can pre-download the required wheels to /tmp 18 # You can pre-download the required wheels to /tmp
19 src_dir=/tmp 19 src_dir=/tmp
20 20
21 -linux_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl  
22 -macos_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl 21 +linux_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl
  22 +macos_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl
23 windows_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-win_amd64.whl 23 windows_wheel=$src_dir/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-win_amd64.whl
24 24
25 if [ ! -f /tmp/linux/libsherpa-onnx-core.so ]; then 25 if [ ! -f /tmp/linux/libsherpa-onnx-core.so ]; then
@@ -30,9 +30,9 @@ if [ ! -f /tmp/linux/libsherpa-onnx-core.so ]; then @@ -30,9 +30,9 @@ if [ ! -f /tmp/linux/libsherpa-onnx-core.so ]; then
30 if [ -f $linux_wheel ]; then 30 if [ -f $linux_wheel ]; then
31 cp -v $linux_wheel . 31 cp -v $linux_wheel .
32 else 32 else
33 - 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 33 + curl -OL https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl
34 fi 34 fi
35 - unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl 35 + unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl
36 cp -v sherpa_onnx/lib/*.so* ../ 36 cp -v sherpa_onnx/lib/*.so* ../
37 cd .. 37 cd ..
38 rm -v libpiper_phonemize.so libpiper_phonemize.so.1.2.0 38 rm -v libpiper_phonemize.so libpiper_phonemize.so.1.2.0
@@ -52,9 +52,9 @@ if [ ! -f /tmp/macos/libsherpa-onnx-core.dylib ]; then @@ -52,9 +52,9 @@ if [ ! -f /tmp/macos/libsherpa-onnx-core.dylib ]; then
52 if [ -f $macos_wheel ]; then 52 if [ -f $macos_wheel ]; then
53 cp -v $macos_wheel . 53 cp -v $macos_wheel .
54 else 54 else
55 - curl -OL https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl 55 + curl -OL https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl
56 fi 56 fi
57 - unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl 57 + unzip sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl
58 cp -v sherpa_onnx/lib/*.dylib ../ 58 cp -v sherpa_onnx/lib/*.dylib ../
59 59
60 cd .. 60 cd ..
@@ -24,8 +24,8 @@ function linux() { @@ -24,8 +24,8 @@ function linux() {
24 dst=$(realpath sherpa-onnx-go-linux/lib/x86_64-unknown-linux-gnu) 24 dst=$(realpath sherpa-onnx-go-linux/lib/x86_64-unknown-linux-gnu)
25 mkdir t 25 mkdir t
26 cd t 26 cd t
27 - 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  
28 - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl 27 + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl
  28 + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl
29 29
30 cp -v sherpa_onnx/lib/*.so* $dst 30 cp -v sherpa_onnx/lib/*.so* $dst
31 31
@@ -36,8 +36,8 @@ function linux() { @@ -36,8 +36,8 @@ function linux() {
36 dst=$(realpath sherpa-onnx-go-linux/lib/aarch64-unknown-linux-gnu) 36 dst=$(realpath sherpa-onnx-go-linux/lib/aarch64-unknown-linux-gnu)
37 mkdir t 37 mkdir t
38 cd t 38 cd t
39 - 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  
40 - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl 39 + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_aarch64.whl
  40 + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_aarch64.whl
41 41
42 cp -v sherpa_onnx/lib/*.so* $dst 42 cp -v sherpa_onnx/lib/*.so* $dst
43 43
@@ -79,8 +79,8 @@ function osx() { @@ -79,8 +79,8 @@ function osx() {
79 79
80 mkdir t 80 mkdir t
81 cd t 81 cd t
82 - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl  
83 - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl 82 + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl
  83 + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl
84 84
85 cp -v sherpa_onnx/lib/*.dylib $dst/ 85 cp -v sherpa_onnx/lib/*.dylib $dst/
86 86
@@ -56,8 +56,8 @@ function linux_x64() { @@ -56,8 +56,8 @@ function linux_x64() {
56 dst=$(realpath lib/linux-x64) 56 dst=$(realpath lib/linux-x64)
57 mkdir t 57 mkdir t
58 cd t 58 cd t
59 - 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  
60 - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl 59 + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl
  60 + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-manylinux_2_28_x86_64.whl
61 61
62 cp -v sherpa_onnx/lib/*.so* $dst 62 cp -v sherpa_onnx/lib/*.so* $dst
63 rm -v $dst/libcargs.so 63 rm -v $dst/libcargs.so
@@ -75,8 +75,8 @@ function osx_x64() { @@ -75,8 +75,8 @@ function osx_x64() {
75 dst=$(realpath lib/osx-x64) 75 dst=$(realpath lib/osx-x64)
76 mkdir t 76 mkdir t
77 cd t 77 cd t
78 - wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl  
79 - unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_10_14_x86_64.whl 78 + wget -q https://huggingface.co/csukuangfj/sherpa-onnx-wheels/resolve/main/sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl
  79 + unzip ./sherpa_onnx-${SHERPA_ONNX_VERSION}-cp38-cp38-macosx_11_0_x86_64.whl
80 80
81 cp -v sherpa_onnx/lib/*.dylib $dst/ 81 cp -v sherpa_onnx/lib/*.dylib $dst/
82 rm -v $dst/libonnxruntime.dylib 82 rm -v $dst/libonnxruntime.dylib