Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
xuning
/
sherpaonnx
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
Fangjun Kuang
2023-12-14 21:37:40 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Committed by
GitHub
2023-12-14 21:37:40 +0800
Commit
9ff6185b7cd967e0831cafa4cde77967f5b0b48c
9ff6185b
1 parent
b18812ce
fix building linux x86 wheels (#484)
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
43 行增加
和
9 行删除
.github/workflows/build-wheels-aarch64.yaml
.github/workflows/build-wheels-linux.yaml
cmake/cmake_extension.py
setup.py
.github/workflows/build-wheels-aarch64.yaml
查看文件 @
9ff6185
...
...
@@ -38,6 +38,15 @@ jobs:
-
name
:
Build wheels
uses
:
pypa/cibuildwheel@v2.15.0
env
:
CIBW_BEFORE_ALL
:
|
git clone --depth 1 https://github.com/alsa-project/alsa-lib
cd alsa-lib
./gitcompile
cd ..
echo "PWD"
ls -lh /project/alsa-lib/src/.libs
CIBW_ENVIRONMENT
:
CPLUS_INCLUDE_PATH=/project/alsa-lib/include:$CPLUS_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 SHERPA_ONNX_MAKE_ARGS="VERBOSE=1"
CIBW_BUILD
:
"
${{
matrix.python-version}}-*
"
CIBW_SKIP
:
"
cp27-*
cp35-*
cp36-*
*-win32
pp*
*-musllinux*
*-manylinux_i686"
CIBW_BUILD_VERBOSITY
:
3
...
...
.github/workflows/build-wheels-linux.yaml
查看文件 @
9ff6185
...
...
@@ -33,10 +33,19 @@ jobs:
-
name
:
Build wheels
uses
:
pypa/cibuildwheel@v2.15.0
env
:
CIBW_BEFORE_ALL
:
|
git clone --depth 1 https://github.com/alsa-project/alsa-lib
cd alsa-lib
./gitcompile
cd ..
echo "PWD"
ls -lh /project/alsa-lib/src/.libs
CIBW_ENVIRONMENT
:
CPLUS_INCLUDE_PATH=/project/alsa-lib/include:$CPLUS_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 SHERPA_ONNX_MAKE_ARGS="VERBOSE=1"
CIBW_BUILD
:
"
${{
matrix.python-version}}-*
"
CIBW_SKIP
:
"
cp27-*
cp35-*
cp36-*
*-win32
pp*
*-musllinux*
*-manylinux_i686"
CIBW_BUILD_VERBOSITY
:
3
CIBW_ENVIRONMENT_LINUX
:
LD_LIBRARY_PATH='/project/build/bdist.linux-x86_64/wheel/sherpa_onnx/lib'
-
name
:
Display wheels
shell
:
bash
...
...
cmake/cmake_extension.py
查看文件 @
9ff6185
...
...
@@ -26,6 +26,18 @@ def is_windows():
return
platform
.
system
()
==
"Windows"
def
is_linux
():
return
platform
.
system
()
==
"Linux"
def
is_arm64
():
return
platform
.
machine
()
in
[
"arm64"
,
"aarch64"
]
def
is_x86
():
return
platform
.
machine
()
in
[
"i386"
,
"i686"
,
"x86_64"
]
try
:
from
wheel.bdist_wheel
import
bdist_wheel
as
_bdist_wheel
...
...
@@ -144,8 +156,10 @@ class BuildExtension(build_ext):
binaries
+=
[
"sherpa-onnx-vad-microphone-offline-asr"
]
binaries
+=
[
"sherpa-onnx-offline-tts"
]
binaries
+=
[
"sherpa-onnx-offline-tts-play"
]
binaries
+=
[
"sherpa-onnx-alsa"
]
binaries
+=
[
"sherpa-onnx-offline-tts-play-alsa"
]
if
is_linux
()
and
(
is_arm64
()
or
is_x86
()):
binaries
+=
[
"sherpa-onnx-alsa"
]
binaries
+=
[
"sherpa-onnx-offline-tts-play-alsa"
]
if
is_windows
():
binaries
+=
[
"kaldi-native-fbank-core.dll"
]
...
...
@@ -168,10 +182,6 @@ class BuildExtension(build_ext):
if
not
src_file
.
is_file
():
src_file
=
install_dir
/
".."
/
(
f
+
suffix
)
if
not
src_file
.
is_file
()
and
'alsa'
in
f
:
print
(
f
'Skipping {f}'
)
continue
print
(
f
"Copying {src_file} to {out_bin_dir}/"
)
shutil
.
copy
(
f
"{src_file}"
,
f
"{out_bin_dir}/"
)
...
...
setup.py
查看文件 @
9ff6185
...
...
@@ -12,6 +12,9 @@ from cmake.cmake_extension import (
bdist_wheel
,
cmake_extension
,
is_windows
,
is_linux
,
is_arm64
,
is_x86
,
)
...
...
@@ -60,8 +63,11 @@ def get_binaries_to_install():
binaries
+=
[
"sherpa-onnx-vad-microphone-offline-asr"
]
binaries
+=
[
"sherpa-onnx-offline-tts"
]
binaries
+=
[
"sherpa-onnx-offline-tts-play"
]
binaries
+=
[
"sherpa-onnx-alsa"
]
binaries
+=
[
"sherpa-onnx-offline-tts-play-alsa"
]
if
is_linux
()
and
(
is_arm64
()
or
is_x86
()):
binaries
+=
[
"sherpa-onnx-alsa"
]
binaries
+=
[
"sherpa-onnx-offline-tts-play-alsa"
]
if
is_windows
():
binaries
+=
[
"kaldi-native-fbank-core.dll"
]
binaries
+=
[
"sherpa-onnx-c-api.dll"
]
...
...
请
注册
或
登录
后发表评论