Merge branch 'master' of github.com:k2-fsa/sherpa-onnx into HEAD

k2-fsa · Feb 13, 2025 · 680c679 · 680c679
2 parents 1be61a3 + 3825cf3
commit 680c679
Show file tree

Hide file tree

Showing 233 changed files with 6,435 additions and 1,154 deletions.
diff --git a/.github/scripts/test-dart.sh b/.github/scripts/test-dart.sh
@@ -7,6 +7,7 @@ cd dart-api-examples
 pushd tts
 
 echo '----------matcha tts----------'
+./run-kokoro-zh-en.sh
 ./run-kokoro-en.sh
 ./run-matcha-zh.sh
 ./run-matcha-en.sh

diff --git a/.github/scripts/test-dot-net.sh b/.github/scripts/test-dot-net.sh
@@ -3,7 +3,7 @@
 cd dotnet-examples/
 
 cd ./kokoro-tts
-./run-kokoro-en.sh
+./run-kokoro.sh
 ls -lh
 
 cd ../offline-tts

diff --git a/.github/scripts/test-nodejs-addon-npm.sh b/.github/scripts/test-nodejs-addon-npm.sh
@@ -85,12 +85,21 @@ fi
 
 echo "----------tts----------"
 
+curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/kokoro-multi-lang-v1_0.tar.bz2
+tar xf kokoro-multi-lang-v1_0.tar.bz2
+rm kokoro-multi-lang-v1_0.tar.bz2
+
+node ./test_tts_non_streaming_kokoro_zh_en.js
+ls -lh *.wav
+rm -rf kokoro-multi-lang-v1_0
+
 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/kokoro-en-v0_19.tar.bz2
 tar xf kokoro-en-v0_19.tar.bz2
 rm kokoro-en-v0_19.tar.bz2
 
 node ./test_tts_non_streaming_kokoro_en.js
 ls -lh *.wav
+rm -rf kokoro-en-v0_19
 
 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/matcha-icefall-en_US-ljspeech.tar.bz2
 tar xvf matcha-icefall-en_US-ljspeech.tar.bz2

diff --git a/.github/scripts/test-nodejs-npm.sh b/.github/scripts/test-nodejs-npm.sh
@@ -10,12 +10,21 @@ ls -lh
 ls -lh node_modules
 
 # offline tts
+#
+curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/kokoro-multi-lang-v1_0.tar.bz2
+tar xf kokoro-multi-lang-v1_0.tar.bz2
+rm kokoro-multi-lang-v1_0.tar.bz2
+
+node ./test-offline-tts-kokoro-zh-en.js
+ls -lh *.wav
+rm -rf kokoro-multi-lang-v1_0
 
 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/kokoro-en-v0_19.tar.bz2
 tar xf kokoro-en-v0_19.tar.bz2
 rm kokoro-en-v0_19.tar.bz2
 
 node ./test-offline-tts-kokoro-en.js
+rm -rf kokoro-en-v0_19
 
 ls -lh
 

diff --git a/.github/scripts/test-offline-tts.sh b/.github/scripts/test-offline-tts.sh
@@ -43,6 +43,28 @@ for sid in $(seq 0 10); do
 done
 rm -rf kokoro-en-v0_19
 
+log "------------------------------------------------------------"
+log "matcha-tts-fa_en-male"
+log "------------------------------------------------------------"
+curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/matcha-tts-fa_en-male.tar.bz2
+tar xvf matcha-tts-fa_en-male.tar.bz2
+rm matcha-tts-fa_en-male.tar.bz2
+
+curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/vocoder-models/hifigan_v2.onnx
+
+$EXE \
+  --matcha-acoustic-model=./matcha-tts-fa_en-male/model.onnx \
+  --matcha-vocoder=./hifigan_v2.onnx \
+  --matcha-tokens=./matcha-tts-fa_en-male/tokens.txt \
+  --matcha-data-dir=./matcha-tts-fa_en-male/espeak-ng-data \
+  --output-filename=./tts/test-matcha-fa-en-male.wav \
+  --num-threads=2 \
+  "How are you doing today?  این یک نمونه ی تست فارسی است. This is a test."
+
+rm -rf matcha-tts-fa_en-male
+rm hifigan_v2.onnx
+ls -lh tts/*.wav
+
 log "------------------------------------------------------------"
 log "matcha-icefall-en_US-ljspeech"
 log "------------------------------------------------------------"
@@ -64,6 +86,7 @@ $EXE \
 
 rm hifigan_v2.onnx
 rm -rf matcha-icefall-en_US-ljspeech
+ls -lh tts/*.wav
 
 log "------------------------------------------------------------"
 log "matcha-icefall-zh-baker"

diff --git a/.github/scripts/test-python.sh b/.github/scripts/test-python.sh
@@ -267,6 +267,27 @@ log "Offline TTS test"
 # test waves are saved in ./tts
 mkdir ./tts
 
+log "kokoro-multi-lang-v1_0 test"
+
+curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/kokoro-multi-lang-v1_0.tar.bz2
+tar xf kokoro-multi-lang-v1_0.tar.bz2
+rm kokoro-multi-lang-v1_0.tar.bz2
+
+python3 ./python-api-examples/offline-tts.py \
+  --debug=1 \
+  --kokoro-model=./kokoro-multi-lang-v1_0/model.onnx \
+  --kokoro-voices=./kokoro-multi-lang-v1_0/voices.bin \
+  --kokoro-tokens=./kokoro-multi-lang-v1_0/tokens.txt \
+  --kokoro-data-dir=./kokoro-multi-lang-v1_0/espeak-ng-data \
+  --kokoro-dict-dir=./kokoro-multi-lang-v1_0/dict \
+  --kokoro-lexicon=./kokoro-multi-lang-v1_0/lexicon-us-en.txt,./kokoro-multi-lang-v1_0/lexicon-zh.txt \
+  --num-threads=2 \
+  --sid=18 \
+  --output-filename="./tts/kokoro-18-zh-en.wav" \
+  "中英文语音合成测试。This is generated by next generation Kaldi using Kokoro without Misaki. 你觉得中英文说的如何呢？"
+
+rm -rf kokoro-multi-lang-v1_0
+
 log "kokoro-en-v0_19 test"
 
 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/tts-models/kokoro-en-v0_19.tar.bz2
@@ -574,53 +595,19 @@ echo "sherpa_onnx version: $sherpa_onnx_version"
 pwd
 ls -lh
 
-repo=sherpa-onnx-kws-zipformer-gigaspeech-3.3M-2024-01-01
-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
-ls -lh $repo
-
-python3 ./python-api-examples/keyword-spotter.py \
-  --tokens=$repo/tokens.txt \
-  --encoder=$repo/encoder-epoch-12-avg-2-chunk-16-left-64.onnx \
-  --decoder=$repo/decoder-epoch-12-avg-2-chunk-16-left-64.onnx \
-  --joiner=$repo/joiner-epoch-12-avg-2-chunk-16-left-64.onnx \
-  --keywords-file=$repo/test_wavs/test_keywords.txt \
-  $repo/test_wavs/0.wav \
-  $repo/test_wavs/1.wav
-
-rm -rf $repo
-
 if [[ x$OS != x'windows-latest' ]]; then
   echo "OS: $OS"
 
   repo=sherpa-onnx-kws-zipformer-wenetspeech-3.3M-2024-01-01
   log "Start testing ${repo}"
 
-  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
   ls -lh $repo
 
-  python3 ./python-api-examples/keyword-spotter.py \
-    --tokens=$repo/tokens.txt \
-    --encoder=$repo/encoder-epoch-12-avg-2-chunk-16-left-64.onnx \
-    --decoder=$repo/decoder-epoch-12-avg-2-chunk-16-left-64.onnx \
-    --joiner=$repo/joiner-epoch-12-avg-2-chunk-16-left-64.onnx \
-    --keywords-file=$repo/test_wavs/test_keywords.txt \
-    $repo/test_wavs/3.wav \
-    $repo/test_wavs/4.wav \
-    $repo/test_wavs/5.wav
+  python3 ./python-api-examples/keyword-spotter.py
 
   python3 sherpa-onnx/python/tests/test_keyword_spotter.py --verbose
 

diff --git a/.github/scripts/test-swift.sh b/.github/scripts/test-swift.sh
@@ -11,6 +11,10 @@ ls -lh
 ls -lh
 rm -rf vits-piper-*
 
+./run-tts-kokoro-zh-en.sh
+ls -lh
+rm -rf kokoro-multi-*
+
 ./run-tts-kokoro-en.sh
 ls -lh
 rm -rf kokoro-en-*