xuning / sherpaonnx

转到一个项目
Toggle navigation Toggle navigation pinning
Fangjun Kuang
Committed by GitHub
dd0ff2ca 1 parent 9e446b85

Support onnxruntime 1.18.0 (#906)

内嵌 并排对比
正在显示 100 个修改的文件 包含 606 行增加 和 570 行删除

要显示太多修改。
重新载入完整差异 差异文件 邮件补丁

为保证性能只显示 100 of 100+ 个文件。

@@ -121,9 +121,9 @@ rm sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k.tar.bz2 @@ -121,9 +121,9 @@ rm sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k.tar.bz2
121 node ./test_asr_non_streaming_nemo_ctc.js 121 node ./test_asr_non_streaming_nemo_ctc.js
122 rm -rf sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k 122 rm -rf sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k
123 123
124 -curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
125 -tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
126 -rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 124 +curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  125 +tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  126 +rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
127 127
128 node ./test_asr_non_streaming_paraformer.js 128 node ./test_asr_non_streaming_paraformer.js
129 129
@@ -134,7 +134,7 @@ curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/i @@ -134,7 +134,7 @@ curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/i
134 134
135 node ./test_asr_non_streaming_paraformer_itn.js 135 node ./test_asr_non_streaming_paraformer_itn.js
136 136
137 -rm -rf sherpa-onnx-paraformer-zh-2023-03-28 137 +rm -rf sherpa-onnx-paraformer-zh-2023-09-14
138 138
139 echo "----------tts----------" 139 echo "----------tts----------"
140 140
@@ -11,16 +11,16 @@ ls -lh node_modules @@ -11,16 +11,16 @@ ls -lh node_modules
11 11
12 # offline asr 12 # offline asr
13 13
14 -curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 14 +curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
15 ls -lh 15 ls -lh
16 -tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
17 -rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 16 +tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  17 +rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
18 18
19 rm -f itn* 19 rm -f itn*
20 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn-zh-number.wav 20 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn-zh-number.wav
21 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn_zh_number.fst 21 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn_zh_number.fst
22 node ./test-offline-paraformer-itn.js 22 node ./test-offline-paraformer-itn.js
23 -rm -rf sherpa-onnx-paraformer-zh-2023-03-28 23 +rm -rf sherpa-onnx-paraformer-zh-2023-09-14
24 24
25 curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2 25 curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
26 ls -lh 26 ls -lh
@@ -29,12 +29,12 @@ rm sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2 @@ -29,12 +29,12 @@ rm sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
29 node ./test-offline-nemo-ctc.js 29 node ./test-offline-nemo-ctc.js
30 rm -rf sherpa-onnx-nemo-ctc-en-conformer-small 30 rm -rf sherpa-onnx-nemo-ctc-en-conformer-small
31 31
32 -curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 32 +curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
33 ls -lh 33 ls -lh
34 -tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
35 -rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 34 +tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  35 +rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
36 node ./test-offline-paraformer.js 36 node ./test-offline-paraformer.js
37 -rm -rf sherpa-onnx-paraformer-zh-2023-03-28 37 +rm -rf sherpa-onnx-paraformer-zh-2023-09-14
38 38
39 curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-zipformer-en-2023-06-26.tar.bz2 39 curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-zipformer-en-2023-06-26.tar.bz2
40 ls -lh 40 ls -lh
@@ -15,6 +15,49 @@ echo "PATH: $PATH" @@ -15,6 +15,49 @@ echo "PATH: $PATH"
15 15
16 which $EXE 16 which $EXE
17 17
  18 +if false; then
  19 + # It has problems with onnxruntime 1.18
  20 + log "------------------------------------------------------------"
  21 + log "Run Wenet models"
  22 + log "------------------------------------------------------------"
  23 + wenet_models=(
  24 + sherpa-onnx-zh-wenet-aishell
  25 + # sherpa-onnx-zh-wenet-aishell2
  26 + # sherpa-onnx-zh-wenet-wenetspeech
  27 + # sherpa-onnx-zh-wenet-multi-cn
  28 + sherpa-onnx-en-wenet-librispeech
  29 + # sherpa-onnx-en-wenet-gigaspeech
  30 + )
  31 + for name in ${wenet_models[@]}; do
  32 + repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/$name.tar.bz2
  33 + log "Start testing ${repo_url}"
  34 + repo=$name
  35 + log "Download pretrained model and test-data from $repo_url"
  36 + curl -SL -O $repo_url
  37 + tar xvf $name.tar.bz2
  38 + rm $name.tar.bz2
  39 +
  40 + log "test float32 models"
  41 + time $EXE \
  42 + --tokens=$repo/tokens.txt \
  43 + --wenet-ctc-model=$repo/model.onnx \
  44 + $repo/test_wavs/0.wav \
  45 + $repo/test_wavs/1.wav \
  46 + $repo/test_wavs/8k.wav
  47 +
  48 + log "test int8 models"
  49 + time $EXE \
  50 + --tokens=$repo/tokens.txt \
  51 + --wenet-ctc-model=$repo/model.int8.onnx \
  52 + $repo/test_wavs/0.wav \
  53 + $repo/test_wavs/1.wav \
  54 + $repo/test_wavs/8k.wav
  55 +
  56 + rm -rf $repo
  57 + done
  58 +fi
  59 +
  60 +
18 log "test offline TeleSpeech CTC" 61 log "test offline TeleSpeech CTC"
19 url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04.tar.bz2 62 url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04.tar.bz2
20 name=$(basename $url) 63 name=$(basename $url)
@@ -145,44 +188,7 @@ done @@ -145,44 +188,7 @@ done
145 188
146 rm -rf $repo 189 rm -rf $repo
147 190
148 -log "------------------------------------------------------------"  
149 -log "Run Wenet models"  
150 -log "------------------------------------------------------------"  
151 -wenet_models=(  
152 -sherpa-onnx-zh-wenet-aishell  
153 -# sherpa-onnx-zh-wenet-aishell2  
154 -# sherpa-onnx-zh-wenet-wenetspeech  
155 -# sherpa-onnx-zh-wenet-multi-cn  
156 -sherpa-onnx-en-wenet-librispeech  
157 -# sherpa-onnx-en-wenet-gigaspeech  
158 -)  
159 -for name in ${wenet_models[@]}; do  
160 - repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/$name.tar.bz2  
161 - log "Start testing ${repo_url}"  
162 - repo=$name  
163 - log "Download pretrained model and test-data from $repo_url"  
164 - curl -SL -O $repo_url  
165 - tar xvf $name.tar.bz2  
166 - rm $name.tar.bz2  
167 -  
168 - log "test float32 models"  
169 - time $EXE \  
170 - --tokens=$repo/tokens.txt \  
171 - --wenet-ctc-model=$repo/model.onnx \  
172 - $repo/test_wavs/0.wav \  
173 - $repo/test_wavs/1.wav \  
174 - $repo/test_wavs/8k.wav  
175 191
176 - log "test int8 models"  
177 - time $EXE \  
178 - --tokens=$repo/tokens.txt \  
179 - --wenet-ctc-model=$repo/model.int8.onnx \  
180 - $repo/test_wavs/0.wav \  
181 - $repo/test_wavs/1.wav \  
182 - $repo/test_wavs/8k.wav  
183 -  
184 - rm -rf $repo  
185 -done  
186 192
187 log "------------------------------------------------------------" 193 log "------------------------------------------------------------"
188 log "Run tdnn yesno (Hebrew)" 194 log "Run tdnn yesno (Hebrew)"
@@ -184,35 +184,13 @@ rm -rf $repo @@ -184,35 +184,13 @@ rm -rf $repo
184 log "------------------------------------------------------------" 184 log "------------------------------------------------------------"
185 log "Run Paraformer (Chinese)" 185 log "Run Paraformer (Chinese)"
186 log "------------------------------------------------------------" 186 log "------------------------------------------------------------"
187 -  
188 -repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
189 -curl -SL -O $repo_url  
190 -tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
191 -rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
192 -repo=sherpa-onnx-paraformer-zh-2023-03-28  
193 -log "Start testing ${repo_url}"  
194 -  
195 -time $EXE \  
196 - --tokens=$repo/tokens.txt \  
197 - --paraformer=$repo/model.onnx \  
198 - --num-threads=2 \  
199 - --decoding-method=greedy_search \  
200 - $repo/test_wavs/0.wav \  
201 - $repo/test_wavs/1.wav \  
202 - $repo/test_wavs/2.wav \  
203 - $repo/test_wavs/8k.wav  
204 -  
205 -time $EXE \  
206 - --tokens=$repo/tokens.txt \  
207 - --paraformer=$repo/model.int8.onnx \  
208 - --num-threads=2 \  
209 - --decoding-method=greedy_search \  
210 - $repo/test_wavs/0.wav \  
211 - $repo/test_wavs/1.wav \  
212 - $repo/test_wavs/2.wav \  
213 - $repo/test_wavs/8k.wav  
214 -  
215 -rm -rf $repo 187 +# For onnxruntime 1.18.0, sherpa-onnx-paraformer-zh-2023-03-28 throws the following error
  188 +# libc++abi: terminating with uncaught exception of type Ort::Exception: Node (Loop_5471)
  189 +# Op (Loop) [TypeInferenceError] Graph attribute inferencing failed: Node (Concat_5490)
  190 +# Op (Concat) [ShapeInferenceError] All inputs to Concat must have same rank. Input 1 has rank 2 != 1
  191 +#
  192 +# See https://github.com/microsoft/onnxruntime/issues/8115
  193 +# We need to re-export this model using a recent version of onnxruntime and onnx
216 194
217 log "------------------------------------------------------------" 195 log "------------------------------------------------------------"
218 log "Run Paraformer (Chinese) with timestamps" 196 log "Run Paraformer (Chinese) with timestamps"
@@ -312,13 +312,13 @@ log "Test non-streaming paraformer models" @@ -312,13 +312,13 @@ log "Test non-streaming paraformer models"
312 if [[ x$OS != x'windows-latest' ]]; then 312 if [[ x$OS != x'windows-latest' ]]; then
313 echo "OS: $OS" 313 echo "OS: $OS"
314 pushd $dir 314 pushd $dir
315 - repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 315 + repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
316 curl -SL -O $repo_url 316 curl -SL -O $repo_url
317 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
318 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 317 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  318 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
319 319
320 log "Start testing ${repo_url}" 320 log "Start testing ${repo_url}"
321 - repo=$dir/sherpa-onnx-paraformer-zh-2023-03-28 321 + repo=$dir/sherpa-onnx-paraformer-zh-2023-09-14
322 322
323 ls -lh $repo 323 ls -lh $repo
324 popd 324 popd
@@ -348,7 +348,7 @@ if [[ x$OS != x'windows-latest' ]]; then @@ -348,7 +348,7 @@ if [[ x$OS != x'windows-latest' ]]; then
348 348
349 python3 ./python-api-examples/inverse-text-normalization-offline-asr.py 349 python3 ./python-api-examples/inverse-text-normalization-offline-asr.py
350 350
351 - rm -rfv sherpa-onnx-paraformer-zh-2023-03-28 351 + rm -rfv sherpa-onnx-paraformer-zh-2023-09-14
352 352
353 rm -rf $repo 353 rm -rf $repo
354 fi 354 fi
@@ -172,7 +172,6 @@ jobs: @@ -172,7 +172,6 @@ jobs:
172 if [[ $lib_type == "shared" ]]; then 172 if [[ $lib_type == "shared" ]]; then
173 cp -a build-arm-linux-gnueabihf/install/lib $dst/ 173 cp -a build-arm-linux-gnueabihf/install/lib $dst/
174 rm -v $dst/lib/libasound.so 174 rm -v $dst/lib/libasound.so
175 - rm -v $dst/lib/libonnxruntime.so  
176 fi 175 fi
177 176
178 tree $dst 177 tree $dst
@@ -73,7 +73,14 @@ jobs: @@ -73,7 +73,14 @@ jobs:
73 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-aishell main || true 73 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-aishell main || true
74 74
75 cd .. 75 cd ..
76 - rm -rf huggingface 76 +
  77 + rm -rf huggingface/.git
  78 + dst=sherpa-onnx-zh-wenet-aishell
  79 +
  80 + mv huggingface $dst
  81 +
  82 + tar cjvf $dst.tar.bz2 $dst
  83 + rm -rf $dst
77 84
78 - name: Publish to huggingface (aishell2) 85 - name: Publish to huggingface (aishell2)
79 env: 86 env:
@@ -115,7 +122,14 @@ jobs: @@ -115,7 +122,14 @@ jobs:
115 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-aishell2 main || true 122 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-aishell2 main || true
116 123
117 cd .. 124 cd ..
118 - rm -rf huggingface 125 +
  126 + rm -rf huggingface/.git
  127 + dst=sherpa-onnx-zh-wenet-aishell2
  128 +
  129 + mv huggingface $dst
  130 +
  131 + tar cjvf $dst.tar.bz2 $dst
  132 + rm -rf $dst
119 133
120 - name: Publish to huggingface (multi_cn) 134 - name: Publish to huggingface (multi_cn)
121 env: 135 env:
@@ -157,7 +171,14 @@ jobs: @@ -157,7 +171,14 @@ jobs:
157 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-multi-cn main || true 171 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-multi-cn main || true
158 172
159 cd .. 173 cd ..
160 - rm -rf huggingface 174 +
  175 + rm -rf huggingface/.git
  176 + dst=sherpa-onnx-zh-wenet-multi-cn
  177 +
  178 + mv huggingface $dst
  179 +
  180 + tar cjvf $dst.tar.bz2 $dst
  181 + rm -rf $dst
161 182
162 - name: Publish to huggingface (wenetspeech) 183 - name: Publish to huggingface (wenetspeech)
163 env: 184 env:
@@ -199,7 +220,14 @@ jobs: @@ -199,7 +220,14 @@ jobs:
199 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-wenetspeech main || true 220 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-wenetspeech main || true
200 221
201 cd .. 222 cd ..
202 - rm -rf huggingface 223 +
  224 + rm -rf huggingface/.git
  225 + dst=sherpa-onnx-zh-wenet-wenetspeech
  226 +
  227 + mv huggingface $dst
  228 +
  229 + tar cjvf $dst.tar.bz2 $dst
  230 + rm -rf $dst
203 231
204 - name: Publish to huggingface (librispeech) 232 - name: Publish to huggingface (librispeech)
205 env: 233 env:
@@ -242,7 +270,14 @@ jobs: @@ -242,7 +270,14 @@ jobs:
242 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-en-wenet-librispeech main || true 270 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-en-wenet-librispeech main || true
243 271
244 cd .. 272 cd ..
245 - rm -rf huggingface 273 +
  274 + rm -rf huggingface/.git
  275 + dst=sherpa-onnx-en-wenet-librispeech
  276 +
  277 + mv huggingface $dst
  278 +
  279 + tar cjvf $dst.tar.bz2 $dst
  280 + rm -rf $dst
246 281
247 - name: Publish to huggingface (gigaspeech) 282 - name: Publish to huggingface (gigaspeech)
248 env: 283 env:
@@ -285,4 +320,21 @@ jobs: @@ -285,4 +320,21 @@ jobs:
285 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-en-wenet-gigaspeech main || true 320 git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-en-wenet-gigaspeech main || true
286 321
287 cd .. 322 cd ..
288 - rm -rf huggingface 323 +
  324 + rm -rf huggingface/.git
  325 + dst=sherpa-onnx-en-wenet-gigaspeech
  326 +
  327 + mv huggingface $dst
  328 +
  329 + tar cjvf $dst.tar.bz2 $dst
  330 + rm -rf $dst
  331 +
  332 + - name: Release
  333 + uses: svenstaro/upload-release-action@v2
  334 + with:
  335 + file_glob: true
  336 + file: ./*.tar.bz2
  337 + overwrite: true
  338 + repo_name: k2-fsa/sherpa-onnx
  339 + repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
  340 + tag: asr-models
@@ -85,7 +85,6 @@ jobs: @@ -85,7 +85,6 @@ jobs:
85 make install 85 make install
86 86
87 ls -lh ./install/lib 87 ls -lh ./install/lib
88 - rm -v ./install/lib/libonnxruntime.so  
89 88
90 - name: Copy pre-built libs 89 - name: Copy pre-built libs
91 shell: bash 90 shell: bash
@@ -269,7 +269,7 @@ jobs: @@ -269,7 +269,7 @@ jobs:
269 269
270 echo "Test paraformer" 270 echo "Test paraformer"
271 ./run-paraformer.sh 271 ./run-paraformer.sh
272 - rm -rf sherpa-onnx-paraformer-zh-2023-03-28 272 + rm -rf sherpa-onnx-paraformer-zh-2023-09-14
273 273
274 echo "Test NeMo CTC" 274 echo "Test NeMo CTC"
275 ./run-nemo-ctc.sh 275 ./run-nemo-ctc.sh
@@ -306,7 +306,7 @@ jobs: @@ -306,7 +306,7 @@ jobs:
306 306
307 echo "Test paraformer" 307 echo "Test paraformer"
308 ./run-paraformer.sh 308 ./run-paraformer.sh
309 - rm -rf sherpa-onnx-paraformer-zh-2023-03-28 309 + rm -rf sherpa-onnx-paraformer-zh-2023-09-14
310 310
311 echo "Test NeMo CTC" 311 echo "Test NeMo CTC"
312 ./run-nemo-ctc.sh 312 ./run-nemo-ctc.sh
@@ -351,7 +351,7 @@ jobs: @@ -351,7 +351,7 @@ jobs:
351 351
352 echo "Test paraformer" 352 echo "Test paraformer"
353 ./run-paraformer.sh 353 ./run-paraformer.sh
354 - rm -rf sherpa-onnx-paraformer-zh-2023-03-28 354 + rm -rf sherpa-onnx-paraformer-zh-2023-09-14
355 355
356 echo "Test NeMo CTC" 356 echo "Test NeMo CTC"
357 ./run-nemo-ctc.sh 357 ./run-nemo-ctc.sh
@@ -94,11 +94,6 @@ jobs: @@ -94,11 +94,6 @@ jobs:
94 cp -v _deps/onnxruntime-src/lib/libonnxruntime*so* $upload_dir 94 cp -v _deps/onnxruntime-src/lib/libonnxruntime*so* $upload_dir
95 95
96 cp -v _deps/onnxruntime-src/lib/libonnxruntime*so* ./lib/ 96 cp -v _deps/onnxruntime-src/lib/libonnxruntime*so* ./lib/
97 - rm -v ./lib/libonnxruntime.so  
98 -  
99 - cd lib  
100 - ln -s libonnxruntime.so.1.17.1 libonnxruntime.so  
101 - cd ..  
102 97
103 rm -v ./lib/*.a 98 rm -v ./lib/*.a
104 ls -h ./lib 99 ls -h ./lib
@@ -121,7 +116,7 @@ jobs: @@ -121,7 +116,7 @@ jobs:
121 rm ./lib/*.a 116 rm ./lib/*.a
122 rm ./lib/libonnxruntime.dylib 117 rm ./lib/libonnxruntime.dylib
123 cd lib 118 cd lib
124 - ln -s libonnxruntime.1.17.1.dylib libonnxruntime.dylib 119 + ln -s libonnxruntime.1.18.0.dylib libonnxruntime.dylib
125 cd .. 120 cd ..
126 fi 121 fi
127 122
@@ -211,7 +206,7 @@ jobs: @@ -211,7 +206,7 @@ jobs:
211 echo "Test paraformer" 206 echo "Test paraformer"
212 ./run-paraformer.sh 207 ./run-paraformer.sh
213 ./run-paraformer-itn.sh 208 ./run-paraformer-itn.sh
214 - rm -rf sherpa-onnx-paraformer-zh-2023-03-28 209 + rm -rf sherpa-onnx-paraformer-zh-2023-09-14
215 210
216 echo "Test NeMo CTC" 211 echo "Test NeMo CTC"
217 ./run-nemo-ctc.sh 212 ./run-nemo-ctc.sh
@@ -104,13 +104,13 @@ jobs: @@ -104,13 +104,13 @@ jobs:
104 if: matrix.model_type == 'paraformer' && matrix.os != 'windows-latest' 104 if: matrix.model_type == 'paraformer' && matrix.os != 'windows-latest'
105 shell: bash 105 shell: bash
106 run: | 106 run: |
107 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
108 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
109 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 107 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  108 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  109 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
110 110
111 python3 ./python-api-examples/non_streaming_server.py \ 111 python3 ./python-api-examples/non_streaming_server.py \
112 - --paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \  
113 - --tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt & 112 + --paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
  113 + --tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt &
114 114
115 echo "sleep 10 seconds to wait the server start" 115 echo "sleep 10 seconds to wait the server start"
116 sleep 10 116 sleep 10
@@ -120,16 +120,16 @@ jobs: @@ -120,16 +120,16 @@ jobs:
120 shell: bash 120 shell: bash
121 run: | 121 run: |
122 python3 ./python-api-examples/offline-websocket-client-decode-files-paralell.py \ 122 python3 ./python-api-examples/offline-websocket-client-decode-files-paralell.py \
123 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav \  
124 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/1.wav \  
125 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/2.wav \  
126 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/8k.wav 123 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav \
  124 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/1.wav \
  125 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/2.wav \
  126 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/8k.wav
127 127
128 python3 ./python-api-examples/offline-websocket-client-decode-files-sequential.py \ 128 python3 ./python-api-examples/offline-websocket-client-decode-files-sequential.py \
129 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav \  
130 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/1.wav \  
131 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/2.wav \  
132 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/8k.wav 129 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav \
  130 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/1.wav \
  131 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/2.wav \
  132 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/8k.wav
133 133
134 - name: Start server for nemo_ctc models 134 - name: Start server for nemo_ctc models
135 if: matrix.model_type == 'nemo_ctc' 135 if: matrix.model_type == 'nemo_ctc'
@@ -48,6 +48,7 @@ paraformer-onnxruntime-python-example @@ -48,6 +48,7 @@ paraformer-onnxruntime-python-example
48 run-sherpa-onnx-offline-paraformer.sh 48 run-sherpa-onnx-offline-paraformer.sh
49 run-sherpa-onnx-offline-transducer.sh 49 run-sherpa-onnx-offline-transducer.sh
50 sherpa-onnx-paraformer-zh-2023-03-28 50 sherpa-onnx-paraformer-zh-2023-03-28
  51 +sherpa-onnx-paraformer-zh-2023-09-14
51 run-offline-websocket-server-paraformer.sh 52 run-offline-websocket-server-paraformer.sh
52 run-*int8.sh 53 run-*int8.sh
53 a.sh 54 a.sh
  1 +## 1.10.13
  2 +
  3 +* Update onnxruntime from 1.17.1 to 1.18.0
  4 +
1 ## 1.10.12 5 ## 1.10.12
2 6
3 * Add Flush to VAD so that the last speech segment can be detected. See also 7 * Add Flush to VAD so that the last speech segment can be detected. See also
@@ -11,7 +11,7 @@ project(sherpa-onnx) @@ -11,7 +11,7 @@ project(sherpa-onnx)
11 # ./nodejs-addon-examples 11 # ./nodejs-addon-examples
12 # ./dart-api-examples/ 12 # ./dart-api-examples/
13 # ./CHANGELOG.md 13 # ./CHANGELOG.md
14 -set(SHERPA_ONNX_VERSION "1.10.12") 14 +set(SHERPA_ONNX_VERSION "1.10.13")
15 15
16 # Disable warning about 16 # Disable warning about
17 # 17 #
@@ -22,19 +22,9 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0") @@ -22,19 +22,9 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
22 endif() 22 endif()
23 23
24 24
25 -include(CheckIPOSupported)  
26 -check_ipo_supported(RESULT ipo)  
27 25
28 -if(ipo)  
29 - message(STATUS "IPO is enabled")  
30 - set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)  
31 -else()  
32 - message(STATUS "IPO is not available")  
33 -endif()  
34 26
35 -set(CMAKE_CXX_VISIBILITY_PRESET hidden)  
36 -set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)  
37 -set(CMAKE_POSITION_INDEPENDENT_CODE ON) 27 +
38 28
39 option(SHERPA_ONNX_ENABLE_PYTHON "Whether to build Python" OFF) 29 option(SHERPA_ONNX_ENABLE_PYTHON "Whether to build Python" OFF)
40 option(SHERPA_ONNX_ENABLE_TESTS "Whether to build tests" OFF) 30 option(SHERPA_ONNX_ENABLE_TESTS "Whether to build tests" OFF)
@@ -144,6 +134,29 @@ message(STATUS "SHERPA_ONNX_USE_PRE_INSTALLED_ONNXRUNTIME_IF_AVAILABLE ${SHERPA_ @@ -144,6 +134,29 @@ message(STATUS "SHERPA_ONNX_USE_PRE_INSTALLED_ONNXRUNTIME_IF_AVAILABLE ${SHERPA_
144 message(STATUS "SHERPA_ONNX_ENABLE_SANITIZER: ${SHERPA_ONNX_ENABLE_SANITIZER}") 134 message(STATUS "SHERPA_ONNX_ENABLE_SANITIZER: ${SHERPA_ONNX_ENABLE_SANITIZER}")
145 message(STATUS "SHERPA_ONNX_BUILD_C_API_EXAMPLES: ${SHERPA_ONNX_BUILD_C_API_EXAMPLES}") 135 message(STATUS "SHERPA_ONNX_BUILD_C_API_EXAMPLES: ${SHERPA_ONNX_BUILD_C_API_EXAMPLES}")
146 136
  137 +if(BUILD_SHARED_LIBS)
  138 + set(CMAKE_CXX_VISIBILITY_PRESET hidden)
  139 + set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
  140 + set(CMAKE_POSITION_INDEPENDENT_CODE ON)
  141 +endif()
  142 +
  143 +if(BUILD_SHARED_LIBS AND NOT CMAKE_SYSTEM_NAME STREQUAL iOS)
  144 + # Don't use LTO for iOS since it causes the following error
  145 + # error: unable to find any architecture information in the binary
  146 + # at '/Users/fangjun/open-source/sherpa-onnx/build-ios/build/os64/sherpa-onnx.a':
  147 + # Unknown header: 0xb17c0de
  148 + # See also https://forums.developer.apple.com/forums/thread/714324
  149 +
  150 + include(CheckIPOSupported)
  151 + check_ipo_supported(RESULT ipo)
  152 + if(ipo)
  153 + message(STATUS "IPO is enabled")
  154 + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
  155 + else()
  156 + message(STATUS "IPO is not available")
  157 + endif()
  158 +endif()
  159 +
147 if(SHERPA_ONNX_ENABLE_TTS) 160 if(SHERPA_ONNX_ENABLE_TTS)
148 message(STATUS "TTS is enabled") 161 message(STATUS "TTS is enabled")
149 add_definitions(-DSHERPA_ONNX_ENABLE_TTS=1) 162 add_definitions(-DSHERPA_ONNX_ENABLE_TTS=1)
@@ -42,7 +42,7 @@ fi @@ -42,7 +42,7 @@ fi
42 42
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 -onnxruntime_version=1.17.1 45 +onnxruntime_version=1.18.0
46 46
47 if [ ! -f $onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then 47 if [ ! -f $onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then
48 mkdir -p $onnxruntime_version 48 mkdir -p $onnxruntime_version
@@ -43,7 +43,7 @@ fi @@ -43,7 +43,7 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=1.17.1 46 +onnxruntime_version=1.18.0
47 47
48 if [ ! -f $onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then 48 if [ ! -f $onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then
49 mkdir -p $onnxruntime_version 49 mkdir -p $onnxruntime_version
@@ -43,7 +43,7 @@ fi @@ -43,7 +43,7 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=1.17.1 46 +onnxruntime_version=1.18.0
47 47
48 if [ ! -f $onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then 48 if [ ! -f $onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then
49 mkdir -p $onnxruntime_version 49 mkdir -p $onnxruntime_version
@@ -43,7 +43,7 @@ fi @@ -43,7 +43,7 @@ fi
43 echo "ANDROID_NDK: $ANDROID_NDK" 43 echo "ANDROID_NDK: $ANDROID_NDK"
44 sleep 1 44 sleep 1
45 45
46 -onnxruntime_version=1.17.1 46 +onnxruntime_version=1.18.0
47 47
48 if [ ! -f $onnxruntime_version/jni/x86/libonnxruntime.so ]; then 48 if [ ! -f $onnxruntime_version/jni/x86/libonnxruntime.so ]; then
49 mkdir -p $onnxruntime_version 49 mkdir -p $onnxruntime_version
@@ -5,7 +5,7 @@ set -e @@ -5,7 +5,7 @@ set -e
5 dir=build-ios-no-tts 5 dir=build-ios-no-tts
6 mkdir -p $dir 6 mkdir -p $dir
7 cd $dir 7 cd $dir
8 -onnxruntime_version=1.17.1 8 +onnxruntime_version=1.18.0
9 onnxruntime_dir=ios-onnxruntime/$onnxruntime_version 9 onnxruntime_dir=ios-onnxruntime/$onnxruntime_version
10 10
11 if [ ! -f $onnxruntime_dir/onnxruntime.xcframework/ios-arm64/onnxruntime.a ]; then 11 if [ ! -f $onnxruntime_dir/onnxruntime.xcframework/ios-arm64/onnxruntime.a ]; then
@@ -10,7 +10,7 @@ set -e @@ -10,7 +10,7 @@ set -e
10 dir=build-ios-shared 10 dir=build-ios-shared
11 mkdir -p $dir 11 mkdir -p $dir
12 cd $dir 12 cd $dir
13 -onnxruntime_version=1.17.1 13 +onnxruntime_version=1.18.0
14 onnxruntime_dir=ios-onnxruntime/$onnxruntime_version 14 onnxruntime_dir=ios-onnxruntime/$onnxruntime_version
15 15
16 SHERPA_ONNX_GITHUB=github.com 16 SHERPA_ONNX_GITHUB=github.com
@@ -5,7 +5,7 @@ set -e @@ -5,7 +5,7 @@ set -e
5 dir=build-ios 5 dir=build-ios
6 mkdir -p $dir 6 mkdir -p $dir
7 cd $dir 7 cd $dir
8 -onnxruntime_version=1.17.1 8 +onnxruntime_version=1.18.0
9 onnxruntime_dir=ios-onnxruntime/$onnxruntime_version 9 onnxruntime_dir=ios-onnxruntime/$onnxruntime_version
10 10
11 SHERPA_ONNX_GITHUB=github.com 11 SHERPA_ONNX_GITHUB=github.com
@@ -39,91 +39,96 @@ echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR" @@ -39,91 +39,96 @@ echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
39 # The symbol _NSLog is not defined 39 # The symbol _NSLog is not defined
40 # 40 #
41 41
42 -cmake \  
43 - -DBUILD_PIPER_PHONMIZE_EXE=OFF \  
44 - -DBUILD_PIPER_PHONMIZE_TESTS=OFF \  
45 - -DBUILD_ESPEAK_NG_EXE=OFF \  
46 - -DBUILD_ESPEAK_NG_TESTS=OFF \  
47 - -S .. \  
48 - -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \  
49 - -DPLATFORM=SIMULATOR64 \  
50 - -DENABLE_BITCODE=0 \  
51 - -DENABLE_ARC=1 \  
52 - -DENABLE_VISIBILITY=0 \  
53 - -DCMAKE_BUILD_TYPE=Release \  
54 - -DBUILD_SHARED_LIBS=OFF \  
55 - -DSHERPA_ONNX_ENABLE_PYTHON=OFF \  
56 - -DSHERPA_ONNX_ENABLE_TESTS=OFF \  
57 - -DSHERPA_ONNX_ENABLE_CHECK=OFF \  
58 - -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \  
59 - -DSHERPA_ONNX_ENABLE_JNI=OFF \  
60 - -DSHERPA_ONNX_ENABLE_C_API=ON \  
61 - -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \  
62 - -DDEPLOYMENT_TARGET=13.0 \  
63 - -B build/simulator_x86_64  
64 -  
65 -cmake --build build/simulator_x86_64 -j 4 --verbose 42 +if [[ ! -f ./build/simulator_x86_64/lib/libsherpa-onnx-c-api.a ]]; then
  43 + cmake \
  44 + -DBUILD_PIPER_PHONMIZE_EXE=OFF \
  45 + -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
  46 + -DBUILD_ESPEAK_NG_EXE=OFF \
  47 + -DBUILD_ESPEAK_NG_TESTS=OFF \
  48 + -S .. \
  49 + -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
  50 + -DPLATFORM=SIMULATOR64 \
  51 + -DENABLE_BITCODE=0 \
  52 + -DENABLE_ARC=1 \
  53 + -DENABLE_VISIBILITY=0 \
  54 + -DCMAKE_BUILD_TYPE=Release \
  55 + -DBUILD_SHARED_LIBS=OFF \
  56 + -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
  57 + -DSHERPA_ONNX_ENABLE_TESTS=OFF \
  58 + -DSHERPA_ONNX_ENABLE_CHECK=OFF \
  59 + -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
  60 + -DSHERPA_ONNX_ENABLE_JNI=OFF \
  61 + -DSHERPA_ONNX_ENABLE_C_API=ON \
  62 + -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
  63 + -DDEPLOYMENT_TARGET=13.0 \
  64 + -B build/simulator_x86_64
  65 +
  66 + cmake --build build/simulator_x86_64 -j 4 --verbose
  67 +fi
66 68
67 echo "Building for simulator (arm64)" 69 echo "Building for simulator (arm64)"
68 70
69 -cmake \  
70 - -DBUILD_PIPER_PHONMIZE_EXE=OFF \  
71 - -DBUILD_PIPER_PHONMIZE_TESTS=OFF \  
72 - -DBUILD_ESPEAK_NG_EXE=OFF \  
73 - -DBUILD_ESPEAK_NG_TESTS=OFF \  
74 - -S .. \  
75 - -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \  
76 - -DPLATFORM=SIMULATORARM64 \  
77 - -DENABLE_BITCODE=0 \  
78 - -DENABLE_ARC=1 \  
79 - -DENABLE_VISIBILITY=0 \  
80 - -DCMAKE_BUILD_TYPE=Release \  
81 - -DCMAKE_INSTALL_PREFIX=./install \  
82 - -DBUILD_SHARED_LIBS=OFF \  
83 - -DSHERPA_ONNX_ENABLE_PYTHON=OFF \  
84 - -DSHERPA_ONNX_ENABLE_TESTS=OFF \  
85 - -DSHERPA_ONNX_ENABLE_CHECK=OFF \  
86 - -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \  
87 - -DSHERPA_ONNX_ENABLE_JNI=OFF \  
88 - -DSHERPA_ONNX_ENABLE_C_API=ON \  
89 - -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \  
90 - -DDEPLOYMENT_TARGET=13.0 \  
91 - -B build/simulator_arm64  
92 -  
93 -cmake --build build/simulator_arm64 -j 4 --verbose 71 +if [[ ! -f ./build/simulator_arm64/lib/libsherpa-onnx-c-api.a ]]; then
  72 + cmake \
  73 + -DBUILD_PIPER_PHONMIZE_EXE=OFF \
  74 + -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
  75 + -DBUILD_ESPEAK_NG_EXE=OFF \
  76 + -DBUILD_ESPEAK_NG_TESTS=OFF \
  77 + -S .. \
  78 + -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
  79 + -DPLATFORM=SIMULATORARM64 \
  80 + -DENABLE_BITCODE=0 \
  81 + -DENABLE_ARC=1 \
  82 + -DENABLE_VISIBILITY=0 \
  83 + -DCMAKE_BUILD_TYPE=Release \
  84 + -DCMAKE_INSTALL_PREFIX=./install \
  85 + -DBUILD_SHARED_LIBS=OFF \
  86 + -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
  87 + -DSHERPA_ONNX_ENABLE_TESTS=OFF \
  88 + -DSHERPA_ONNX_ENABLE_CHECK=OFF \
  89 + -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
  90 + -DSHERPA_ONNX_ENABLE_JNI=OFF \
  91 + -DSHERPA_ONNX_ENABLE_C_API=ON \
  92 + -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
  93 + -DDEPLOYMENT_TARGET=13.0 \
  94 + -B build/simulator_arm64
  95 +
  96 + cmake --build build/simulator_arm64 -j 4 --verbose
  97 +fi
94 98
95 echo "Building for arm64" 99 echo "Building for arm64"
96 100
97 export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/ios-onnxruntime/onnxruntime.xcframework/ios-arm64 101 export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/ios-onnxruntime/onnxruntime.xcframework/ios-arm64
98 102
99 -  
100 -cmake \  
101 - -DBUILD_PIPER_PHONMIZE_EXE=OFF \  
102 - -DBUILD_PIPER_PHONMIZE_TESTS=OFF \  
103 - -DBUILD_ESPEAK_NG_EXE=OFF \  
104 - -DBUILD_ESPEAK_NG_TESTS=OFF \  
105 - -S .. \  
106 - -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \  
107 - -DPLATFORM=OS64 \  
108 - -DENABLE_BITCODE=0 \  
109 - -DENABLE_ARC=1 \  
110 - -DENABLE_VISIBILITY=0 \  
111 - -DCMAKE_INSTALL_PREFIX=./install \  
112 - -DCMAKE_BUILD_TYPE=Release \  
113 - -DBUILD_SHARED_LIBS=OFF \  
114 - -DSHERPA_ONNX_ENABLE_PYTHON=OFF \  
115 - -DSHERPA_ONNX_ENABLE_TESTS=OFF \  
116 - -DSHERPA_ONNX_ENABLE_CHECK=OFF \  
117 - -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \  
118 - -DSHERPA_ONNX_ENABLE_JNI=OFF \  
119 - -DSHERPA_ONNX_ENABLE_C_API=ON \  
120 - -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \  
121 - -DDEPLOYMENT_TARGET=13.0 \  
122 - -B build/os64  
123 -  
124 -cmake --build build/os64 -j 4  
125 -# Generate headers for sherpa-onnx.xcframework  
126 -cmake --build build/os64 --target install 103 +if [[ ! -f ./build/os64/lib/libsherpa-onnx-c-api.a ]]; then
  104 + cmake \
  105 + -DBUILD_PIPER_PHONMIZE_EXE=OFF \
  106 + -DBUILD_PIPER_PHONMIZE_TESTS=OFF \
  107 + -DBUILD_ESPEAK_NG_EXE=OFF \
  108 + -DBUILD_ESPEAK_NG_TESTS=OFF \
  109 + -S .. \
  110 + -DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
  111 + -DPLATFORM=OS64 \
  112 + -DENABLE_BITCODE=0 \
  113 + -DENABLE_ARC=1 \
  114 + -DENABLE_VISIBILITY=0 \
  115 + -DCMAKE_INSTALL_PREFIX=./install \
  116 + -DCMAKE_BUILD_TYPE=Release \
  117 + -DBUILD_SHARED_LIBS=OFF \
  118 + -DSHERPA_ONNX_ENABLE_PYTHON=OFF \
  119 + -DSHERPA_ONNX_ENABLE_TESTS=OFF \
  120 + -DSHERPA_ONNX_ENABLE_CHECK=OFF \
  121 + -DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
  122 + -DSHERPA_ONNX_ENABLE_JNI=OFF \
  123 + -DSHERPA_ONNX_ENABLE_C_API=ON \
  124 + -DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
  125 + -DDEPLOYMENT_TARGET=13.0 \
  126 + -B build/os64
  127 +
  128 + cmake --build build/os64 -j 4
  129 + # Generate headers for sherpa-onnx.xcframework
  130 + cmake --build build/os64 --target install
  131 +fi
127 132
128 echo "Generate xcframework" 133 echo "Generate xcframework"
129 134
@@ -165,7 +170,6 @@ libtool -static -o build/os64/sherpa-onnx.a \ @@ -165,7 +170,6 @@ libtool -static -o build/os64/sherpa-onnx.a \
165 build/os64/lib/libespeak-ng.a \ 170 build/os64/lib/libespeak-ng.a \
166 build/os64/lib/libssentencepiece_core.a 171 build/os64/lib/libssentencepiece_core.a
167 172
168 -  
169 rm -rf sherpa-onnx.xcframework 173 rm -rf sherpa-onnx.xcframework
170 174
171 xcodebuild -create-xcframework \ 175 xcodebuild -create-xcframework \
@@ -216,9 +216,6 @@ class BuildExtension(build_ext): @@ -216,9 +216,6 @@ class BuildExtension(build_ext):
216 shutil.rmtree(f"{install_dir}/share") 216 shutil.rmtree(f"{install_dir}/share")
217 shutil.rmtree(f"{install_dir}/lib/pkgconfig") 217 shutil.rmtree(f"{install_dir}/lib/pkgconfig")
218 218
219 - if is_linux():  
220 - os.remove(f"{install_dir}/lib/libonnxruntime.so")  
221 -  
222 if is_macos(): 219 if is_macos():
223 os.remove(f"{install_dir}/lib/libonnxruntime.dylib") 220 os.remove(f"{install_dir}/lib/libonnxruntime.dylib")
224 221
@@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS) @@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS)
14 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 14 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
15 endif() 15 endif()
16 16
17 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-aarch64-static_lib-1.17.1.zip")  
18 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-aarch64-static_lib-1.17.1.zip")  
19 -set(onnxruntime_HASH "SHA256=831b9a3869501040b4399de85f34c4f170e2bcbd41881edaeb553f8dc4080985") 17 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip")
  18 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip")
  19 +set(onnxruntime_HASH "SHA256=82f5a17859261b16a42719afdf58ffb1a48c76f51d9463c89333ac335200fe39")
20 20
21 # If you don't have access to the Internet, 21 # If you don't have access to the Internet,
22 # please download onnxruntime to one of the following locations. 22 # please download onnxruntime to one of the following locations.
23 # You can add more if you want. 23 # You can add more if you want.
24 set(possible_file_locations 24 set(possible_file_locations
25 - $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-static_lib-1.17.1.zip  
26 - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.17.1.zip  
27 - ${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.17.1.zip  
28 - /tmp/onnxruntime-linux-aarch64-static_lib-1.17.1.zip  
29 - /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.17.1.zip 25 + $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
  26 + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
  27 + ${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
  28 + /tmp/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
  29 + /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -14,19 +14,20 @@ if(NOT BUILD_SHARED_LIBS) @@ -14,19 +14,20 @@ if(NOT BUILD_SHARED_LIBS)
14 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 14 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
15 endif() 15 endif()
16 16
17 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip")  
18 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip")  
19 -set(onnxruntime_HASH "SHA256=2ed01996da79d11ea486f738010bd411096ab91e744306fbd30d09f37e6d43a0") 17 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip")
  18 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip")
  19 +# set(onnxruntime_HASH "SHA256=9b288e867f09521d3a9f17b9c0979ac92bc1817dc083dc82d54aa027c0dac781")
  20 +set(onnxruntime_HASH) # TODO(fangjun): Update it
20 21
21 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
22 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
23 # You can add more if you want. 24 # You can add more if you want.
24 set(possible_file_locations 25 set(possible_file_locations
25 - $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip  
26 - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip  
27 - ${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip  
28 - /tmp/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip  
29 - /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip 26 + $ENV{HOME}/Downloads/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
  27 + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
  28 + ${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
  29 + /tmp/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
  30 + /star-fj/fangjun/download/github/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
30 ) 31 )
31 32
32 foreach(f IN LISTS possible_file_locations) 33 foreach(f IN LISTS possible_file_locations)
@@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS) @@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS)
14 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 14 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
15 endif() 15 endif()
16 16
17 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-arm-static_lib-1.17.1.zip")  
18 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-arm-static_lib-1.17.1.zip")  
19 -set(onnxruntime_HASH "SHA256=3f2ba38156d2facfb732c0fe53bc1eaaf2791d9a91dd240380e3d53716798b09") 17 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-arm-static_lib-1.18.0.zip")
  18 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-arm-static_lib-1.18.0.zip")
  19 +set(onnxruntime_HASH "SHA256=ba4590a386bc4aae3e03b00ccc1be42edd582fd7ecf5583614e1e0c2e7424652")
20 20
21 # If you don't have access to the Internet, 21 # If you don't have access to the Internet,
22 # please download onnxruntime to one of the following locations. 22 # please download onnxruntime to one of the following locations.
23 # You can add more if you want. 23 # You can add more if you want.
24 set(possible_file_locations 24 set(possible_file_locations
25 - $ENV{HOME}/Downloads/onnxruntime-linux-arm-static_lib-1.17.1.zip  
26 - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.17.1.zip  
27 - ${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.17.1.zip  
28 - /tmp/onnxruntime-linux-arm-static_lib-1.17.1.zip  
29 - /star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.17.1.zip 25 + $ENV{HOME}/Downloads/onnxruntime-linux-arm-static_lib-1.18.0.zip
  26 + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.18.0.zip
  27 + ${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.18.0.zip
  28 + /tmp/onnxruntime-linux-arm-static_lib-1.18.0.zip
  29 + /star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.18.0.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -14,19 +14,20 @@ if(NOT BUILD_SHARED_LIBS) @@ -14,19 +14,20 @@ if(NOT BUILD_SHARED_LIBS)
14 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 14 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
15 endif() 15 endif()
16 16
17 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-arm-1.17.1.zip")  
18 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-arm-1.17.1.zip")  
19 -set(onnxruntime_HASH "SHA256=08eed09b35a015fbf3a068baf6388a3b447d24dec62b75cd591a01179d0bfe7b") 17 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-arm-1.18.0.zip")
  18 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-arm-1.18.0.zip")
  19 +# set(onnxruntime_HASH "SHA256=f713a5e09bff5ff1438c26d26cf283d305e37af1fbd59e9190b17cd7f8d2b1c6")
  20 +set(onnxruntime_HASH) # TODO(fangjun): Update it
20 21
21 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
22 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
23 # You can add more if you want. 24 # You can add more if you want.
24 set(possible_file_locations 25 set(possible_file_locations
25 - $ENV{HOME}/Downloads/onnxruntime-linux-arm-1.17.1.zip  
26 - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-1.17.1.zip  
27 - ${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-1.17.1.zip  
28 - /tmp/onnxruntime-linux-arm-1.17.1.zip  
29 - /star-fj/fangjun/download/github/onnxruntime-linux-arm-1.17.1.zip 26 + $ENV{HOME}/Downloads/onnxruntime-linux-arm-1.18.0.zip
  27 + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-1.18.0.zip
  28 + ${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-1.18.0.zip
  29 + /tmp/onnxruntime-linux-arm-1.18.0.zip
  30 + /star-fj/fangjun/download/github/onnxruntime-linux-arm-1.18.0.zip
30 ) 31 )
31 32
32 foreach(f IN LISTS possible_file_locations) 33 foreach(f IN LISTS possible_file_locations)
@@ -18,19 +18,19 @@ if(NOT SHERPA_ONNX_ENABLE_GPU) @@ -18,19 +18,19 @@ if(NOT SHERPA_ONNX_ENABLE_GPU)
18 message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}") 18 message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}")
19 endif() 19 endif()
20 20
21 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-linux-x64-gpu-1.17.1.tgz")  
22 -set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-linux-x64-gpu-1.17.1.tgz")  
23 -set(onnxruntime_HASH "SHA256=613c53745ea4960ed368f6b3ab673558bb8561c84a8fa781b4ea7fb4a4340be4") 21 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-linux-x64-gpu-1.18.0.tgz")
  22 +set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-linux-x64-gpu-1.18.0.tgz")
  23 +set(onnxruntime_HASH "SHA256=e49980108c0b9dd718c14fa2e6ba3cd90b9ff8e9bde8ebac0a2f1aacdc0603ca")
24 24
25 # If you don't have access to the Internet, 25 # If you don't have access to the Internet,
26 # please download onnxruntime to one of the following locations. 26 # please download onnxruntime to one of the following locations.
27 # You can add more if you want. 27 # You can add more if you want.
28 set(possible_file_locations 28 set(possible_file_locations
29 - $ENV{HOME}/Downloads/onnxruntime-linux-x64-gpu-1.17.1.tgz  
30 - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-gpu-1.17.1.tgz  
31 - ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-gpu-1.17.1.tgz  
32 - /tmp/onnxruntime-linux-x64-gpu-1.17.1.tgz  
33 - /star-fj/fangjun/download/github/onnxruntime-linux-x64-gpu-1.17.1.tgz 29 + $ENV{HOME}/Downloads/onnxruntime-linux-x64-gpu-1.18.0.tgz
  30 + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-gpu-1.18.0.tgz
  31 + ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-gpu-1.18.0.tgz
  32 + /tmp/onnxruntime-linux-x64-gpu-1.18.0.tgz
  33 + /star-fj/fangjun/download/github/onnxruntime-linux-x64-gpu-1.18.0.tgz
34 ) 34 )
35 35
36 foreach(f IN LISTS possible_file_locations) 36 foreach(f IN LISTS possible_file_locations)
@@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS) @@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS)
14 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 14 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
15 endif() 15 endif()
16 16
17 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip")  
18 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip")  
19 -set(onnxruntime_HASH "SHA256=44377e9b7eef618afd10216a597a4d2a09a74727cbc5bdd7d86ca2b6e00a28cb") 17 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip")
  18 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip")
  19 +set(onnxruntime_HASH "SHA256=4112757cb49dd53853748813cb2b5d164c8bec465fff852be247d450b95b0737")
20 20
21 # If you don't have access to the Internet, 21 # If you don't have access to the Internet,
22 # please download onnxruntime to one of the following locations. 22 # please download onnxruntime to one of the following locations.
23 # You can add more if you want. 23 # You can add more if you want.
24 set(possible_file_locations 24 set(possible_file_locations
25 - $ENV{HOME}/Downloads/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip  
26 - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip  
27 - ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip  
28 - /tmp/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip  
29 - /star-fj/fangjun/download/github/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip 25 + $ENV{HOME}/Downloads/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
  26 + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
  27 + ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
  28 + /tmp/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
  29 + /star-fj/fangjun/download/github/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS) @@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS)
14 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 14 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
15 endif() 15 endif()
16 16
17 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip")  
18 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip")  
19 -set(onnxruntime_HASH "SHA256=3cfa5c2c5c21a9401572af5a4cd9d15ed8f6524f10d3b80e5a38676b3a31efe0") 17 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip")
  18 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip")
  19 +set(onnxruntime_HASH "SHA256=96137d33c88a036d5afe64dee5f530a1b78705d41857d8aac88a3c2b53a6a5ac")
20 20
21 # If you don't have access to the Internet, 21 # If you don't have access to the Internet,
22 # please download onnxruntime to one of the following locations. 22 # please download onnxruntime to one of the following locations.
23 # You can add more if you want. 23 # You can add more if you want.
24 set(possible_file_locations 24 set(possible_file_locations
25 - $ENV{HOME}/Downloads/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip  
26 - ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip  
27 - ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip  
28 - /tmp/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip  
29 - /star-fj/fangjun/download/github/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip 25 + $ENV{HOME}/Downloads/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
  26 + ${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
  27 + ${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
  28 + /tmp/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
  29 + /star-fj/fangjun/download/github/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -12,18 +12,18 @@ if(BUILD_SHARED_LIBS) @@ -12,18 +12,18 @@ if(BUILD_SHARED_LIBS)
12 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 12 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
13 endif() 13 endif()
14 14
15 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-arm64-static_lib-1.17.1.zip")  
16 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-arm64-static_lib-1.17.1.zip")  
17 -set(onnxruntime_HASH "SHA256=b88a4017251c159fea005aefe836bd0cf4d0bc7454e2810784f84a42143f17eb") 15 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-arm64-static_lib-1.18.0.zip")
  16 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-arm64-static_lib-1.18.0.zip")
  17 +set(onnxruntime_HASH "SHA256=2faea156041f0658ef60423f5b0a34ba5d9127297b429c73ce98225e66f610bf")
18 18
19 # If you don't have access to the Internet, 19 # If you don't have access to the Internet,
20 # please download onnxruntime to one of the following locations. 20 # please download onnxruntime to one of the following locations.
21 # You can add more if you want. 21 # You can add more if you want.
22 set(possible_file_locations 22 set(possible_file_locations
23 - $ENV{HOME}/Downloads/onnxruntime-osx-arm64-static_lib-1.17.1.zip  
24 - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-static_lib-1.17.1.zip  
25 - ${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-static_lib-1.17.1.zip  
26 - /tmp/onnxruntime-osx-arm64-static_lib-1.17.1.zip 23 + $ENV{HOME}/Downloads/onnxruntime-osx-arm64-static_lib-1.18.0.zip
  24 + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-static_lib-1.18.0.zip
  25 + ${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-static_lib-1.18.0.zip
  26 + /tmp/onnxruntime-osx-arm64-static_lib-1.18.0.zip
27 ) 27 )
28 28
29 foreach(f IN LISTS possible_file_locations) 29 foreach(f IN LISTS possible_file_locations)
@@ -12,18 +12,18 @@ if(NOT BUILD_SHARED_LIBS) @@ -12,18 +12,18 @@ if(NOT BUILD_SHARED_LIBS)
12 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 12 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
13 endif() 13 endif()
14 14
15 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-arm64-1.17.1.tgz")  
16 -set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-arm64-1.17.1.tgz")  
17 -set(onnxruntime_HASH "SHA256=89566f424624a7ad9a7d9d5e413c44b9639a994d7171cf409901d125b16e2bb3") 15 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-arm64-1.18.0.tgz")
  16 +set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-arm64-1.18.0.tgz")
  17 +set(onnxruntime_HASH "SHA256=c5ff520d2913e3360670979ca4fe43717fc3aa0c0c367a75fbb6f2f15c0cb48d")
18 18
19 # If you don't have access to the Internet, 19 # If you don't have access to the Internet,
20 # please download onnxruntime to one of the following locations. 20 # please download onnxruntime to one of the following locations.
21 # You can add more if you want. 21 # You can add more if you want.
22 set(possible_file_locations 22 set(possible_file_locations
23 - $ENV{HOME}/Downloads/onnxruntime-osx-arm64-1.17.1.tgz  
24 - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-1.17.1.tgz  
25 - ${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-1.17.1.tgz  
26 - /tmp/onnxruntime-osx-arm64-1.17.1.tgz 23 + $ENV{HOME}/Downloads/onnxruntime-osx-arm64-1.18.0.tgz
  24 + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-1.18.0.tgz
  25 + ${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-1.18.0.tgz
  26 + /tmp/onnxruntime-osx-arm64-1.18.0.tgz
27 ) 27 )
28 28
29 foreach(f IN LISTS possible_file_locations) 29 foreach(f IN LISTS possible_file_locations)
@@ -13,18 +13,18 @@ if(BUILD_SHARED_LIBS) @@ -13,18 +13,18 @@ if(BUILD_SHARED_LIBS)
13 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 13 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
14 endif() 14 endif()
15 15
16 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-universal2-static_lib-1.17.1.zip")  
17 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-universal2-static_lib-1.17.1.zip")  
18 -set(onnxruntime_HASH "SHA256=45599dbd2fb9dd52d6505930c0e82ca165391e222a68f5606b9ea9d4f3922e15") 16 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-universal2-static_lib-1.18.0.zip")
  17 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-universal2-static_lib-1.18.0.zip")
  18 +set(onnxruntime_HASH "SHA256=a36c250ef90b15467fc126644825b2c4b7983f1f7c718051563f990606ab28f5")
19 19
20 # If you don't have access to the Internet, 20 # If you don't have access to the Internet,
21 # please download onnxruntime to one of the following locations. 21 # please download onnxruntime to one of the following locations.
22 # You can add more if you want. 22 # You can add more if you want.
23 set(possible_file_locations 23 set(possible_file_locations
24 - $ENV{HOME}/Downloads/onnxruntime-osx-universal2-static_lib-1.17.1.zip  
25 - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-static_lib-1.17.1.zip  
26 - ${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-static_lib-1.17.1.zip  
27 - /tmp/onnxruntime-osx-universal2-static_lib-1.17.1.zip 24 + $ENV{HOME}/Downloads/onnxruntime-osx-universal2-static_lib-1.18.0.zip
  25 + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-static_lib-1.18.0.zip
  26 + ${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-static_lib-1.18.0.zip
  27 + /tmp/onnxruntime-osx-universal2-static_lib-1.18.0.zip
28 ) 28 )
29 29
30 foreach(f IN LISTS possible_file_locations) 30 foreach(f IN LISTS possible_file_locations)
@@ -13,18 +13,18 @@ if(NOT BUILD_SHARED_LIBS) @@ -13,18 +13,18 @@ if(NOT BUILD_SHARED_LIBS)
13 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 13 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
14 endif() 14 endif()
15 15
16 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-universal2-1.17.1.tgz")  
17 -set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-universal2-1.17.1.tgz")  
18 -set(onnxruntime_HASH "SHA256=9fa57fa6f202a373599377ef75064ae568fda8da838632b26a86024c7378d306") 16 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-universal2-1.18.0.tgz")
  17 +set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-universal2-1.18.0.tgz")
  18 +set(onnxruntime_HASH "SHA256=4df8e1fec0190ee504a68469591e8715c04bfe9deba2bb7e8985c07360c1c0f8")
19 19
20 # If you don't have access to the Internet, 20 # If you don't have access to the Internet,
21 # please download onnxruntime to one of the following locations. 21 # please download onnxruntime to one of the following locations.
22 # You can add more if you want. 22 # You can add more if you want.
23 set(possible_file_locations 23 set(possible_file_locations
24 - $ENV{HOME}/Downloads/onnxruntime-osx-universal2-1.17.1.tgz  
25 - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-1.17.1.tgz  
26 - ${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-1.17.1.tgz  
27 - /tmp/onnxruntime-osx-universal2-1.17.1.tgz 24 + $ENV{HOME}/Downloads/onnxruntime-osx-universal2-1.18.0.tgz
  25 + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-1.18.0.tgz
  26 + ${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-1.18.0.tgz
  27 + /tmp/onnxruntime-osx-universal2-1.18.0.tgz
28 ) 28 )
29 29
30 foreach(f IN LISTS possible_file_locations) 30 foreach(f IN LISTS possible_file_locations)
@@ -12,18 +12,18 @@ if(BUILD_SHARED_LIBS) @@ -12,18 +12,18 @@ if(BUILD_SHARED_LIBS)
12 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 12 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
13 endif() 13 endif()
14 14
15 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-x86_64-static_lib-1.17.1.zip")  
16 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-x86_64-static_lib-1.17.1.zip")  
17 -set(onnxruntime_HASH "SHA256=5ff8efb97e50e257943c6c588328d2c57b649278098d3b468036f02755b60903") 15 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-x86_64-static_lib-1.18.0.zip")
  16 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-x86_64-static_lib-1.18.0.zip")
  17 +set(onnxruntime_HASH "SHA256=a7ccc5f7acce2554a43174ff7c2efc5fa71d7dc0a5a91208096120cc775a9575")
18 18
19 # If you don't have access to the Internet, 19 # If you don't have access to the Internet,
20 # please download onnxruntime to one of the following locations. 20 # please download onnxruntime to one of the following locations.
21 # You can add more if you want. 21 # You can add more if you want.
22 set(possible_file_locations 22 set(possible_file_locations
23 - $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-static_lib-1.17.1.zip  
24 - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-static_lib-1.17.1.zip  
25 - ${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-static_lib-1.17.1.zip  
26 - /tmp/onnxruntime-osx-x86_64-static_lib-1.17.1.zip 23 + $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-static_lib-1.18.0.zip
  24 + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-static_lib-1.18.0.zip
  25 + ${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-static_lib-1.18.0.zip
  26 + /tmp/onnxruntime-osx-x86_64-static_lib-1.18.0.zip
27 ) 27 )
28 28
29 foreach(f IN LISTS possible_file_locations) 29 foreach(f IN LISTS possible_file_locations)
@@ -12,18 +12,18 @@ if(NOT BUILD_SHARED_LIBS) @@ -12,18 +12,18 @@ if(NOT BUILD_SHARED_LIBS)
12 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 12 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
13 endif() 13 endif()
14 14
15 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-x86_64-1.17.1.tgz")  
16 -set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-x86_64-1.17.1.tgz")  
17 -set(onnxruntime_HASH "SHA256=86c6b6896434084ff5086eebc4e9ea90be1ed4d46743f92864f46ee43e7b5059") 15 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-x86_64-1.18.0.tgz")
  16 +set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-x86_64-1.18.0.tgz")
  17 +set(onnxruntime_HASH "SHA256=3af96893675b295e5e0eb886f470de585089f92f9950158d042fbc02b44ed101")
18 18
19 # If you don't have access to the Internet, 19 # If you don't have access to the Internet,
20 # please download onnxruntime to one of the following locations. 20 # please download onnxruntime to one of the following locations.
21 # You can add more if you want. 21 # You can add more if you want.
22 set(possible_file_locations 22 set(possible_file_locations
23 - $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-1.17.1.tgz  
24 - ${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-1.17.1.tgz  
25 - ${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-1.17.1.tgz  
26 - /tmp/onnxruntime-osx-x86_64-1.17.1.tgz 23 + $ENV{HOME}/Downloads/onnxruntime-osx-x86_64-1.18.0.tgz
  24 + ${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-1.18.0.tgz
  25 + ${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-1.18.0.tgz
  26 + /tmp/onnxruntime-osx-x86_64-1.18.0.tgz
27 ) 27 )
28 28
29 foreach(f IN LISTS possible_file_locations) 29 foreach(f IN LISTS possible_file_locations)
@@ -10,19 +10,19 @@ if(BUILD_SHARED_LIBS) @@ -10,19 +10,19 @@ if(BUILD_SHARED_LIBS)
10 message(FATAL_ERROR "BUILD_SHARED_LIBS should be OFF for WebAssembly") 10 message(FATAL_ERROR "BUILD_SHARED_LIBS should be OFF for WebAssembly")
11 endif() 11 endif()
12 12
13 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-wasm-static_lib-simd-1.17.1.zip")  
14 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-wasm-static_lib-simd-1.17.1.zip")  
15 -set(onnxruntime_HASH "SHA256=8f07778e4233cf5a61a9d0795d90c5497177fbe8a46b701fda2d8d4e2b11cef8") 13 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-wasm-static_lib-simd-1.18.0.zip")
  14 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-wasm-static_lib-simd-1.18.0.zip")
  15 +set(onnxruntime_HASH "SHA256=590e8c8b292304e9c4ed34d980ce3fe028c76f2594e7f2d88cda80248757c6fb")
16 16
17 # If you don't have access to the Internet, 17 # If you don't have access to the Internet,
18 # please download onnxruntime to one of the following locations. 18 # please download onnxruntime to one of the following locations.
19 # You can add more if you want. 19 # You can add more if you want.
20 set(possible_file_locations 20 set(possible_file_locations
21 - $ENV{HOME}/Downloads/onnxruntime-wasm-static_lib-simd-1.17.1.zip  
22 - ${CMAKE_SOURCE_DIR}/onnxruntime-wasm-static_lib-simd-1.17.1.zip  
23 - ${CMAKE_BINARY_DIR}/onnxruntime-wasm-static_lib-simd-1.17.1.zip  
24 - /tmp/onnxruntime-wasm-static_lib-simd-1.17.1.zip  
25 - /star-fj/fangjun/download/github/onnxruntime-wasm-static_lib-simd-1.17.1.zip 21 + $ENV{HOME}/Downloads/onnxruntime-wasm-static_lib-simd-1.18.0.zip
  22 + ${CMAKE_SOURCE_DIR}/onnxruntime-wasm-static_lib-simd-1.18.0.zip
  23 + ${CMAKE_BINARY_DIR}/onnxruntime-wasm-static_lib-simd-1.18.0.zip
  24 + /tmp/onnxruntime-wasm-static_lib-simd-1.18.0.zip
  25 + /star-fj/fangjun/download/github/onnxruntime-wasm-static_lib-simd-1.18.0.zip
26 ) 26 )
27 27
28 foreach(f IN LISTS possible_file_locations) 28 foreach(f IN LISTS possible_file_locations)
@@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS) @@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS)
15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
16 endif() 16 endif()
17 17
18 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-arm64-1.17.1.zip")  
19 -set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-arm64-1.17.1.zip")  
20 -set(onnxruntime_HASH "SHA256=47782cebcab0fd7a1f0a3f0676b088c1bc0f4fbf21666f6fe57570dc362fa5a8") 18 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-arm64-1.18.0.zip")
  19 +set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-arm64-1.18.0.zip")
  20 +set(onnxruntime_HASH "SHA256=cd8859437d71b43beb942e0f2515d27d20aa8f753b8e9c2efa01476eb1a57023")
21 21
22 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
23 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
24 # You can add more if you want. 24 # You can add more if you want.
25 set(possible_file_locations 25 set(possible_file_locations
26 - $ENV{HOME}/Downloads/onnxruntime-win-arm64-1.17.1.zip  
27 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-arm64-1.17.1.zip  
28 - ${CMAKE_BINARY_DIR}/onnxruntime-win-arm64-1.17.1.zip  
29 - /tmp/onnxruntime-win-arm64-1.17.1.zip 26 + $ENV{HOME}/Downloads/onnxruntime-win-arm64-1.18.0.zip
  27 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-arm64-1.18.0.zip
  28 + ${CMAKE_BINARY_DIR}/onnxruntime-win-arm64-1.18.0.zip
  29 + /tmp/onnxruntime-win-arm64-1.18.0.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -19,18 +19,18 @@ if(NOT SHERPA_ONNX_ENABLE_GPU) @@ -19,18 +19,18 @@ if(NOT SHERPA_ONNX_ENABLE_GPU)
19 message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}") 19 message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}")
20 endif() 20 endif()
21 21
22 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x64-gpu-1.17.1.zip")  
23 -set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x64-gpu-1.17.1.zip")  
24 -set(onnxruntime_HASH "SHA256=b7a66f50ad146c2ccb43471d2d3b5ad78084c2d4ddbd3ea82d65f86c867408b2") 22 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x64-gpu-1.18.0.zip")
  23 +set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x64-gpu-1.18.0.zip")
  24 +set(onnxruntime_HASH "SHA256=ec3b668fdc818b20dbabf083b488f979dce4a61c8b922af9e79e81277ac0e322")
25 25
26 # If you don't have access to the Internet, 26 # If you don't have access to the Internet,
27 # please download onnxruntime to one of the following locations. 27 # please download onnxruntime to one of the following locations.
28 # You can add more if you want. 28 # You can add more if you want.
29 set(possible_file_locations 29 set(possible_file_locations
30 - $ENV{HOME}/Downloads/onnxruntime-win-x64-gpu-1.17.1.zip  
31 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-gpu-1.17.1.zip  
32 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-gpu-1.17.1.zip  
33 - /tmp/onnxruntime-win-x64-gpu-1.17.1.zip 30 + $ENV{HOME}/Downloads/onnxruntime-win-x64-gpu-1.18.0.zip
  31 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-gpu-1.18.0.zip
  32 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-gpu-1.18.0.zip
  33 + /tmp/onnxruntime-win-x64-gpu-1.18.0.zip
34 ) 34 )
35 35
36 foreach(f IN LISTS possible_file_locations) 36 foreach(f IN LISTS possible_file_locations)
@@ -15,14 +15,14 @@ if(BUILD_SHARED_LIBS) @@ -15,14 +15,14 @@ if(BUILD_SHARED_LIBS)
15 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 15 message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
16 endif() 16 endif()
17 17
18 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2")  
19 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2") 18 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2")
  19 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2")
20 if(CMAKE_BUILD_TYPE STREQUAL Debug) 20 if(CMAKE_BUILD_TYPE STREQUAL Debug)
21 - set(onnxruntime_HASH "SHA256=ecc68d914541c3b6ebc36148af63fe2a6af0f4f955b35199d612698d23169fa5") 21 + set(onnxruntime_HASH "SHA256=1fbb751fcf5360466aeb4fdf0d919e891d3c7fcaf9cdda26bc82c5ff9d07b15c")
22 elseif(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo) 22 elseif(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
23 - set(onnxruntime_HASH "SHA256=7cbe58273e55d033568f84fb16d220cea4e25ec29eb7db405c4ac7b6e41f2dfa") 23 + set(onnxruntime_HASH "SHA256=fb59483e6e384ad6e48fe68f04716a9adef9a0106bcf2be74821a49c785be39e")
24 elseif(CMAKE_BUILD_TYPE STREQUAL MinSizeRel) 24 elseif(CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
25 - set(onnxruntime_HASH "SHA256=9eb3adf0f6ac3b0e9f118e0d9e686f50fc651394e0b0cc569275af6e3ffed0e0") 25 + set(onnxruntime_HASH "SHA256=4f2c818b1a31006d783aae929a2ad649af94797eea4dad61ab5044731daab2c9")
26 else() 26 else()
27 message(FATAL_ERROR "This file is for building a debug version on Windows x64. Given ${CMAKE_BUILD_TYPE}") 27 message(FATAL_ERROR "This file is for building a debug version on Windows x64. Given ${CMAKE_BUILD_TYPE}")
28 endif() 28 endif()
@@ -31,10 +31,10 @@ endif() @@ -31,10 +31,10 @@ endif()
31 # please download onnxruntime to one of the following locations. 31 # please download onnxruntime to one of the following locations.
32 # You can add more if you want. 32 # You can add more if you want.
33 set(possible_file_locations 33 set(possible_file_locations
34 - $ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2  
35 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2  
36 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2  
37 - /tmp/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2 34 + $ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
  35 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
  36 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
  37 + /tmp/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
38 ) 38 )
39 39
40 foreach(f IN LISTS possible_file_locations) 40 foreach(f IN LISTS possible_file_locations)
@@ -19,18 +19,18 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL Release) @@ -19,18 +19,18 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL Release)
19 message(FATAL_ERROR "This file is for building a release version on Windows x64") 19 message(FATAL_ERROR "This file is for building a release version on Windows x64")
20 endif() 20 endif()
21 21
22 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2")  
23 -set(onnxruntime_URL2 "https://hub.nuaa.cf/github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2")  
24 -set(onnxruntime_HASH "SHA256=42a0c02fda945d1d72433b2a7cdb2187d51cb4d7f3af462c6ae07b25314d5fb3") 22 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2")
  23 +set(onnxruntime_URL2 "https://hub.nuaa.cf/github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2")
  24 +set(onnxruntime_HASH "SHA256=dcbe48216fe0e5356ddd14e2f48fa1567bbb22792fe156c6252afb044178b2de")
25 25
26 # If you don't have access to the Internet, 26 # If you don't have access to the Internet,
27 # please download onnxruntime to one of the following locations. 27 # please download onnxruntime to one of the following locations.
28 # You can add more if you want. 28 # You can add more if you want.
29 set(possible_file_locations 29 set(possible_file_locations
30 - $ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2  
31 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2  
32 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2  
33 - /tmp/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2 30 + $ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2
  31 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2
  32 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2
  33 + /tmp/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2
34 ) 34 )
35 35
36 foreach(f IN LISTS possible_file_locations) 36 foreach(f IN LISTS possible_file_locations)
@@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS) @@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS)
15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
16 endif() 16 endif()
17 17
18 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x64-1.17.1.zip")  
19 -set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x64-1.17.1.zip")  
20 -set(onnxruntime_HASH "SHA256=4802af9598db02153d7da39432a48823ff69b2fb4b59155461937f20782aa91c") 18 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x64-1.18.0.zip")
  19 +set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x64-1.18.0.zip")
  20 +set(onnxruntime_HASH "SHA256=a91af21ca8f9bdfa5a1aac3fdd0591384b4e2866d41612925f1758d5522829e7")
21 21
22 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
23 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
24 # You can add more if you want. 24 # You can add more if you want.
25 set(possible_file_locations 25 set(possible_file_locations
26 - $ENV{HOME}/Downloads/onnxruntime-win-x64-1.17.1.zip  
27 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-1.17.1.zip  
28 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-1.17.1.zip  
29 - /tmp/onnxruntime-win-x64-1.17.1.zip 26 + $ENV{HOME}/Downloads/onnxruntime-win-x64-1.18.0.zip
  27 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-1.18.0.zip
  28 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x64-1.18.0.zip
  29 + /tmp/onnxruntime-win-x64-1.18.0.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -16,14 +16,14 @@ if(BUILD_SHARED_LIBS) @@ -16,14 +16,14 @@ if(BUILD_SHARED_LIBS)
16 endif() 16 endif()
17 17
18 18
19 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2")  
20 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2") 19 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2")
  20 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2")
21 if(CMAKE_BUILD_TYPE STREQUAL Debug) 21 if(CMAKE_BUILD_TYPE STREQUAL Debug)
22 - set(onnxruntime_HASH "SHA256=b08b223fe09a5640472eec487ff42e4df6bf726e8aba9de40f443a1fabea3334") 22 + set(onnxruntime_HASH "SHA256=0ccb0820a14e54e5cdbb5125647c8c6f72c8bb1ed2324945b1db2a9f35030103")
23 elseif(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo) 23 elseif(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
24 - set(onnxruntime_HASH "SHA256=215c68d4cf07fab47434059544f4b3e1885bb68149fc7ce5b78a9feb08cf6baa") 24 + set(onnxruntime_HASH "SHA256=9740689365f611b48d25bb0a7521848a2ea4a5365c37e85766c6f7925e0ba887")
25 elseif(CMAKE_BUILD_TYPE STREQUAL MinSizeRel) 25 elseif(CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
26 - set(onnxruntime_HASH "SHA256=af6ff6f6a7ca6fb9f037bdd1cbd9b973921d069f7fce69833627ce04674bf579") 26 + set(onnxruntime_HASH "SHA256=4b35849c452a717e9e4b88ea267beba92f4806cc29e7773dda07fa7a59897e12")
27 else() 27 else()
28 message(FATAL_ERROR "This file is for building a debug version on Windows x86. Given ${CMAKE_BUILD_TYPE}") 28 message(FATAL_ERROR "This file is for building a debug version on Windows x86. Given ${CMAKE_BUILD_TYPE}")
29 endif() 29 endif()
@@ -32,10 +32,10 @@ endif() @@ -32,10 +32,10 @@ endif()
32 # please download onnxruntime to one of the following locations. 32 # please download onnxruntime to one of the following locations.
33 # You can add more if you want. 33 # You can add more if you want.
34 set(possible_file_locations 34 set(possible_file_locations
35 - $ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2  
36 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2  
37 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2  
38 - /tmp/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2 35 + $ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
  36 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
  37 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
  38 + /tmp/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
39 ) 39 )
40 40
41 foreach(f IN LISTS possible_file_locations) 41 foreach(f IN LISTS possible_file_locations)
@@ -19,18 +19,18 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL Release) @@ -19,18 +19,18 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL Release)
19 message(FATAL_ERROR "This file is for building a release version on Windows x86") 19 message(FATAL_ERROR "This file is for building a release version on Windows x86")
20 endif() 20 endif()
21 21
22 -set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2")  
23 -set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2")  
24 -set(onnxruntime_HASH "SHA256=52375d3fabc7b437c955a664bfeb9cb7a6391f5219c4b7d3b87ff690416d4b9e") 22 +set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2")
  23 +set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2")
  24 +set(onnxruntime_HASH "SHA256=895c9e284a0365732467fe19b018e3949c0755148fc386cf6d8f8e28f1a7ed80")
25 25
26 # If you don't have access to the Internet, 26 # If you don't have access to the Internet,
27 # please download onnxruntime to one of the following locations. 27 # please download onnxruntime to one of the following locations.
28 # You can add more if you want. 28 # You can add more if you want.
29 set(possible_file_locations 29 set(possible_file_locations
30 - $ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2  
31 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2  
32 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2  
33 - /tmp/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2 30 + $ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2
  31 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2
  32 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2
  33 + /tmp/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2
34 ) 34 )
35 35
36 foreach(f IN LISTS possible_file_locations) 36 foreach(f IN LISTS possible_file_locations)
@@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS) @@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS)
15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}") 15 message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
16 endif() 16 endif()
17 17
18 -set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x86-1.17.1.zip")  
19 -set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x86-1.17.1.zip")  
20 -set(onnxruntime_HASH "SHA256=9404130825474bd36b2538ed925d6b5f2cf1fb6a443f3e125054ae3470019291") 18 +set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x86-1.18.0.zip")
  19 +set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x86-1.18.0.zip")
  20 +set(onnxruntime_HASH "SHA256=b71a6ea9f7fee248ce79dadab45cf522a44a74270c85f8e4ff1ca6ab6bcbae42")
21 21
22 # If you don't have access to the Internet, 22 # If you don't have access to the Internet,
23 # please download onnxruntime to one of the following locations. 23 # please download onnxruntime to one of the following locations.
24 # You can add more if you want. 24 # You can add more if you want.
25 set(possible_file_locations 25 set(possible_file_locations
26 - $ENV{HOME}/Downloads/onnxruntime-win-x86-1.17.1.zip  
27 - ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-1.17.1.zip  
28 - ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-1.17.1.zip  
29 - /tmp/onnxruntime-win-x86-1.17.1.zip 26 + $ENV{HOME}/Downloads/onnxruntime-win-x86-1.18.0.zip
  27 + ${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-1.18.0.zip
  28 + ${CMAKE_BINARY_DIR}/onnxruntime-win-x86-1.18.0.zip
  29 + /tmp/onnxruntime-win-x86-1.18.0.zip
30 ) 30 )
31 31
32 foreach(f IN LISTS possible_file_locations) 32 foreach(f IN LISTS possible_file_locations)
@@ -10,7 +10,7 @@ environment: @@ -10,7 +10,7 @@ environment:
10 10
11 # Add regular dependencies here. 11 # Add regular dependencies here.
12 dependencies: 12 dependencies:
13 - sherpa_onnx: ^1.10.12 13 + sherpa_onnx: ^1.10.13
14 path: ^1.9.0 14 path: ^1.9.0
15 args: ^2.5.0 15 args: ^2.5.0
16 16
@@ -4,11 +4,11 @@ set -ex @@ -4,11 +4,11 @@ set -ex
4 4
5 dart pub get 5 dart pub get
6 6
7 -if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
8 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 7 +if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  8 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
9 9
10 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
11 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 10 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  11 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
12 fi 12 fi
13 13
14 if [ ! -f ./itn-zh-number.wav ]; then 14 if [ ! -f ./itn-zh-number.wav ]; then
@@ -21,7 +21,7 @@ fi @@ -21,7 +21,7 @@ fi
21 21
22 dart run \ 22 dart run \
23 ./bin/paraformer-itn.dart \ 23 ./bin/paraformer-itn.dart \
24 - --model ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \  
25 - --tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \ 24 + --model ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
  25 + --tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
26 --rule-fsts ./itn_zh_number.fst \ 26 --rule-fsts ./itn_zh_number.fst \
27 --input-wav ./itn-zh-number.wav 27 --input-wav ./itn-zh-number.wav
@@ -4,15 +4,15 @@ set -ex @@ -4,15 +4,15 @@ set -ex
4 4
5 dart pub get 5 dart pub get
6 6
7 -if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
8 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 7 +if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  8 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
9 9
10 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
11 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 10 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  11 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
12 fi 12 fi
13 13
14 dart run \ 14 dart run \
15 ./bin/paraformer.dart \ 15 ./bin/paraformer.dart \
16 - --model ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \  
17 - --tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \  
18 - --input-wav ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/3-sichuan.wav 16 + --model ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
  17 + --tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
  18 + --input-wav ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/3-sichuan.wav
@@ -12,16 +12,16 @@ if [[ ! -f ./lei-jun-test.wav ]]; then @@ -12,16 +12,16 @@ if [[ ! -f ./lei-jun-test.wav ]]; then
12 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav 12 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav
13 fi 13 fi
14 14
15 -if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
16 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 15 +if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  16 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
17 17
18 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
19 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 18 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  19 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
20 fi 20 fi
21 21
22 dart run \ 22 dart run \
23 ./bin/vad-with-paraformer.dart \ 23 ./bin/vad-with-paraformer.dart \
24 --silero-vad ./silero_vad.onnx \ 24 --silero-vad ./silero_vad.onnx \
25 - --model ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \  
26 - --tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \ 25 + --model ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
  26 + --tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
27 --input-wav ./lei-jun-test.wav 27 --input-wav ./lei-jun-test.wav
@@ -11,7 +11,7 @@ environment: @@ -11,7 +11,7 @@ environment:
11 11
12 # Add regular dependencies here. 12 # Add regular dependencies here.
13 dependencies: 13 dependencies:
14 - sherpa_onnx: ^1.10.12 14 + sherpa_onnx: ^1.10.13
15 path: ^1.9.0 15 path: ^1.9.0
16 args: ^2.5.0 16 args: ^2.5.0
17 17
@@ -8,7 +8,7 @@ environment: @@ -8,7 +8,7 @@ environment:
8 8
9 # Add regular dependencies here. 9 # Add regular dependencies here.
10 dependencies: 10 dependencies:
11 - sherpa_onnx: ^1.10.12 11 + sherpa_onnx: ^1.10.13
12 path: ^1.9.0 12 path: ^1.9.0
13 args: ^2.5.0 13 args: ^2.5.0
14 14
@@ -9,7 +9,7 @@ environment: @@ -9,7 +9,7 @@ environment:
9 sdk: ^3.4.0 9 sdk: ^3.4.0
10 10
11 dependencies: 11 dependencies:
12 - sherpa_onnx: ^1.10.12 12 + sherpa_onnx: ^1.10.13
13 path: ^1.9.0 13 path: ^1.9.0
14 args: ^2.5.0 14 args: ^2.5.0
15 15
@@ -118,13 +118,13 @@ to download pre-trained non-streaming zipformer models. @@ -118,13 +118,13 @@ to download pre-trained non-streaming zipformer models.
118 # Paraformer 118 # Paraformer
119 119
120 dotnet run \ 120 dotnet run \
121 - --tokens=./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \  
122 - --paraformer=./sherpa-onnx-paraformer-zh-2023-03-28/model.onnx \ 121 + --tokens=./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
  122 + --paraformer=./sherpa-onnx-paraformer-zh-2023-09-14/model.onnx \
123 --files ./sherpa-onnx-zipformer-en-2023-04-01/test_wavs/0.wav \ 123 --files ./sherpa-onnx-zipformer-en-2023-04-01/test_wavs/0.wav \
124 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav \  
125 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/1.wav \  
126 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/2.wav \  
127 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/8k.wav 124 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav \
  125 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/1.wav \
  126 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/2.wav \
  127 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/8k.wav
128 128
129 Please refer to 129 Please refer to
130 https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/index.html 130 https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/index.html
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 2
3 set -ex 3 set -ex
4 4
5 -if [ ! -d ./sherpa-onnx-paraformer-zh-2023-03-28 ]; then  
6 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
7 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
8 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 5 +if [ ! -d ./sherpa-onnx-paraformer-zh-2023-09-14 ]; then
  6 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  7 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  8 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
9 fi 9 fi
10 10
11 if [ ! -f ./itn-zh-number.wav ]; then 11 if [ ! -f ./itn-zh-number.wav ]; then
@@ -17,8 +17,8 @@ if [ ! -f ./itn_zh_number.fst ]; then @@ -17,8 +17,8 @@ if [ ! -f ./itn_zh_number.fst ]; then
17 fi 17 fi
18 18
19 dotnet run \ 19 dotnet run \
20 - --tokens=./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \  
21 - --paraformer=./sherpa-onnx-paraformer-zh-2023-03-28/model.onnx \ 20 + --tokens=./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
  21 + --paraformer=./sherpa-onnx-paraformer-zh-2023-09-14/model.onnx \
22 --rule-fsts=./itn_zh_number.fst \ 22 --rule-fsts=./itn_zh_number.fst \
23 --num-threads=2 \ 23 --num-threads=2 \
24 --files ./itn-zh-number.wav 24 --files ./itn-zh-number.wav
@@ -2,17 +2,17 @@ @@ -2,17 +2,17 @@
2 2
3 set -ex 3 set -ex
4 4
5 -if [ ! -d ./sherpa-onnx-paraformer-zh-2023-03-28 ]; then  
6 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
7 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
8 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 5 +if [ ! -d ./sherpa-onnx-paraformer-zh-2023-09-14 ]; then
  6 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  7 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  8 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
9 fi 9 fi
10 10
11 dotnet run \ 11 dotnet run \
12 - --tokens=./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \  
13 - --paraformer=./sherpa-onnx-paraformer-zh-2023-03-28/model.onnx \ 12 + --tokens=./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
  13 + --paraformer=./sherpa-onnx-paraformer-zh-2023-09-14/model.onnx \
14 --num-threads=2 \ 14 --num-threads=2 \
15 - --files ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav \  
16 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/1.wav \  
17 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/2.wav \  
18 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/8k.wav 15 + --files ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav \
  16 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/1.wav \
  17 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/2.wav \
  18 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/8k.wav
@@ -13,8 +13,8 @@ class VadNonStreamingAsrParaformer @@ -13,8 +13,8 @@ class VadNonStreamingAsrParaformer
13 // please download model files from 13 // please download model files from
14 // https://github.com/k2-fsa/sherpa-onnx/releases/tag/asr-models 14 // https://github.com/k2-fsa/sherpa-onnx/releases/tag/asr-models
15 OfflineRecognizerConfig config = new OfflineRecognizerConfig(); 15 OfflineRecognizerConfig config = new OfflineRecognizerConfig();
16 - config.ModelConfig.Paraformer.Model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";  
17 - config.ModelConfig.Tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt"; 16 + config.ModelConfig.Paraformer.Model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
  17 + config.ModelConfig.Tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
18 config.ModelConfig.Debug = 0; 18 config.ModelConfig.Debug = 0;
19 OfflineRecognizer recognizer = new OfflineRecognizer(config); 19 OfflineRecognizer recognizer = new OfflineRecognizer(config);
20 20
@@ -10,11 +10,11 @@ if [ ! -f ./lei-jun-test.wav ]; then @@ -10,11 +10,11 @@ if [ ! -f ./lei-jun-test.wav ]; then
10 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav 10 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav
11 fi 11 fi
12 12
13 -if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
14 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 13 +if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  14 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
15 15
16 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
17 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 16 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  17 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
18 fi 18 fi
19 19
20 dotnet run 20 dotnet run
@@ -5,7 +5,7 @@ description: > @@ -5,7 +5,7 @@ description: >
5 5
6 publish_to: 'none' 6 publish_to: 'none'
7 7
8 -version: 1.10.12 8 +version: 1.10.13
9 9
10 topics: 10 topics:
11 - speech-recognition 11 - speech-recognition
@@ -30,7 +30,7 @@ dependencies: @@ -30,7 +30,7 @@ dependencies:
30 record: ^5.1.0 30 record: ^5.1.0
31 url_launcher: ^6.2.6 31 url_launcher: ^6.2.6
32 32
33 - sherpa_onnx: ^1.10.12 33 + sherpa_onnx: ^1.10.13
34 # sherpa_onnx: 34 # sherpa_onnx:
35 # path: ../../flutter/sherpa_onnx 35 # path: ../../flutter/sherpa_onnx
36 36
@@ -17,7 +17,7 @@ dependencies: @@ -17,7 +17,7 @@ dependencies:
17 cupertino_icons: ^1.0.6 17 cupertino_icons: ^1.0.6
18 path_provider: ^2.1.3 18 path_provider: ^2.1.3
19 path: ^1.9.0 19 path: ^1.9.0
20 - sherpa_onnx: ^1.10.12 20 + sherpa_onnx: ^1.10.13
21 url_launcher: ^6.2.6 21 url_launcher: ^6.2.6
22 audioplayers: ^5.0.0 22 audioplayers: ^5.0.0
23 23
@@ -17,7 +17,7 @@ topics: @@ -17,7 +17,7 @@ topics:
17 - voice-activity-detection 17 - voice-activity-detection
18 18
19 # remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec 19 # remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec
20 -version: 1.10.12 20 +version: 1.10.13
21 21
22 homepage: https://github.com/k2-fsa/sherpa-onnx 22 homepage: https://github.com/k2-fsa/sherpa-onnx
23 23
@@ -30,19 +30,19 @@ dependencies: @@ -30,19 +30,19 @@ dependencies:
30 flutter: 30 flutter:
31 sdk: flutter 31 sdk: flutter
32 32
33 - sherpa_onnx_android: ^1.10.12 33 + sherpa_onnx_android: ^1.10.13
34 # path: ../sherpa_onnx_android 34 # path: ../sherpa_onnx_android
35 35
36 - sherpa_onnx_macos: ^1.10.12 36 + sherpa_onnx_macos: ^1.10.13
37 # path: ../sherpa_onnx_macos 37 # path: ../sherpa_onnx_macos
38 38
39 - sherpa_onnx_linux: ^1.10.12 39 + sherpa_onnx_linux: ^1.10.13
40 # path: ../sherpa_onnx_linux 40 # path: ../sherpa_onnx_linux
41 # 41 #
42 - sherpa_onnx_windows: ^1.10.12 42 + sherpa_onnx_windows: ^1.10.13
43 # path: ../sherpa_onnx_windows 43 # path: ../sherpa_onnx_windows
44 44
45 - sherpa_onnx_ios: ^1.10.12 45 + sherpa_onnx_ios: ^1.10.13
46 # sherpa_onnx_ios: 46 # sherpa_onnx_ios:
47 # path: ../sherpa_onnx_ios 47 # path: ../sherpa_onnx_ios
48 48
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 # https://groups.google.com/g/dart-ffi/c/nUATMBy7r0c 7 # https://groups.google.com/g/dart-ffi/c/nUATMBy7r0c
8 Pod::Spec.new do |s| 8 Pod::Spec.new do |s|
9 s.name = 'sherpa_onnx_ios' 9 s.name = 'sherpa_onnx_ios'
10 - s.version = '1.10.12' 10 + s.version = '1.10.13'
11 s.summary = 'A new Flutter FFI plugin project.' 11 s.summary = 'A new Flutter FFI plugin project.'
12 s.description = <<-DESC 12 s.description = <<-DESC
13 A new Flutter FFI plugin project. 13 A new Flutter FFI plugin project.
@@ -12,6 +12,6 @@ project(${PROJECT_NAME} LANGUAGES CXX) @@ -12,6 +12,6 @@ project(${PROJECT_NAME} LANGUAGES CXX)
12 # external build triggered from this build file. 12 # external build triggered from this build file.
13 set(sherpa_onnx_linux_bundled_libraries 13 set(sherpa_onnx_linux_bundled_libraries
14 "${CMAKE_CURRENT_SOURCE_DIR}/libsherpa-onnx-c-api.so" 14 "${CMAKE_CURRENT_SOURCE_DIR}/libsherpa-onnx-c-api.so"
15 - "${CMAKE_CURRENT_SOURCE_DIR}/libonnxruntime.so.1.17.1" 15 + "${CMAKE_CURRENT_SOURCE_DIR}/libonnxruntime.so"
16 PARENT_SCOPE 16 PARENT_SCOPE
17 ) 17 )
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 # 4 #
5 Pod::Spec.new do |s| 5 Pod::Spec.new do |s|
6 s.name = 'sherpa_onnx_macos' 6 s.name = 'sherpa_onnx_macos'
7 - s.version = '1.10.12' 7 + s.version = '1.10.13'
8 s.summary = 'sherpa-onnx Flutter FFI plugin project.' 8 s.summary = 'sherpa-onnx Flutter FFI plugin project.'
9 s.description = <<-DESC 9 s.description = <<-DESC
10 sherpa-onnx Flutter FFI plugin project. 10 sherpa-onnx Flutter FFI plugin project.
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 2
3 set -ex 3 set -ex
4 4
5 -if [ ! -d sherpa-onnx-paraformer-zh-2023-03-28 ]; then  
6 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
7 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
8 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 5 +if [ ! -d sherpa-onnx-paraformer-zh-2023-09-14 ]; then
  6 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  7 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  8 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
9 fi 9 fi
10 10
11 if [ ! -f ./itn-zh-number.wav ]; then 11 if [ ! -f ./itn-zh-number.wav ]; then
@@ -20,8 +20,8 @@ go mod tidy @@ -20,8 +20,8 @@ go mod tidy
20 go build 20 go build
21 21
22 ./non-streaming-decode-files \ 22 ./non-streaming-decode-files \
23 - --paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \  
24 - --tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \ 23 + --paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
  24 + --tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
25 --model-type paraformer \ 25 --model-type paraformer \
26 --rule-fsts ./itn_zh_number.fst \ 26 --rule-fsts ./itn_zh_number.fst \
27 --debug 0 \ 27 --debug 0 \
@@ -2,18 +2,18 @@ @@ -2,18 +2,18 @@
2 2
3 set -ex 3 set -ex
4 4
5 -if [ ! -d sherpa-onnx-paraformer-zh-2023-03-28 ]; then  
6 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
7 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
8 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 5 +if [ ! -d sherpa-onnx-paraformer-zh-2023-09-14 ]; then
  6 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  7 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  8 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
9 fi 9 fi
10 10
11 go mod tidy 11 go mod tidy
12 go build 12 go build
13 13
14 ./non-streaming-decode-files \ 14 ./non-streaming-decode-files \
15 - --paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \  
16 - --tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \ 15 + --paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
  16 + --tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
17 --model-type paraformer \ 17 --model-type paraformer \
18 --debug 0 \ 18 --debug 0 \
19 - ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav 19 + ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 C984A82729AA196100D74C52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; 57 C984A82729AA196100D74C52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
58 C984A82929AA19AC00D74C52 /* Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; }; 58 C984A82929AA19AC00D74C52 /* Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
59 C984A83B29AA430B00D74C52 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; 59 C984A83B29AA430B00D74C52 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
60 - C9AC22162BB50165008B65E2 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; }; 60 + C9AC22162BB50165008B65E2 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
61 /* End PBXFileReference section */ 61 /* End PBXFileReference section */
62 62
63 /* Begin PBXFrameworksBuildPhase section */ 63 /* Begin PBXFrameworksBuildPhase section */
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
  10 + C98126502BFEED7D000AD7AA /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C981264F2BFEED7C000AD7AA /* Info.plist */; };
10 C9A2587D2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9A2587C2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift */; }; 11 C9A2587D2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9A2587C2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift */; };
11 C9A2587F2AAEFFF100E555CA /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9A2587E2AAEFFF100E555CA /* ContentView.swift */; }; 12 C9A2587F2AAEFFF100E555CA /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9A2587E2AAEFFF100E555CA /* ContentView.swift */; };
12 C9A258812AAEFFF200E555CA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C9A258802AAEFFF200E555CA /* Assets.xcassets */; }; 13 C9A258812AAEFFF200E555CA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C9A258802AAEFFF200E555CA /* Assets.xcassets */; };
@@ -20,6 +21,7 @@ @@ -20,6 +21,7 @@
20 /* End PBXBuildFile section */ 21 /* End PBXBuildFile section */
21 22
22 /* Begin PBXFileReference section */ 23 /* Begin PBXFileReference section */
  24 + C981264F2BFEED7C000AD7AA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
23 C9A258792AAEFFF100E555CA /* SherpaOnnx2Pass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnx2Pass.app; sourceTree = BUILT_PRODUCTS_DIR; }; 25 C9A258792AAEFFF100E555CA /* SherpaOnnx2Pass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnx2Pass.app; sourceTree = BUILT_PRODUCTS_DIR; };
24 C9A2587C2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnx2PassApp.swift; sourceTree = "<group>"; }; 26 C9A2587C2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnx2PassApp.swift; sourceTree = "<group>"; };
25 C9A2587E2AAEFFF100E555CA /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; }; 27 C9A2587E2AAEFFF100E555CA /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -30,7 +32,7 @@ @@ -30,7 +32,7 @@
30 C9A2588D2AAF039D00E555CA /* Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; }; 32 C9A2588D2AAF039D00E555CA /* Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; };
31 C9A258922AAF057E00E555CA /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; }; 33 C9A258922AAF057E00E555CA /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; };
32 C9A258952AAF05D100E555CA /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; }; 34 C9A258952AAF05D100E555CA /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
33 - C9A258972AAF05E400E555CA /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; }; 35 + C9A258972AAF05E400E555CA /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
34 /* End PBXFileReference section */ 36 /* End PBXFileReference section */
35 37
36 /* Begin PBXFrameworksBuildPhase section */ 38 /* Begin PBXFrameworksBuildPhase section */
@@ -66,6 +68,7 @@ @@ -66,6 +68,7 @@
66 C9A2587B2AAEFFF100E555CA /* SherpaOnnx2Pass */ = { 68 C9A2587B2AAEFFF100E555CA /* SherpaOnnx2Pass */ = {
67 isa = PBXGroup; 69 isa = PBXGroup;
68 children = ( 70 children = (
  71 + C981264F2BFEED7C000AD7AA /* Info.plist */,
69 C9A258922AAF057E00E555CA /* SherpaOnnx.swift */, 72 C9A258922AAF057E00E555CA /* SherpaOnnx.swift */,
70 C9A2588D2AAF039D00E555CA /* Extension.swift */, 73 C9A2588D2AAF039D00E555CA /* Extension.swift */,
71 C9A2588A2AAF039D00E555CA /* Model.swift */, 74 C9A2588A2AAF039D00E555CA /* Model.swift */,
@@ -155,6 +158,7 @@ @@ -155,6 +158,7 @@
155 files = ( 158 files = (
156 C9A258842AAEFFF200E555CA /* Preview Assets.xcassets in Resources */, 159 C9A258842AAEFFF200E555CA /* Preview Assets.xcassets in Resources */,
157 C9A258812AAEFFF200E555CA /* Assets.xcassets in Resources */, 160 C9A258812AAEFFF200E555CA /* Assets.xcassets in Resources */,
  161 + C98126502BFEED7D000AD7AA /* Info.plist in Resources */,
158 ); 162 );
159 runOnlyForDeploymentPostprocessing = 0; 163 runOnlyForDeploymentPostprocessing = 0;
160 }; 164 };
@@ -76,9 +76,9 @@ func getStreamingEn20MZipformer20230217() -> SherpaOnnxOnlineModelConfig { @@ -76,9 +76,9 @@ func getStreamingEn20MZipformer20230217() -> SherpaOnnxOnlineModelConfig {
76 /// Non-streaming models 76 /// Non-streaming models
77 /// ======================================== 77 /// ========================================
78 78
79 -/// csukuangfj/sherpa-onnx-paraformer-zh-2023-03-28 (Chinese)  
80 -/// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese  
81 -func getNonStreamingZhParaformer20230328() -> SherpaOnnxOfflineModelConfig { 79 +/// csukuangfj/sherpa-onnx-paraformer-zh-2023-09-14 (Chinese)
  80 +/// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese
  81 +func getNonStreamingZhParaformer20230914() -> SherpaOnnxOfflineModelConfig {
82 let model = getResource("model.int8", "onnx") 82 let model = getResource("model.int8", "onnx")
83 let tokens = getResource("paraformer-tokens", "txt") 83 let tokens = getResource("paraformer-tokens", "txt")
84 84
@@ -90,7 +90,7 @@ class SherpaOnnxViewModel: ObservableObject { @@ -90,7 +90,7 @@ class SherpaOnnxViewModel: ObservableObject {
90 } 90 }
91 91
92 private func initOfflineRecognizer() { 92 private func initOfflineRecognizer() {
93 - // let modelConfig = getNonStreamingZhParaformer20230328() 93 + // let modelConfig = getNonStreamingZhParaformer20230914()
94 let modelConfig = getNonStreamingWhisperTinyEn() 94 let modelConfig = getNonStreamingWhisperTinyEn()
95 95
96 // let modelConfig = getNonStreamingEnZipformer20230504() 96 // let modelConfig = getNonStreamingEnZipformer20230504()
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
  10 + C98126522BFEEDB7000AD7AA /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C98126512BFEEDB7000AD7AA /* Info.plist */; };
10 DEBB2D762BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */; }; 11 DEBB2D762BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */; };
11 DEBB2D782BBAAA3500864EF5 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2D772BBAAA3500864EF5 /* ContentView.swift */; }; 12 DEBB2D782BBAAA3500864EF5 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2D772BBAAA3500864EF5 /* ContentView.swift */; };
12 DEBB2D7A2BBAAA3600864EF5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DEBB2D792BBAAA3600864EF5 /* Assets.xcassets */; }; 13 DEBB2D7A2BBAAA3600864EF5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DEBB2D792BBAAA3600864EF5 /* Assets.xcassets */; };
@@ -22,8 +23,6 @@ @@ -22,8 +23,6 @@
22 DEBB2DAF2BBAAC6400864EF5 /* sherpa-onnx.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */; }; 23 DEBB2DAF2BBAAC6400864EF5 /* sherpa-onnx.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */; };
23 DEBB2DB02BBAAC6400864EF5 /* sherpa-onnx.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 24 DEBB2DB02BBAAC6400864EF5 /* sherpa-onnx.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
24 DEBB2DB22BBAAD0000864EF5 /* SherpaOnnx.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2DB12BBAAD0000864EF5 /* SherpaOnnx.swift */; }; 25 DEBB2DB22BBAAD0000864EF5 /* SherpaOnnx.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2DB12BBAAD0000864EF5 /* SherpaOnnx.swift */; };
25 - DEBB2DB42BBAB02E00864EF5 /* tiny-decoder.int8.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEBB2DB32BBAB02E00864EF5 /* tiny-decoder.int8.onnx */; };  
26 - DEBB2DB62BBAB03400864EF5 /* tiny-encoder.int8.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEBB2DB52BBAB03400864EF5 /* tiny-encoder.int8.onnx */; };  
27 /* End PBXBuildFile section */ 26 /* End PBXBuildFile section */
28 27
29 /* Begin PBXContainerItemProxy section */ 28 /* Begin PBXContainerItemProxy section */
@@ -59,6 +58,7 @@ @@ -59,6 +58,7 @@
59 /* End PBXCopyFilesBuildPhase section */ 58 /* End PBXCopyFilesBuildPhase section */
60 59
61 /* Begin PBXFileReference section */ 60 /* Begin PBXFileReference section */
  61 + C98126512BFEEDB7000AD7AA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
62 DEBB2D722BBAAA3500864EF5 /* SherpaOnnxLangID.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnxLangID.app; sourceTree = BUILT_PRODUCTS_DIR; }; 62 DEBB2D722BBAAA3500864EF5 /* SherpaOnnxLangID.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnxLangID.app; sourceTree = BUILT_PRODUCTS_DIR; };
63 DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnxLangIDApp.swift; sourceTree = "<group>"; }; 63 DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnxLangIDApp.swift; sourceTree = "<group>"; };
64 DEBB2D772BBAAA3500864EF5 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; }; 64 DEBB2D772BBAAA3500864EF5 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -74,10 +74,8 @@ @@ -74,10 +74,8 @@
74 DEBB2DA22BBAAAE700864EF5 /* Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Model.swift; path = ../../SherpaOnnx/SherpaOnnx/Model.swift; sourceTree = "<group>"; }; 74 DEBB2DA22BBAAAE700864EF5 /* Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Model.swift; path = ../../SherpaOnnx/SherpaOnnx/Model.swift; sourceTree = "<group>"; };
75 DEBB2DA42BBAAAFD00864EF5 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; }; 75 DEBB2DA42BBAAAFD00864EF5 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; };
76 DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; }; 76 DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
77 - DEBB2DAB2BBAAC6200864EF5 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; }; 77 + DEBB2DAB2BBAAC6200864EF5 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
78 DEBB2DB12BBAAD0000864EF5 /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; }; 78 DEBB2DB12BBAAD0000864EF5 /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; };
79 - DEBB2DB32BBAB02E00864EF5 /* tiny-decoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "tiny-decoder.int8.onnx"; sourceTree = "<group>"; };  
80 - DEBB2DB52BBAB03400864EF5 /* tiny-encoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "tiny-encoder.int8.onnx"; sourceTree = "<group>"; };  
81 /* End PBXFileReference section */ 79 /* End PBXFileReference section */
82 80
83 /* Begin PBXFrameworksBuildPhase section */ 81 /* Begin PBXFrameworksBuildPhase section */
@@ -131,9 +129,8 @@ @@ -131,9 +129,8 @@
131 DEBB2D742BBAAA3500864EF5 /* SherpaOnnxLangID */ = { 129 DEBB2D742BBAAA3500864EF5 /* SherpaOnnxLangID */ = {
132 isa = PBXGroup; 130 isa = PBXGroup;
133 children = ( 131 children = (
134 - DEBB2DB32BBAB02E00864EF5 /* tiny-decoder.int8.onnx */, 132 + C98126512BFEEDB7000AD7AA /* Info.plist */,
135 DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */, 133 DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */,
136 - DEBB2DB52BBAB03400864EF5 /* tiny-encoder.int8.onnx */,  
137 DEBB2D772BBAAA3500864EF5 /* ContentView.swift */, 134 DEBB2D772BBAAA3500864EF5 /* ContentView.swift */,
138 DEBB2DA42BBAAAFD00864EF5 /* ViewModel.swift */, 135 DEBB2DA42BBAAAFD00864EF5 /* ViewModel.swift */,
139 DEBB2D9F2BBAAACD00864EF5 /* SherpaOnnx-Bridging-Header.h */, 136 DEBB2D9F2BBAAACD00864EF5 /* SherpaOnnx-Bridging-Header.h */,
@@ -286,9 +283,8 @@ @@ -286,9 +283,8 @@
286 buildActionMask = 2147483647; 283 buildActionMask = 2147483647;
287 files = ( 284 files = (
288 DEBB2D7D2BBAAA3600864EF5 /* Preview Assets.xcassets in Resources */, 285 DEBB2D7D2BBAAA3600864EF5 /* Preview Assets.xcassets in Resources */,
289 - DEBB2DB62BBAB03400864EF5 /* tiny-encoder.int8.onnx in Resources */,  
290 - DEBB2DB42BBAB02E00864EF5 /* tiny-decoder.int8.onnx in Resources */,  
291 DEBB2D7A2BBAAA3600864EF5 /* Assets.xcassets in Resources */, 286 DEBB2D7A2BBAAA3600864EF5 /* Assets.xcassets in Resources */,
  287 + C98126522BFEEDB7000AD7AA /* Info.plist in Resources */,
292 ); 288 );
293 runOnlyForDeploymentPostprocessing = 0; 289 runOnlyForDeploymentPostprocessing = 0;
294 }; 290 };
@@ -16,10 +16,6 @@ @@ -16,10 +16,6 @@
16 DE8C85A62ABF23E100F667E3 /* onnxruntime.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8C85A52ABF23E100F667E3 /* onnxruntime.xcframework */; }; 16 DE8C85A62ABF23E100F667E3 /* onnxruntime.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8C85A52ABF23E100F667E3 /* onnxruntime.xcframework */; };
17 DE8C85AA2ABF23FA00F667E3 /* sherpa-onnx.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8C85A92ABF23FA00F667E3 /* sherpa-onnx.xcframework */; }; 17 DE8C85AA2ABF23FA00F667E3 /* sherpa-onnx.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8C85A92ABF23FA00F667E3 /* sherpa-onnx.xcframework */; };
18 DE8C85B22ABF257200F667E3 /* SpeechSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8C85B12ABF257200F667E3 /* SpeechSegment.swift */; }; 18 DE8C85B22ABF257200F667E3 /* SpeechSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8C85B12ABF257200F667E3 /* SpeechSegment.swift */; };
19 - DEA22DF12AC1796C00549373 /* tiny.en-encoder.int8.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEA22DEE2AC1796C00549373 /* tiny.en-encoder.int8.onnx */; };  
20 - DEA22DF22AC1796C00549373 /* tiny.en-decoder.int8.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEA22DEF2AC1796C00549373 /* tiny.en-decoder.int8.onnx */; };  
21 - DEA22DF32AC1796C00549373 /* tiny.en-tokens.txt in Resources */ = {isa = PBXBuildFile; fileRef = DEA22DF02AC1796C00549373 /* tiny.en-tokens.txt */; };  
22 - DEA22DF52AC179E500549373 /* silero_vad.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEA22DF42AC179CA00549373 /* silero_vad.onnx */; };  
23 DEA657152ABF19730066A81D /* SherpaOnnxSubtitleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */; }; 19 DEA657152ABF19730066A81D /* SherpaOnnxSubtitleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */; };
24 DEA657172ABF19730066A81D /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA657162ABF19730066A81D /* ContentView.swift */; }; 20 DEA657172ABF19730066A81D /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA657162ABF19730066A81D /* ContentView.swift */; };
25 DEA657192ABF19740066A81D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DEA657182ABF19740066A81D /* Assets.xcassets */; }; 21 DEA657192ABF19740066A81D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DEA657182ABF19740066A81D /* Assets.xcassets */; };
@@ -36,13 +32,9 @@ @@ -36,13 +32,9 @@
36 DE081AAE2ABFF35400E8CD63 /* UTType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UTType.swift; sourceTree = "<group>"; }; 32 DE081AAE2ABFF35400E8CD63 /* UTType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UTType.swift; sourceTree = "<group>"; };
37 DE081AB02ABFFEEE00E8CD63 /* Document.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = "<group>"; }; 33 DE081AB02ABFFEEE00E8CD63 /* Document.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = "<group>"; };
38 DE081AB22ABFFF2600E8CD63 /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; }; 34 DE081AB22ABFFF2600E8CD63 /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; };
39 - DE8C85A52ABF23E100F667E3 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; }; 35 + DE8C85A52ABF23E100F667E3 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
40 DE8C85A92ABF23FA00F667E3 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; }; 36 DE8C85A92ABF23FA00F667E3 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
41 DE8C85B12ABF257200F667E3 /* SpeechSegment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeechSegment.swift; sourceTree = "<group>"; }; 37 DE8C85B12ABF257200F667E3 /* SpeechSegment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeechSegment.swift; sourceTree = "<group>"; };
42 - DEA22DEE2AC1796C00549373 /* tiny.en-encoder.int8.onnx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "tiny.en-encoder.int8.onnx"; sourceTree = "<group>"; };  
43 - DEA22DEF2AC1796C00549373 /* tiny.en-decoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "tiny.en-decoder.int8.onnx"; sourceTree = "<group>"; };  
44 - DEA22DF02AC1796C00549373 /* tiny.en-tokens.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "tiny.en-tokens.txt"; sourceTree = "<group>"; };  
45 - DEA22DF42AC179CA00549373 /* silero_vad.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; path = silero_vad.onnx; sourceTree = "<group>"; };  
46 DEA657112ABF19730066A81D /* SherpaOnnxSubtitle.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnxSubtitle.app; sourceTree = BUILT_PRODUCTS_DIR; }; 38 DEA657112ABF19730066A81D /* SherpaOnnxSubtitle.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnxSubtitle.app; sourceTree = BUILT_PRODUCTS_DIR; };
47 DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnxSubtitleApp.swift; sourceTree = "<group>"; }; 39 DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnxSubtitleApp.swift; sourceTree = "<group>"; };
48 DEA657162ABF19730066A81D /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; }; 40 DEA657162ABF19730066A81D /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -114,10 +106,6 @@ @@ -114,10 +106,6 @@
114 DEA657132ABF19730066A81D /* SherpaOnnxSubtitle */ = { 106 DEA657132ABF19730066A81D /* SherpaOnnxSubtitle */ = {
115 isa = PBXGroup; 107 isa = PBXGroup;
116 children = ( 108 children = (
117 - DEA22DEF2AC1796C00549373 /* tiny.en-decoder.int8.onnx */,  
118 - DEA22DEE2AC1796C00549373 /* tiny.en-encoder.int8.onnx */,  
119 - DEA22DF02AC1796C00549373 /* tiny.en-tokens.txt */,  
120 - DEA22DF42AC179CA00549373 /* silero_vad.onnx */,  
121 DE081AAC2ABFF30A00E8CD63 /* Info.plist */, 109 DE081AAC2ABFF30A00E8CD63 /* Info.plist */,
122 DE081A8E2ABF287C00E8CD63 /* SherpaOnnx.swift */, 110 DE081A8E2ABF287C00E8CD63 /* SherpaOnnx.swift */,
123 DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */, 111 DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */,
@@ -198,12 +186,8 @@ @@ -198,12 +186,8 @@
198 isa = PBXResourcesBuildPhase; 186 isa = PBXResourcesBuildPhase;
199 buildActionMask = 2147483647; 187 buildActionMask = 2147483647;
200 files = ( 188 files = (
201 - DEA22DF52AC179E500549373 /* silero_vad.onnx in Resources */,  
202 DEA6571C2ABF19740066A81D /* Preview Assets.xcassets in Resources */, 189 DEA6571C2ABF19740066A81D /* Preview Assets.xcassets in Resources */,
203 - DEA22DF12AC1796C00549373 /* tiny.en-encoder.int8.onnx in Resources */,  
204 DEA657192ABF19740066A81D /* Assets.xcassets in Resources */, 190 DEA657192ABF19740066A81D /* Assets.xcassets in Resources */,
205 - DEA22DF22AC1796C00549373 /* tiny.en-decoder.int8.onnx in Resources */,  
206 - DEA22DF32AC1796C00549373 /* tiny.en-tokens.txt in Resources */,  
207 ); 191 );
208 runOnlyForDeploymentPostprocessing = 0; 192 runOnlyForDeploymentPostprocessing = 0;
209 }; 193 };
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> 2 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3 <plist version="1.0"> 3 <plist version="1.0">
4 <dict> 4 <dict>
  5 + <key>NSMicrophoneUsageDescription</key>
  6 + <string>Need microphone access for Next-gen Kaldi to work</string>
5 <key>UTExportedTypeDeclarations</key> 7 <key>UTExportedTypeDeclarations</key>
6 <array> 8 <array>
7 <dict> 9 <dict>
@@ -59,7 +59,7 @@ class SubtitleViewModel: ObservableObject { @@ -59,7 +59,7 @@ class SubtitleViewModel: ObservableObject {
59 self.modelConfig = getNonStreamingWhisperTinyEn() 59 self.modelConfig = getNonStreamingWhisperTinyEn()
60 } else if modelType == "paraformer" { 60 } else if modelType == "paraformer" {
61 // for Chinese 61 // for Chinese
62 - self.modelConfig = getNonStreamingZhParaformer20230328() 62 + self.modelConfig = getNonStreamingZhParaformer20230914()
63 } else { 63 } else {
64 print("Please specify a supported modelType \(modelType)") 64 print("Please specify a supported modelType \(modelType)")
65 return 65 return
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 C9FE9FE42B0F33CD009F1003 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; }; 26 C9FE9FE42B0F33CD009F1003 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; };
27 C9FE9FE62B0F3620009F1003 /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; }; 27 C9FE9FE62B0F3620009F1003 /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; };
28 C9FE9FE92B0F3754009F1003 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; }; 28 C9FE9FE92B0F3754009F1003 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
29 - C9FE9FEB2B0F3785009F1003 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; }; 29 + C9FE9FEB2B0F3785009F1003 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
30 /* End PBXFileReference section */ 30 /* End PBXFileReference section */
31 31
32 /* Begin PBXFrameworksBuildPhase section */ 32 /* Begin PBXFrameworksBuildPhase section */
@@ -7,10 +7,10 @@ import com.k2fsa.sherpa.onnx.*; @@ -7,10 +7,10 @@ import com.k2fsa.sherpa.onnx.*;
7 public class InverseTextNormalizationNonStreamingParaformer { 7 public class InverseTextNormalizationNonStreamingParaformer {
8 public static void main(String[] args) { 8 public static void main(String[] args) {
9 // please refer to 9 // please refer to
10 - // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english 10 + // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese-english
11 // to download model files 11 // to download model files
12 - String model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";  
13 - String tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt"; 12 + String model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
  13 + String tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
14 14
15 // https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn-zh-number.wav 15 // https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn-zh-number.wav
16 String waveFilename = "./itn-zh-number.wav"; 16 String waveFilename = "./itn-zh-number.wav";
@@ -7,12 +7,12 @@ import com.k2fsa.sherpa.onnx.*; @@ -7,12 +7,12 @@ import com.k2fsa.sherpa.onnx.*;
7 public class NonStreamingDecodeFileParaformer { 7 public class NonStreamingDecodeFileParaformer {
8 public static void main(String[] args) { 8 public static void main(String[] args) {
9 // please refer to 9 // please refer to
10 - // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english 10 + // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese-english
11 // to download model files 11 // to download model files
12 - String model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";  
13 - String tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt"; 12 + String model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
  13 + String tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
14 14
15 - String waveFilename = "./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/3-sichuan.wav"; 15 + String waveFilename = "./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/3-sichuan.wav";
16 16
17 WaveReader reader = new WaveReader(waveFilename); 17 WaveReader reader = new WaveReader(waveFilename);
18 18
@@ -7,7 +7,7 @@ import com.k2fsa.sherpa.onnx.*; @@ -7,7 +7,7 @@ import com.k2fsa.sherpa.onnx.*;
7 public class NonStreamingDecodeFileTeleSpeechCtc { 7 public class NonStreamingDecodeFileTeleSpeechCtc {
8 public static void main(String[] args) { 8 public static void main(String[] args) {
9 // please refer to 9 // please refer to
10 - // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english 10 + // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/telespeech/models.html#sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04
11 // to download model files 11 // to download model files
12 String model = "./sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04/model.int8.onnx"; 12 String model = "./sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04/model.int8.onnx";
13 String tokens = "./sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04/tokens.txt"; 13 String tokens = "./sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04/tokens.txt";
@@ -37,10 +37,10 @@ public class VadFromMicWithNonStreamingParaformer { @@ -37,10 +37,10 @@ public class VadFromMicWithNonStreamingParaformer {
37 37
38 public static OfflineRecognizer createOfflineRecognizer() { 38 public static OfflineRecognizer createOfflineRecognizer() {
39 // please refer to 39 // please refer to
40 - // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english 40 + // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese-english
41 // to download model files 41 // to download model files
42 - String model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";  
43 - String tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt"; 42 + String model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
  43 + String tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
44 44
45 // https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn_zh_number.fst 45 // https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn_zh_number.fst
46 String ruleFsts = "./itn_zh_number.fst"; 46 String ruleFsts = "./itn_zh_number.fst";
@@ -34,10 +34,10 @@ public class VadNonStreamingParaformer { @@ -34,10 +34,10 @@ public class VadNonStreamingParaformer {
34 34
35 public static OfflineRecognizer createOfflineRecognizer() { 35 public static OfflineRecognizer createOfflineRecognizer() {
36 // please refer to 36 // please refer to
37 - // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english 37 + // https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese-english
38 // to download model files 38 // to download model files
39 - String model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";  
40 - String tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt"; 39 + String model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
  40 + String tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
41 41
42 OfflineParaformerModelConfig paraformer = 42 OfflineParaformerModelConfig paraformer =
43 OfflineParaformerModelConfig.builder().setModel(model).build(); 43 OfflineParaformerModelConfig.builder().setModel(model).build();
@@ -25,11 +25,11 @@ if [ ! -f ../sherpa-onnx/java-api/build/sherpa-onnx.jar ]; then @@ -25,11 +25,11 @@ if [ ! -f ../sherpa-onnx/java-api/build/sherpa-onnx.jar ]; then
25 popd 25 popd
26 fi 26 fi
27 27
28 -if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
29 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 28 +if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  29 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
30 30
31 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
32 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 31 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  32 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
33 fi 33 fi
34 34
35 if [ ! -f ./itn-zh-number.wav ]; then 35 if [ ! -f ./itn-zh-number.wav ]; then
@@ -25,11 +25,11 @@ if [ ! -f ../sherpa-onnx/java-api/build/sherpa-onnx.jar ]; then @@ -25,11 +25,11 @@ if [ ! -f ../sherpa-onnx/java-api/build/sherpa-onnx.jar ]; then
25 popd 25 popd
26 fi 26 fi
27 27
28 -if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
29 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 28 +if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  29 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
30 30
31 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
32 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 31 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  32 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
33 fi 33 fi
34 34
35 java \ 35 java \
@@ -29,11 +29,11 @@ if [ ! -f ./silero_vad.onnx ]; then @@ -29,11 +29,11 @@ if [ ! -f ./silero_vad.onnx ]; then
29 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/silero_vad.onnx 29 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/silero_vad.onnx
30 fi 30 fi
31 31
32 -if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
33 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 32 +if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  33 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
34 34
35 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
36 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 35 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  36 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
37 fi 37 fi
38 38
39 if [ ! -f ./itn_zh_number.fst ]; then 39 if [ ! -f ./itn_zh_number.fst ]; then
@@ -33,11 +33,11 @@ if [ ! -f ./lei-jun-test.wav ]; then @@ -33,11 +33,11 @@ if [ ! -f ./lei-jun-test.wav ]; then
33 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav 33 curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav
34 fi 34 fi
35 35
36 -if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
37 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 36 +if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  37 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
38 38
39 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
40 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 39 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  40 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
41 fi 41 fi
42 42
43 java \ 43 java \
@@ -179,10 +179,10 @@ function testOfflineAsr() { @@ -179,10 +179,10 @@ function testOfflineAsr() {
179 rm sherpa-onnx-nemo-ctc-en-citrinet-512.tar.bz2 179 rm sherpa-onnx-nemo-ctc-en-citrinet-512.tar.bz2
180 fi 180 fi
181 181
182 - if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
183 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
184 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
185 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 182 + if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  183 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  184 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  185 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
186 fi 186 fi
187 187
188 if [ ! -f ./sherpa-onnx-zipformer-multi-zh-hans-2023-9-2/tokens.txt ]; then 188 if [ ! -f ./sherpa-onnx-zipformer-multi-zh-hans-2023-9-2/tokens.txt ]; then
@@ -205,10 +205,10 @@ function testOfflineAsr() { @@ -205,10 +205,10 @@ function testOfflineAsr() {
205 } 205 }
206 206
207 function testInverseTextNormalizationOfflineAsr() { 207 function testInverseTextNormalizationOfflineAsr() {
208 - if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then  
209 - curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
210 - tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
211 - rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 208 + if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
  209 + curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  210 + tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  211 + rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
212 fi 212 fi
213 213
214 if [ ! -f ./itn-zh-number.wav ]; then 214 if [ ! -f ./itn-zh-number.wav ]; then
@@ -11,7 +11,7 @@ fun test(type: Int) { @@ -11,7 +11,7 @@ fun test(type: Int) {
11 val recognizer = createOfflineRecognizer(type) 11 val recognizer = createOfflineRecognizer(type)
12 12
13 val waveFilename = when (type) { 13 val waveFilename = when (type) {
14 - 0 -> "./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav" 14 + 0 -> "./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav"
15 2 -> "./sherpa-onnx-whisper-tiny.en/test_wavs/0.wav" 15 2 -> "./sherpa-onnx-whisper-tiny.en/test_wavs/0.wav"
16 5 -> "./sherpa-onnx-zipformer-multi-zh-hans-2023-9-2/test_wavs/1.wav" 16 5 -> "./sherpa-onnx-zipformer-multi-zh-hans-2023-9-2/test_wavs/1.wav"
17 6 -> "./sherpa-onnx-nemo-ctc-en-citrinet-512/test_wavs/8k.wav" 17 6 -> "./sherpa-onnx-nemo-ctc-en-citrinet-512/test_wavs/8k.wav"
@@ -338,10 +338,10 @@ void CNonStreamingSpeechRecognitionDlg::ShowInitRecognizerHelpMessage() { @@ -338,10 +338,10 @@ void CNonStreamingSpeechRecognitionDlg::ShowInitRecognizerHelpMessage() {
338 msg += 338 msg +=
339 "wget " 339 "wget "
340 "https://huggingface.co/csukuangfj/" 340 "https://huggingface.co/csukuangfj/"
341 - "sherpa-onnx-paraformer-zh-2023-03-28/resolve/main/model.onnx\r\n"; 341 + "sherpa-onnx-paraformer-zh-2023-09-14/resolve/main/model.onnx\r\n";
342 msg += 342 msg +=
343 "wget " 343 "wget "
344 - "https://huggingface.co/csukuangfj/sherpa-onnx-paraformer-zh-2023-03-28/" 344 + "https://huggingface.co/csukuangfj/sherpa-onnx-paraformer-zh-2023-09-14/"
345 "resolve/main/tokens.txt\r\n\r\n"; 345 "resolve/main/tokens.txt\r\n\r\n";
346 msg += "\r\n Now rename them\r\n"; 346 msg += "\r\n Now rename them\r\n";
347 msg += "mv model.onnx paraformer.onnx\r\n\r\n"; 347 msg += "mv model.onnx paraformer.onnx\r\n\r\n";
@@ -140,9 +140,9 @@ node ./test_audio_tagging_zipformer.js @@ -140,9 +140,9 @@ node ./test_audio_tagging_zipformer.js
140 ### Audio tagging with CED 140 ### Audio tagging with CED
141 141
142 ```bash 142 ```bash
143 -wget https://github.com/k2-fsa/sherpa-onnx/releases/download/audio-tagging-models/sherpa-onnx-ced-mini-audio-tagging-2024-04-19.tar.bz2  
144 -tar xvf sherpa-onnx-ced-mini-audio-tagging-2024-04-19.tar.bz2  
145 -rm sherpa-onnx-ced-mini-audio-tagging-2024-04-19.tar.bz2 143 +wget https://github.com/k2-fsa/sherpa-onnx/releases/download/audio-tagging-models/sherpa-onnx-ced-mini-audio-tagging-2024-09-14.tar.bz2
  144 +tar xvf sherpa-onnx-ced-mini-audio-tagging-2024-09-14.tar.bz2
  145 +rm sherpa-onnx-ced-mini-audio-tagging-2024-09-14.tar.bz2
146 146
147 node ./test_audio_tagging_ced.js 147 node ./test_audio_tagging_ced.js
148 ``` 148 ```
@@ -241,9 +241,9 @@ node ./test_vad_asr_non_streaming_nemo_ctc_microphone.js @@ -241,9 +241,9 @@ node ./test_vad_asr_non_streaming_nemo_ctc_microphone.js
241 ### Non-streaming speech recognition with Paraformer 241 ### Non-streaming speech recognition with Paraformer
242 242
243 ```bash 243 ```bash
244 -wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
245 -tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
246 -rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 244 +wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  245 +tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  246 +rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
247 247
248 node ./test_asr_non_streaming_paraformer.js 248 node ./test_asr_non_streaming_paraformer.js
249 249
1 { 1 {
2 "dependencies": { 2 "dependencies": {
3 - "sherpa-onnx-node": "^1.10.12" 3 + "sherpa-onnx-node": "^1.10.13"
4 } 4 }
5 } 5 }
@@ -10,9 +10,9 @@ const config = { @@ -10,9 +10,9 @@ const config = {
10 }, 10 },
11 'modelConfig': { 11 'modelConfig': {
12 'paraformer': { 12 'paraformer': {
13 - 'model': './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx', 13 + 'model': './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
14 }, 14 },
15 - 'tokens': './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt', 15 + 'tokens': './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
16 'numThreads': 2, 16 'numThreads': 2,
17 'provider': 'cpu', 17 'provider': 'cpu',
18 'debug': 1, 18 'debug': 1,
@@ -20,7 +20,7 @@ const config = { @@ -20,7 +20,7 @@ const config = {
20 }; 20 };
21 21
22 const waveFilename = 22 const waveFilename =
23 - './sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/5-henan.wav'; 23 + './sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/5-henan.wav';
24 24
25 const recognizer = new sherpa_onnx.OfflineRecognizer(config); 25 const recognizer = new sherpa_onnx.OfflineRecognizer(config);
26 console.log('Started') 26 console.log('Started')
@@ -10,9 +10,9 @@ const config = { @@ -10,9 +10,9 @@ const config = {
10 }, 10 },
11 'modelConfig': { 11 'modelConfig': {
12 'paraformer': { 12 'paraformer': {
13 - 'model': './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx', 13 + 'model': './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
14 }, 14 },
15 - 'tokens': './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt', 15 + 'tokens': './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
16 'numThreads': 2, 16 'numThreads': 2,
17 'provider': 'cpu', 17 'provider': 'cpu',
18 'debug': 1, 18 'debug': 1,
@@ -15,9 +15,9 @@ function createRecognizer() { @@ -15,9 +15,9 @@ function createRecognizer() {
15 }, 15 },
16 'modelConfig': { 16 'modelConfig': {
17 'paraformer': { 17 'paraformer': {
18 - 'model': './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx', 18 + 'model': './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
19 }, 19 },
20 - 'tokens': './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt', 20 + 'tokens': './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
21 'numThreads': 2, 21 'numThreads': 2,
22 'provider': 'cpu', 22 'provider': 'cpu',
23 'debug': 1, 23 'debug': 1,
@@ -78,13 +78,13 @@ node ./test-offline-nemo-ctc.js @@ -78,13 +78,13 @@ node ./test-offline-nemo-ctc.js
78 78
79 [./test-offline-paraformer.js](./test-offline-paraformer.js) demonstrates 79 [./test-offline-paraformer.js](./test-offline-paraformer.js) demonstrates
80 how to decode a file with a non-streaming Paraformer model. In the code we use 80 how to decode a file with a non-streaming Paraformer model. In the code we use
81 -[sherpa-onnx-paraformer-zh-2023-03-28](https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese). 81 +[sherpa-onnx-paraformer-zh-2023-09-14](https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese).
82 82
83 You can use the following command to run it: 83 You can use the following command to run it:
84 84
85 ```bash 85 ```bash
86 -wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
87 -tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 86 +wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  87 +tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
88 node ./test-offline-paraformer.js 88 node ./test-offline-paraformer.js
89 ``` 89 ```
90 90
@@ -19,7 +19,7 @@ function createOfflineRecognizer() { @@ -19,7 +19,7 @@ function createOfflineRecognizer() {
19 joiner: '', 19 joiner: '',
20 }, 20 },
21 paraformer: { 21 paraformer: {
22 - model: './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx', 22 + model: './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
23 }, 23 },
24 nemoCtc: { 24 nemoCtc: {
25 model: '', 25 model: '',
@@ -34,7 +34,7 @@ function createOfflineRecognizer() { @@ -34,7 +34,7 @@ function createOfflineRecognizer() {
34 tdnn: { 34 tdnn: {
35 model: '', 35 model: '',
36 }, 36 },
37 - tokens: './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt', 37 + tokens: './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
38 numThreads: 1, 38 numThreads: 1,
39 debug: 0, 39 debug: 0,
40 provider: 'cpu', 40 provider: 'cpu',
@@ -19,7 +19,7 @@ function createOfflineRecognizer() { @@ -19,7 +19,7 @@ function createOfflineRecognizer() {
19 joiner: '', 19 joiner: '',
20 }, 20 },
21 paraformer: { 21 paraformer: {
22 - model: './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx', 22 + model: './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
23 }, 23 },
24 nemoCtc: { 24 nemoCtc: {
25 model: '', 25 model: '',
@@ -34,7 +34,7 @@ function createOfflineRecognizer() { @@ -34,7 +34,7 @@ function createOfflineRecognizer() {
34 tdnn: { 34 tdnn: {
35 model: '', 35 model: '',
36 }, 36 },
37 - tokens: './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt', 37 + tokens: './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
38 numThreads: 1, 38 numThreads: 1,
39 debug: 0, 39 debug: 0,
40 provider: 'cpu', 40 provider: 'cpu',
@@ -63,7 +63,7 @@ function createOfflineRecognizer() { @@ -63,7 +63,7 @@ function createOfflineRecognizer() {
63 const recognizer = createOfflineRecognizer(); 63 const recognizer = createOfflineRecognizer();
64 const stream = recognizer.createStream(); 64 const stream = recognizer.createStream();
65 65
66 -const waveFilename = './sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav'; 66 +const waveFilename = './sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav';
67 67
68 const reader = new wav.Reader(); 68 const reader = new wav.Reader();
69 const readable = new Readable().wrap(reader); 69 const readable = new Readable().wrap(reader);
@@ -9,9 +9,9 @@ Usage: @@ -9,9 +9,9 @@ Usage:
9 9
10 (1) Download the test model 10 (1) Download the test model
11 11
12 -wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
13 -tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
14 -rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 12 +wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  13 +tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  14 +rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
15 15
16 (2) Download rule fst 16 (2) Download rule fst
17 17
@@ -36,8 +36,8 @@ import soundfile as sf @@ -36,8 +36,8 @@ import soundfile as sf
36 36
37 37
38 def create_recognizer(): 38 def create_recognizer():
39 - model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx"  
40 - tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt" 39 + model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx"
  40 + tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt"
41 rule_fsts = "./itn_zh_number.fst" 41 rule_fsts = "./itn_zh_number.fst"
42 42
43 if ( 43 if (
@@ -36,13 +36,13 @@ python3 ./python-api-examples/non_streaming_server.py \ @@ -36,13 +36,13 @@ python3 ./python-api-examples/non_streaming_server.py \
36 (2) Use a non-streaming paraformer 36 (2) Use a non-streaming paraformer
37 37
38 cd /path/to/sherpa-onnx 38 cd /path/to/sherpa-onnx
39 -curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
40 -tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2  
41 -rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2 39 +curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  40 +tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
  41 +rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
42 42
43 python3 ./python-api-examples/non_streaming_server.py \ 43 python3 ./python-api-examples/non_streaming_server.py \
44 - --paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \  
45 - --tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt 44 + --paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
  45 + --tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt
46 46
47 (3) Use a non-streaming CTC model from NeMo 47 (3) Use a non-streaming CTC model from NeMo
48 48
@@ -27,8 +27,8 @@ python3 ./python-api-examples/two-pass-speech-recognition-from-microphone.py \ @@ -27,8 +27,8 @@ python3 ./python-api-examples/two-pass-speech-recognition-from-microphone.py \
27 --first-joiner ./sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23/joiner-epoch-99-avg-1.onnx \ 27 --first-joiner ./sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23/joiner-epoch-99-avg-1.onnx \
28 --first-tokens ./sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23/tokens.txt \ 28 --first-tokens ./sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23/tokens.txt \
29 \ 29 \
30 - --second-paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \  
31 - --second-tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt 30 + --second-paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
  31 + --second-tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt
32 32
33 (2) English: Streaming zipformer (1st pass) + Non-streaming whisper (2nd pass) 33 (2) English: Streaming zipformer (1st pass) + Non-streaming whisper (2nd pass)
34 34
@@ -67,7 +67,7 @@ def get_2nd_models(): @@ -67,7 +67,7 @@ def get_2nd_models():
67 """, 67 """,
68 ), 68 ),
69 Model( 69 Model(
70 - model_name="sherpa-onnx-paraformer-zh-2023-03-28", 70 + model_name="sherpa-onnx-paraformer-zh-2023-09-14",
71 idx=0, 71 idx=0,
72 lang="zh", 72 lang="zh",
73 short_name="paraformer", 73 short_name="paraformer",
@@ -270,7 +270,7 @@ def get_models(): @@ -270,7 +270,7 @@ def get_models():
270 combinations = [ 270 combinations = [
271 ( 271 (
272 "sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23", 272 "sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23",
273 - "sherpa-onnx-paraformer-zh-2023-03-28", 273 + "sherpa-onnx-paraformer-zh-2023-09-14",
274 ), 274 ),
275 ( 275 (
276 "sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23", 276 "sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23",
@@ -69,7 +69,7 @@ def get_models(): @@ -69,7 +69,7 @@ def get_models():
69 """, 69 """,
70 ), 70 ),
71 Model( 71 Model(
72 - model_name="sherpa-onnx-paraformer-zh-2023-03-28", 72 + model_name="sherpa-onnx-paraformer-zh-2023-09-14",
73 idx=0, 73 idx=0,
74 lang="zh", 74 lang="zh",
75 short_name="paraformer", 75 short_name="paraformer",
@@ -6,7 +6,7 @@ set -ex @@ -6,7 +6,7 @@ set -ex
6 6
7 function install_dependencies() { 7 function install_dependencies() {
8 pip install -qq torch==2.1.0+cpu torchaudio==2.1.0+cpu -f https://download.pytorch.org/whl/torch_stable.html 8 pip install -qq torch==2.1.0+cpu torchaudio==2.1.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
9 - pip install -qq onnx onnxruntime==1.17.1 9 + pip install -qq onnx onnxruntime==1.18.0
10 10
11 pip install -r ./requirements.txt 11 pip install -r ./requirements.txt
12 } 12 }
@@ -17,7 +17,7 @@ topics: @@ -17,7 +17,7 @@ topics:
17 - voice-activity-detection 17 - voice-activity-detection
18 18
19 # remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx.podspec 19 # remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx.podspec
20 -version: 1.10.12 20 +version: 1.10.13
21 21
22 homepage: https://github.com/k2-fsa/sherpa-onnx 22 homepage: https://github.com/k2-fsa/sherpa-onnx
23 23