diff --git a/.github/workflows/run-java-test.yaml b/.github/workflows/run-java-test.yaml index b70421f16..f9c95379b 100644 --- a/.github/workflows/run-java-test.yaml +++ b/.github/workflows/run-java-test.yaml @@ -21,6 +21,7 @@ on: - 'java-api-examples/**' - 'sherpa-onnx/csrc/*' - 'sherpa-onnx/jni/*' + workflow_dispatch: concurrency: group: run-java-test-${{ github.ref }} diff --git a/.github/workflows/run-python-test.yaml b/.github/workflows/run-python-test.yaml index e395c0210..4fc26ad7b 100644 --- a/.github/workflows/run-python-test.yaml +++ b/.github/workflows/run-python-test.yaml @@ -19,6 +19,7 @@ on: - 'CMakeLists.txt' - 'cmake/**' - 'sherpa-onnx/csrc/*' + workflow_dispatch: concurrency: group: run-python-test-${{ github.ref }} diff --git a/.github/workflows/style_check.yaml b/.github/workflows/style_check.yaml index dc0f775f1..5b996e75e 100644 --- a/.github/workflows/style_check.yaml +++ b/.github/workflows/style_check.yaml @@ -29,6 +29,7 @@ on: paths: - '.github/workflows/style_check.yaml' - 'sherpa-onnx/**' + workflow_dispatch: concurrency: group: style_check-${{ github.ref }} diff --git a/.github/workflows/test-pip-install.yaml b/.github/workflows/test-pip-install.yaml index 01fdb4c66..e9e8005ff 100644 --- a/.github/workflows/test-pip-install.yaml +++ b/.github/workflows/test-pip-install.yaml @@ -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 }} @@ -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 @@ -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 diff --git a/.github/workflows/test-python-offline-websocket-server.yaml b/.github/workflows/test-python-offline-websocket-server.yaml index d48d5763d..b000b331f 100644 --- a/.github/workflows/test-python-offline-websocket-server.yaml +++ b/.github/workflows/test-python-offline-websocket-server.yaml @@ -7,6 +7,7 @@ on: pull_request: branches: - master + workflow_dispatch: concurrency: group: python-offline-websocket-server-${{ github.ref }} diff --git a/.github/workflows/test-python-online-websocket-server.yaml b/.github/workflows/test-python-online-websocket-server.yaml index 428440edc..5d648899b 100644 --- a/.github/workflows/test-python-online-websocket-server.yaml +++ b/.github/workflows/test-python-online-websocket-server.yaml @@ -7,6 +7,7 @@ on: pull_request: branches: - master + workflow_dispatch: concurrency: group: python-online-websocket-server-${{ github.ref }} diff --git a/sherpa-onnx/c-api/c-api.h b/sherpa-onnx/c-api/c-api.h index b4b5780a9..05b79a806 100644 --- a/sherpa-onnx/c-api/c-api.h +++ b/sherpa-onnx/c-api/c-api.h @@ -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) @@ -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 @@ -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 diff --git a/sherpa-onnx/csrc/offline-tts-vits-impl.h b/sherpa-onnx/csrc/offline-tts-vits-impl.h index b553ebe4a..af1a001eb 100644 --- a/sherpa-onnx/csrc/offline-tts-vits-impl.h +++ b/sherpa-onnx/csrc/offline-tts-vits-impl.h @@ -30,7 +30,7 @@ class OfflineTtsVitsImpl : public OfflineTtsImpl { SHERPA_ONNX_LOGE( "This is a single-speaker model and supports only sid 0. Given sid: " "%d", - sid); + static_cast(sid)); return {}; } @@ -38,7 +38,7 @@ class OfflineTtsVitsImpl : public OfflineTtsImpl { 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(sid)); return {}; }