Skip to content

Commit dd0ff2c

Browse files
csukuangfjcsukuangfj
authored
Support onnxruntime 1.18.0 (#906)
1 parent 9e446b8 commit dd0ff2c

File tree

107 files changed

+647
-604
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+647
-604
lines changed

‎.github/scripts/test-nodejs-addon-npm.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -121,9 +121,9 @@ rm sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k.tar.bz2
121121
node ./test_asr_non_streaming_nemo_ctc.js
122122
rm -rf sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k
123123

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
127127

128128
node ./test_asr_non_streaming_paraformer.js
129129

@@ -134,7 +134,7 @@ curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/i
134134

135135
node ./test_asr_non_streaming_paraformer_itn.js
136136

137-
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
137+
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
138138

139139
echo "----------tts----------"
140140

‎.github/scripts/test-nodejs-npm.sh

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ ls -lh node_modules
1111

1212
# offline asr
1313

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
1515
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
1818

1919
rm -f itn*
2020
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn-zh-number.wav
2121
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn_zh_number.fst
2222
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
2424

2525
curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
2626
ls -lh
@@ -29,12 +29,12 @@ rm sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
2929
node ./test-offline-nemo-ctc.js
3030
rm -rf sherpa-onnx-nemo-ctc-en-conformer-small
3131

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
3333
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
3636
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
3838

3939
curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-zipformer-en-2023-06-26.tar.bz2
4040
ls -lh

‎.github/scripts/test-offline-ctc.sh

+43-37
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,49 @@ echo "PATH: $PATH"
1515

1616
which $EXE
1717

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+
1861
log "test offline TeleSpeech CTC"
1962
url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04.tar.bz2
2063
name=$(basename $url)
@@ -145,44 +188,7 @@ done
145188

146189
rm -rf $repo
147190

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
175191

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
186192

187193
log "------------------------------------------------------------"
188194
log "Run tdnn yesno (Hebrew)"

‎.github/scripts/test-offline-transducer.sh

+7-29
Original file line numberDiff line numberDiff line change
@@ -184,35 +184,13 @@ rm -rf $repo
184184
log "------------------------------------------------------------"
185185
log "Run Paraformer (Chinese)"
186186
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
216194

217195
log "------------------------------------------------------------"
218196
log "Run Paraformer (Chinese) with timestamps"

‎.github/scripts/test-python.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,13 @@ log "Test non-streaming paraformer models"
312312
if [[ x$OS != x'windows-latest' ]]; then
313313
echo "OS: $OS"
314314
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
316316
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
319319

320320
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
322322

323323
ls -lh $repo
324324
popd
@@ -348,7 +348,7 @@ if [[ x$OS != x'windows-latest' ]]; then
348348

349349
python3 ./python-api-examples/inverse-text-normalization-offline-asr.py
350350

351-
rm -rfv sherpa-onnx-paraformer-zh-2023-03-28
351+
rm -rfv sherpa-onnx-paraformer-zh-2023-09-14
352352

353353
rm -rf $repo
354354
fi

‎.github/workflows/arm-linux-gnueabihf.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,6 @@ jobs:
172172
if [[ $lib_type == "shared" ]]; then
173173
cp -a build-arm-linux-gnueabihf/install/lib $dst/
174174
rm -v $dst/lib/libasound.so
175-
rm -v $dst/lib/libonnxruntime.so
176175
fi
177176
178177
tree $dst

‎.github/workflows/export-wenet-to-onnx.yaml

+58-6
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,14 @@ jobs:
7373
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-aishell main || true
7474
7575
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
7784
7885
- name: Publish to huggingface (aishell2)
7986
env:
@@ -115,7 +122,14 @@ jobs:
115122
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-aishell2 main || true
116123
117124
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
119133
120134
- name: Publish to huggingface (multi_cn)
121135
env:
@@ -157,7 +171,14 @@ jobs:
157171
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-multi-cn main || true
158172
159173
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
161182
162183
- name: Publish to huggingface (wenetspeech)
163184
env:
@@ -199,7 +220,14 @@ jobs:
199220
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-wenetspeech main || true
200221
201222
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
203231
204232
- name: Publish to huggingface (librispeech)
205233
env:
@@ -242,7 +270,14 @@ jobs:
242270
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-en-wenet-librispeech main || true
243271
244272
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
246281
247282
- name: Publish to huggingface (gigaspeech)
248283
env:
@@ -285,4 +320,21 @@ jobs:
285320
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-en-wenet-gigaspeech main || true
286321
287322
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

‎.github/workflows/release-dart-package.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ jobs:
8585
make install
8686
8787
ls -lh ./install/lib
88-
rm -v ./install/lib/libonnxruntime.so
8988
9089
- name: Copy pre-built libs
9190
shell: bash

‎.github/workflows/test-go-package.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ jobs:
269269
270270
echo "Test paraformer"
271271
./run-paraformer.sh
272-
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
272+
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
273273
274274
echo "Test NeMo CTC"
275275
./run-nemo-ctc.sh
@@ -306,7 +306,7 @@ jobs:
306306
307307
echo "Test paraformer"
308308
./run-paraformer.sh
309-
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
309+
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
310310
311311
echo "Test NeMo CTC"
312312
./run-nemo-ctc.sh
@@ -351,7 +351,7 @@ jobs:
351351
352352
echo "Test paraformer"
353353
./run-paraformer.sh
354-
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
354+
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
355355
356356
echo "Test NeMo CTC"
357357
./run-nemo-ctc.sh

0 commit comments

Comments
 (0)