Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix CI for pip install #371

Merged
merged 14 commits into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/run-java-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ on:
- 'java-api-examples/**'
- 'sherpa-onnx/csrc/*'
- 'sherpa-onnx/jni/*'
workflow_dispatch:

concurrency:
group: run-java-test-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/run-python-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ on:
- 'CMakeLists.txt'
- 'cmake/**'
- 'sherpa-onnx/csrc/*'
workflow_dispatch:

concurrency:
group: run-python-test-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/style_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ on:
paths:
- '.github/workflows/style_check.yaml'
- 'sherpa-onnx/**'
workflow_dispatch:

concurrency:
group: style_check-${{ github.ref }}
Expand Down
21 changes: 20 additions & 1 deletion .github/workflows/test-pip-install.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ on:
# day of the week (0-6)
# nightly build at 23:50 UTC time every day
- cron: "50 23 * * *"
workflow_dispatch:

concurrency:
group: test-pip-install-${{ github.ref }}
Expand All @@ -29,9 +30,12 @@ jobs:
matrix:
os: [ubuntu-latest, windows-latest, macos-latest]
python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
exclude:
- os: macos-latest
python-version: "3.7"

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3
with:
fetch-depth: 0

Expand All @@ -51,8 +55,23 @@ jobs:
python3 -c "import sherpa_onnx; print(sherpa_onnx.__file__)"
python3 -c "import sherpa_onnx; print(sherpa_onnx.__version__)"

p=$(python3 -c "from pathlib import Path; import sys; print(Path(sys.executable).parent)")
echo $p
ls -lh $p
# ls -lh $p/bin
# export PATH=$p/bin:$PATH

# For windows
export PATH=/c/hostedtoolcache/windows/Python/3.7.9/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.8.10/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.9.13/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.10.11/x64/bin:$PATH
export PATH=/c/hostedtoolcache/windows/Python/3.11.6/x64/bin:$PATH


sherpa-onnx --help
sherpa-onnx-offline --help
sherpa-onnx-offline-tts --help

sherpa-onnx-microphone --help
sherpa-onnx-microphone-offline --help
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
branches:
- master
workflow_dispatch:

concurrency:
group: python-offline-websocket-server-${{ github.ref }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-python-online-websocket-server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ on:
pull_request:
branches:
- master
workflow_dispatch:

concurrency:
group: python-online-websocket-server-${{ github.ref }}
Expand Down
17 changes: 9 additions & 8 deletions sherpa-onnx/c-api/c-api.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ extern "C" {
// We will set SHERPA_ONNX_BUILD_SHARED_LIBS and SHERPA_ONNX_BUILD_MAIN_LIB in
// CMakeLists.txt

#if defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wattributes"
#endif

#if defined(_WIN32)
#if defined(SHERPA_ONNX_BUILD_SHARED_LIBS)
#define SHERPA_ONNX_EXPORT __declspec(dllexport)
Expand All @@ -31,15 +36,7 @@ extern "C" {
#define SHERPA_ONNX_IMPORT
#endif
#else // WIN32
#if __APPLE__
// it throws a warning on macOS when using
// __attribute__((visibility("default")))
//
// warning: 'visibility' attribute ignored [-Wignored-attributes]
#define SHERPA_ONNX_EXPORT
#else
#define SHERPA_ONNX_EXPORT __attribute__((visibility("default")))
#endif // __APPLE__

#define SHERPA_ONNX_IMPORT SHERPA_ONNX_EXPORT
#endif // WIN32
Expand Down Expand Up @@ -598,6 +595,10 @@ SHERPA_ONNX_API void SherpaOnnxDestroySpeechSegment(
SHERPA_ONNX_API void SherpaOnnxVoiceActivityDetectorReset(
SherpaOnnxVoiceActivityDetector *p);

#if defined(__GNUC__)
#pragma GCC diagnostic pop
#endif

#ifdef __cplusplus
} /* extern "C" */
#endif
Expand Down
4 changes: 2 additions & 2 deletions sherpa-onnx/csrc/offline-tts-vits-impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ class OfflineTtsVitsImpl : public OfflineTtsImpl {
SHERPA_ONNX_LOGE(
"This is a single-speaker model and supports only sid 0. Given sid: "
"%d",
sid);
static_cast<int32_t>(sid));
return {};
}

if (num_speakers != 0 && (sid >= num_speakers || sid < 0)) {
SHERPA_ONNX_LOGE(
"This model contains only %d speakers. sid should be in the range "
"[%d, %d]. Given: %d",
num_speakers, 0, num_speakers - 1, sid);
num_speakers, 0, num_speakers - 1, static_cast<int32_t>(sid));
return {};
}

Expand Down