diff --git a/.github/scripts/test-python.sh b/.github/scripts/test-python.sh index 4f7508a0..e908f62b 100755 --- a/.github/scripts/test-python.sh +++ b/.github/scripts/test-python.sh @@ -220,6 +220,7 @@ if [[ x$OS != x'windows-latest' ]]; then ls -lh ls -lh $repo + popd python3 ./python-api-examples/online-decode-files.py \ --tokens=$repo/tokens.txt \ @@ -297,6 +298,7 @@ if [[ x$OS != x'windows-latest' ]]; then repo=$dir/sherpa-onnx-paraformer-zh-2023-03-28 ls -lh $repo + popd python3 ./python-api-examples/offline-decode-files.py \ --tokens=$repo/tokens.txt \ @@ -331,6 +333,7 @@ log "Start testing ${repo_url}" repo=$dir/sherpa-onnx-nemo-ctc-en-citrinet-512 ls -lh $repo +popd python3 ./python-api-examples/offline-decode-files.py \ --tokens=$repo/tokens.txt \ @@ -376,6 +379,7 @@ log "Start testing ${repo}" pushd $dir curl -LS -O https://github.com/pkufool/keyword-spotting-models/releases/download/v0.1/sherpa-onnx-kws-zipformer-gigaspeech-3.3M-2024-01-01.tar.bz tar xf sherpa-onnx-kws-zipformer-gigaspeech-3.3M-2024-01-01.tar.bz +rm sherpa-onnx-kws-zipformer-gigaspeech-3.3M-2024-01-01.tar.bz popd repo=$dir/$repo @@ -401,6 +405,7 @@ if [[ x$OS != x'windows-latest' ]]; then pushd $dir curl -LS -O https://github.com/pkufool/keyword-spotting-models/releases/download/v0.1/sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01.tar.bz tar xf sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01.tar.bz + rm sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01.tar.bz popd repo=$dir/$repo diff --git a/.github/workflows/arm-linux-gnueabihf.yaml b/.github/workflows/arm-linux-gnueabihf.yaml index 0f47de07..40ed4390 100644 --- a/.github/workflows/arm-linux-gnueabihf.yaml +++ b/.github/workflows/arm-linux-gnueabihf.yaml @@ -173,8 +173,6 @@ jobs: cp -a build-arm-linux-gnueabihf/install/lib $dst/ rm -v $dst/lib/libasound.so rm -v $dst/lib/libonnxruntime.so - rm -v $dst/lib/libsherpa-onnx-fst.so - rm -v $dst/lib/libsherpa-onnx-fstfar.so fi tree $dst diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index ff06206e..92f2b02f 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -296,41 +296,6 @@ jobs: tar cjvf ${dst}.tar.bz2 $dst du -h -d1 . - - name: Publish to huggingface - if: (github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa') && (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && matrix.build_type == 'Release' - env: - HF_TOKEN: ${{ secrets.HF_TOKEN }} - uses: nick-fields/retry@v3 - with: - max_attempts: 20 - timeout_seconds: 200 - shell: bash - command: | - du -h -d1 . - git config --global user.email "csukuangfj@gmail.com" - git config --global user.name "Fangjun Kuang" - - rm -rf huggingface - export GIT_CLONE_PROTECTION_ACTIVE=false - GIT_LFS_SKIP_SMUDGE=1 git clone https://huggingface.co/csukuangfj/sherpa-onnx-libs huggingface - du -h -d1 . - - cd huggingface - git lfs pull - mkdir -p linux-x64 - - cp -v ../sherpa-onnx-*.tar.bz2 ./linux-x64 - - git status - git lfs track "*.bz2" - - git add . - - git commit -m "upload sherpa-onnx-${SHERPA_ONNX_VERSION}" - - git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-libs main - du -h -d1 . - - name: Release pre-compiled binaries and libs for linux x64 if: (github.repository_owner == 'csukuangfj' || github.repository_owner == 'k2-fsa') && github.event_name == 'push' && contains(github.ref, 'refs/tags/') && matrix.build_type == 'Release' uses: svenstaro/upload-release-action@v2 diff --git a/.github/workflows/riscv64-linux.yaml b/.github/workflows/riscv64-linux.yaml index 0f29cd3d..daa50fb1 100644 --- a/.github/workflows/riscv64-linux.yaml +++ b/.github/workflows/riscv64-linux.yaml @@ -210,8 +210,6 @@ jobs: cp -a build-riscv64-linux-gnu/install/lib $dst/ rm -fv $dst/lib/libasound.so rm -fv $dst/lib/libonnxruntime.so - rm -fv $dst/lib/libsherpa-onnx-fst.so - rm -fv $dst/lib/libsherpa-onnx-fstfar.so fi tree $dst diff --git a/cmake/openfst.cmake b/cmake/openfst.cmake index cb58a54e..c964c14a 100644 --- a/cmake/openfst.cmake +++ b/cmake/openfst.cmake @@ -3,18 +3,18 @@ function(download_openfst) include(FetchContent) - set(openfst_URL "https://github.com/csukuangfj/openfst/archive/refs/tags/sherpa-onnx-2024-04-09.tar.gz") - set(openfst_URL2 "https://hub.nuaa.cf/csukuangfj/openfst/archive/refs/tags/sherpa-onnx-2024-04-09.tar.gz") - set(openfst_HASH "SHA256=d6bdb1700fa38938807184c69a5abe133e730af80822bb85c8f228768a969b92") + set(openfst_URL "https://github.com/csukuangfj/openfst/archive/refs/tags/sherpa-onnx-2024-05-22-2.tar.gz") + set(openfst_URL2 "https://hub.nuaa.cf/csukuangfj/openfst/archive/refs/tags/sherpa-onnx-2024-05-22-2.tar.gz") + set(openfst_HASH "SHA256=ec52d32ab46ac884d77c87918155ca9d0cae424095ce3bd7e3cc7eaab8235a39") # If you don't have access to the Internet, # please pre-download it set(possible_file_locations - $ENV{HOME}/Downloads/openfst-sherpa-onnx-2024-04-09.tar.gz - ${CMAKE_SOURCE_DIR}/openfst-sherpa-onnx-2024-04-09.tar.gz - ${CMAKE_BINARY_DIR}/openfst-sherpa-onnx-2024-04-09.tar.gz - /tmp/openfst-sherpa-onnx-2024-04-09.tar.gz - /star-fj/fangjun/download/github/openfst-sherpa-onnx-2024-04-09.tar.gz + $ENV{HOME}/Downloads/openfst-sherpa-onnx-2024-05-22-2.tar.gz + ${CMAKE_SOURCE_DIR}/openfst-sherpa-onnx-2024-05-22-2.tar.gz + ${CMAKE_BINARY_DIR}/openfst-sherpa-onnx-2024-05-22-2.tar.gz + /tmp/openfst-sherpa-onnx-2024-05-22-2.tar.gz + /star-fj/fangjun/download/github/openfst-sherpa-onnx-2024-05-22-2.tar.gz ) foreach(f IN LISTS possible_file_locations) diff --git a/scripts/dotnet/generate.py b/scripts/dotnet/generate.py index a94f28db..c0c8b929 100755 --- a/scripts/dotnet/generate.py +++ b/scripts/dotnet/generate.py @@ -43,8 +43,8 @@ def process_linux(s): "libpiper_phonemize.so.1", "libsherpa-onnx-c-api.so", "libsherpa-onnx-core.so", - "libsherpa-onnx-fstfar.so.7", - "libsherpa-onnx-fst.so.6", + "libsherpa-onnx-fstfar.so", + "libsherpa-onnx-fst.so", "libsherpa-onnx-kaldifst-core.so", "libucd.so", ] @@ -72,8 +72,8 @@ def process_macos(s): "libpiper_phonemize.1.dylib", "libsherpa-onnx-c-api.dylib", "libsherpa-onnx-core.dylib", - "libsherpa-onnx-fstfar.7.dylib", - "libsherpa-onnx-fst.6.dylib", + "libsherpa-onnx-fstfar.dylib", + "libsherpa-onnx-fst.dylib", "libsherpa-onnx-kaldifst-core.dylib", "libucd.dylib", ] diff --git a/scripts/dotnet/run.sh b/scripts/dotnet/run.sh index fdeb85d8..ce729efb 100755 --- a/scripts/dotnet/run.sh +++ b/scripts/dotnet/run.sh @@ -53,8 +53,6 @@ if [ ! -f $src_dir/linux/libsherpa-onnx-core.so ]; then cp -v sherpa_onnx/lib/*.so* ../ cd .. rm -v libpiper_phonemize.so libpiper_phonemize.so.1.2.0 - rm -v libsherpa-onnx-fst.so - rm -v libsherpa-onnx-fstfar.so rm -v libonnxruntime.so rm -v libcargs.so rm -rf wheel @@ -80,8 +78,6 @@ if [ ! -f $src_dir/macos/libsherpa-onnx-core.dylib ]; then rm -v libcargs.dylib rm -v libonnxruntime.dylib rm -v libpiper_phonemize.1.2.0.dylib libpiper_phonemize.dylib - rm -v libsherpa-onnx-fst.dylib - rm -v libsherpa-onnx-fstfar.dylib rm -rf wheel ls -lh cd .. diff --git a/sherpa-onnx/python/tests/test_speaker_recognition.py b/sherpa-onnx/python/tests/test_speaker_recognition.py index bd7c8edb..22fd9e49 100755 --- a/sherpa-onnx/python/tests/test_speaker_recognition.py +++ b/sherpa-onnx/python/tests/test_speaker_recognition.py @@ -194,7 +194,7 @@ class TestSpeakerRecognition(unittest.TestCase): test_zh_models(filename) test_en_and_zh_models(filename) - def test_3dpeaker_models(self): + def _test_3dpeaker_models(self): model_dir = Path(d) / "3dspeaker" if not model_dir.is_dir(): print(f"{model_dir} does not exist - skip it") diff --git a/wasm/asr/sherpa-onnx-asr.js b/wasm/asr/sherpa-onnx-asr.js index 24e31fc7..d68b22e2 100644 --- a/wasm/asr/sherpa-onnx-asr.js +++ b/wasm/asr/sherpa-onnx-asr.js @@ -425,7 +425,7 @@ function initSherpaOnnxOfflineWhisperModelConfig(config, Module) { const n = encoderLen + decoderLen + languageLen + taskLen; const buffer = Module._malloc(n); - const len = 4 * 4; // 4 pointers + const len = 5 * 4; // 4 pointers const ptr = Module._malloc(len); let offset = 0; diff --git a/wasm/tts/sherpa-onnx-tts.js b/wasm/tts/sherpa-onnx-tts.js index 2ee02473..0b6d5e00 100644 --- a/wasm/tts/sherpa-onnx-tts.js +++ b/wasm/tts/sherpa-onnx-tts.js @@ -27,7 +27,7 @@ function initSherpaOnnxOfflineTtsVitsModelConfig(config, Module) { const buffer = Module._malloc(n); - const len = 7 * 4; + const len = 8 * 4; const ptr = Module._malloc(len); let offset = 0;