EngineX-Iluvatar/enginex_bi_series-sherpa-onnx
Archived
15
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Support onnxruntime 1.18.0 (#906)

Browse Source
This commit is contained in:
Fangjun Kuang
2024-07-10 17:05:26 +08:00
committed by GitHub
parent 9e446b8501
commit dd0ff2ca06
107 changed files with 644 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.github/scripts/test-nodejs-addon-npm.sh vendored
View File

@@ -121,9 +121,9 @@ rm sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k.tar.bz2
node ./test_asr_non_streaming_nemo_ctc.js
rm -rf sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
node ./test_asr_non_streaming_paraformer.js
@@ -134,7 +134,7 @@ curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/i
node ./test_asr_non_streaming_paraformer_itn.js
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
echo "----------tts----------"

16
.github/scripts/test-nodejs-npm.sh vendored
View File

@@ -11,16 +11,16 @@ ls -lh node_modules
# offline asr
curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
ls -lh
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm -f itn*
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn-zh-number.wav
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn_zh_number.fst
node ./test-offline-paraformer-itn.js
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
ls -lh
@@ -29,12 +29,12 @@ rm sherpa-onnx-nemo-ctc-en-conformer-small.tar.bz2
node ./test-offline-nemo-ctc.js
rm -rf sherpa-onnx-nemo-ctc-en-conformer-small
curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
ls -lh
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
node ./test-offline-paraformer.js
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
curl -LS -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-zipformer-en-2023-06-26.tar.bz2
ls -lh

80
.github/scripts/test-offline-ctc.sh vendored
View File

@@ -15,6 +15,49 @@ echo "PATH: $PATH"
which $EXE
if false; then
# It has problems with onnxruntime 1.18
log "------------------------------------------------------------"
log "Run Wenet models"
log "------------------------------------------------------------"
wenet_models=(
sherpa-onnx-zh-wenet-aishell
# sherpa-onnx-zh-wenet-aishell2
# sherpa-onnx-zh-wenet-wenetspeech
# sherpa-onnx-zh-wenet-multi-cn
sherpa-onnx-en-wenet-librispeech
# sherpa-onnx-en-wenet-gigaspeech
)
for name in ${wenet_models[@]}; do
repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/$name.tar.bz2
log "Start testing ${repo_url}"
repo=$name
log "Download pretrained model and test-data from $repo_url"
curl -SL -O $repo_url
tar xvf $name.tar.bz2
rm $name.tar.bz2
log "test float32 models"
time $EXE \
--tokens=$repo/tokens.txt \
--wenet-ctc-model=$repo/model.onnx \
$repo/test_wavs/0.wav \
$repo/test_wavs/1.wav \
$repo/test_wavs/8k.wav
log "test int8 models"
time $EXE \
--tokens=$repo/tokens.txt \
--wenet-ctc-model=$repo/model.int8.onnx \
$repo/test_wavs/0.wav \
$repo/test_wavs/1.wav \
$repo/test_wavs/8k.wav
rm -rf $repo
done
fi
log "test offline TeleSpeech CTC"
url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04.tar.bz2
name=$(basename $url)
@@ -145,44 +188,7 @@ done
rm -rf $repo
log "------------------------------------------------------------"
log "Run Wenet models"
log "------------------------------------------------------------"
wenet_models=(
sherpa-onnx-zh-wenet-aishell
# sherpa-onnx-zh-wenet-aishell2
# sherpa-onnx-zh-wenet-wenetspeech
# sherpa-onnx-zh-wenet-multi-cn
sherpa-onnx-en-wenet-librispeech
# sherpa-onnx-en-wenet-gigaspeech
)
for name in ${wenet_models[@]}; do
repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/$name.tar.bz2
log "Start testing ${repo_url}"
repo=$name
log "Download pretrained model and test-data from $repo_url"
curl -SL -O $repo_url
tar xvf $name.tar.bz2
rm $name.tar.bz2
log "test float32 models"
time $EXE \
--tokens=$repo/tokens.txt \
--wenet-ctc-model=$repo/model.onnx \
$repo/test_wavs/0.wav \
$repo/test_wavs/1.wav \
$repo/test_wavs/8k.wav
log "test int8 models"
time $EXE \
--tokens=$repo/tokens.txt \
--wenet-ctc-model=$repo/model.int8.onnx \
$repo/test_wavs/0.wav \
$repo/test_wavs/1.wav \
$repo/test_wavs/8k.wav
rm -rf $repo
done
log "------------------------------------------------------------"
log "Run tdnn yesno (Hebrew)"

36
.github/scripts/test-offline-transducer.sh vendored
View File

@@ -184,35 +184,13 @@ rm -rf $repo
log "------------------------------------------------------------"
log "Run Paraformer (Chinese)"
log "------------------------------------------------------------"
repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
curl -SL -O $repo_url
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
repo=sherpa-onnx-paraformer-zh-2023-03-28
log "Start testing ${repo_url}"
time $EXE \
--tokens=$repo/tokens.txt \
--paraformer=$repo/model.onnx \
--num-threads=2 \
--decoding-method=greedy_search \
$repo/test_wavs/0.wav \
$repo/test_wavs/1.wav \
$repo/test_wavs/2.wav \
$repo/test_wavs/8k.wav
time $EXE \
--tokens=$repo/tokens.txt \
--paraformer=$repo/model.int8.onnx \
--num-threads=2 \
--decoding-method=greedy_search \
$repo/test_wavs/0.wav \
$repo/test_wavs/1.wav \
$repo/test_wavs/2.wav \
$repo/test_wavs/8k.wav
rm -rf $repo
# For onnxruntime 1.18.0, sherpa-onnx-paraformer-zh-2023-03-28 throws the following error
# libc++abi: terminating with uncaught exception of type Ort::Exception: Node (Loop_5471)
# Op (Loop) [TypeInferenceError] Graph attribute inferencing failed: Node (Concat_5490)
# Op (Concat) [ShapeInferenceError] All inputs to Concat must have same rank. Input 1 has rank 2 != 1
#
# See https://github.com/microsoft/onnxruntime/issues/8115
# We need to re-export this model using a recent version of onnxruntime and onnx
log "------------------------------------------------------------"
log "Run Paraformer (Chinese) with timestamps"

10
.github/scripts/test-python.sh vendored
View File

@@ -312,13 +312,13 @@ log "Test non-streaming paraformer models"
if [[ x$OS != x'windows-latest' ]]; then
echo "OS: $OS"
pushd $dir
repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
repo_url=https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
curl -SL -O $repo_url
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
log "Start testing ${repo_url}"
repo=$dir/sherpa-onnx-paraformer-zh-2023-03-28
repo=$dir/sherpa-onnx-paraformer-zh-2023-09-14
ls -lh $repo
popd
@@ -348,7 +348,7 @@ if [[ x$OS != x'windows-latest' ]]; then
python3 ./python-api-examples/inverse-text-normalization-offline-asr.py
rm -rfv sherpa-onnx-paraformer-zh-2023-03-28
rm -rfv sherpa-onnx-paraformer-zh-2023-09-14
rm -rf $repo
fi

1
.github/workflows/arm-linux-gnueabihf.yaml vendored
View File

@@ -172,7 +172,6 @@ jobs:
if [[ $lib_type == "shared" ]]; then
cp -a build-arm-linux-gnueabihf/install/lib $dst/
rm -v $dst/lib/libasound.so
rm -v $dst/lib/libonnxruntime.so
fi
tree $dst

64
.github/workflows/export-wenet-to-onnx.yaml vendored
View File

@@ -73,7 +73,14 @@ jobs:
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-aishell main || true
cd ..
rm -rf huggingface
rm -rf huggingface/.git
dst=sherpa-onnx-zh-wenet-aishell
mv huggingface $dst
tar cjvf $dst.tar.bz2 $dst
rm -rf $dst
- name: Publish to huggingface (aishell2)
env:
@@ -115,7 +122,14 @@ jobs:
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-aishell2 main || true
cd ..
rm -rf huggingface
rm -rf huggingface/.git
dst=sherpa-onnx-zh-wenet-aishell2
mv huggingface $dst
tar cjvf $dst.tar.bz2 $dst
rm -rf $dst
- name: Publish to huggingface (multi_cn)
env:
@@ -157,7 +171,14 @@ jobs:
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-multi-cn main || true
cd ..
rm -rf huggingface
rm -rf huggingface/.git
dst=sherpa-onnx-zh-wenet-multi-cn
mv huggingface $dst
tar cjvf $dst.tar.bz2 $dst
rm -rf $dst
- name: Publish to huggingface (wenetspeech)
env:
@@ -199,7 +220,14 @@ jobs:
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-zh-wenet-wenetspeech main || true
cd ..
rm -rf huggingface
rm -rf huggingface/.git
dst=sherpa-onnx-zh-wenet-wenetspeech
mv huggingface $dst
tar cjvf $dst.tar.bz2 $dst
rm -rf $dst
- name: Publish to huggingface (librispeech)
env:
@@ -242,7 +270,14 @@ jobs:
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-en-wenet-librispeech main || true
cd ..
rm -rf huggingface
rm -rf huggingface/.git
dst=sherpa-onnx-en-wenet-librispeech
mv huggingface $dst
tar cjvf $dst.tar.bz2 $dst
rm -rf $dst
- name: Publish to huggingface (gigaspeech)
env:
@@ -285,4 +320,21 @@ jobs:
git push https://csukuangfj:$HF_TOKEN@huggingface.co/csukuangfj/sherpa-onnx-en-wenet-gigaspeech main || true
cd ..
rm -rf huggingface
rm -rf huggingface/.git
dst=sherpa-onnx-en-wenet-gigaspeech
mv huggingface $dst
tar cjvf $dst.tar.bz2 $dst
rm -rf $dst
- name: Release
uses: svenstaro/upload-release-action@v2
with:
file_glob: true
file: ./*.tar.bz2
overwrite: true
repo_name: k2-fsa/sherpa-onnx
repo_token: ${{ secrets.UPLOAD_GH_SHERPA_ONNX_TOKEN }}
tag: asr-models

1
.github/workflows/release-dart-package.yaml vendored
View File

@@ -85,7 +85,6 @@ jobs:
make install
ls -lh ./install/lib
rm -v ./install/lib/libonnxruntime.so
- name: Copy pre-built libs
shell: bash

6
.github/workflows/test-go-package.yaml vendored
View File

@@ -269,7 +269,7 @@ jobs:
echo "Test paraformer"
./run-paraformer.sh
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
echo "Test NeMo CTC"
./run-nemo-ctc.sh
@@ -306,7 +306,7 @@ jobs:
echo "Test paraformer"
./run-paraformer.sh
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
echo "Test NeMo CTC"
./run-nemo-ctc.sh
@@ -351,7 +351,7 @@ jobs:
echo "Test paraformer"
./run-paraformer.sh
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
echo "Test NeMo CTC"
./run-nemo-ctc.sh

9
.github/workflows/test-go.yaml vendored
View File

@@ -94,11 +94,6 @@ jobs:
cp -v _deps/onnxruntime-src/lib/libonnxruntime*so* $upload_dir
cp -v _deps/onnxruntime-src/lib/libonnxruntime*so* ./lib/
rm -v ./lib/libonnxruntime.so
cd lib
ln -s libonnxruntime.so.1.17.1 libonnxruntime.so
cd ..
rm -v ./lib/*.a
ls -h ./lib
@@ -121,7 +116,7 @@ jobs:
rm ./lib/*.a
rm ./lib/libonnxruntime.dylib
cd lib
ln -s libonnxruntime.1.17.1.dylib libonnxruntime.dylib
ln -s libonnxruntime.1.18.0.dylib libonnxruntime.dylib
cd ..
fi
@@ -211,7 +206,7 @@ jobs:
echo "Test paraformer"
./run-paraformer.sh
./run-paraformer-itn.sh
rm -rf sherpa-onnx-paraformer-zh-2023-03-28
rm -rf sherpa-onnx-paraformer-zh-2023-09-14
echo "Test NeMo CTC"
./run-nemo-ctc.sh

26
.github/workflows/test-python-offline-websocket-server.yaml vendored
View File

@@ -104,13 +104,13 @@ jobs:
if: matrix.model_type == 'paraformer' && matrix.os != 'windows-latest'
shell: bash
run: |
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
python3 ./python-api-examples/non_streaming_server.py \
--paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt &
--paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt &
echo "sleep 10 seconds to wait the server start"
sleep 10
@@ -120,16 +120,16 @@ jobs:
shell: bash
run: |
python3 ./python-api-examples/offline-websocket-client-decode-files-paralell.py \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/1.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/2.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/8k.wav
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/1.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/2.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/8k.wav
python3 ./python-api-examples/offline-websocket-client-decode-files-sequential.py \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/1.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/2.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/8k.wav
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/1.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/2.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/8k.wav
- name: Start server for nemo_ctc models
if: matrix.model_type == 'nemo_ctc'

1
.gitignore vendored
View File

@@ -48,6 +48,7 @@ paraformer-onnxruntime-python-example
run-sherpa-onnx-offline-paraformer.sh
run-sherpa-onnx-offline-transducer.sh
sherpa-onnx-paraformer-zh-2023-03-28
sherpa-onnx-paraformer-zh-2023-09-14
run-offline-websocket-server-paraformer.sh
run-*int8.sh
a.sh

4
CHANGELOG.md
View File

@@ -1,3 +1,7 @@
## 1.10.13
* Update onnxruntime from 1.17.1 to 1.18.0
## 1.10.12
* Add Flush to VAD so that the last speech segment can be detected. See also

37
CMakeLists.txt
View File

@@ -11,7 +11,7 @@ project(sherpa-onnx)
# ./nodejs-addon-examples
# ./dart-api-examples/
# ./CHANGELOG.md
set(SHERPA_ONNX_VERSION "1.10.12")
set(SHERPA_ONNX_VERSION "1.10.13")
# Disable warning about
#
@@ -22,19 +22,9 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
endif()
include(CheckIPOSupported)
check_ipo_supported(RESULT ipo)
if(ipo)
message(STATUS "IPO is enabled")
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
else()
message(STATUS "IPO is not available")
endif()
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
option(SHERPA_ONNX_ENABLE_PYTHON "Whether to build Python" OFF)
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_
message(STATUS "SHERPA_ONNX_ENABLE_SANITIZER: ${SHERPA_ONNX_ENABLE_SANITIZER}")
message(STATUS "SHERPA_ONNX_BUILD_C_API_EXAMPLES: ${SHERPA_ONNX_BUILD_C_API_EXAMPLES}")
if(BUILD_SHARED_LIBS)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
if(BUILD_SHARED_LIBS AND NOT CMAKE_SYSTEM_NAME STREQUAL iOS)
# Don't use LTO for iOS since it causes the following error
# error: unable to find any architecture information in the binary
# at '/Users/fangjun/open-source/sherpa-onnx/build-ios/build/os64/sherpa-onnx.a':
# Unknown header: 0xb17c0de
# See also https://forums.developer.apple.com/forums/thread/714324
include(CheckIPOSupported)
check_ipo_supported(RESULT ipo)
if(ipo)
message(STATUS "IPO is enabled")
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
else()
message(STATUS "IPO is not available")
endif()
endif()
if(SHERPA_ONNX_ENABLE_TTS)
message(STATUS "TTS is enabled")
add_definitions(-DSHERPA_ONNX_ENABLE_TTS=1)

2
build-android-arm64-v8a.sh
View File

@@ -42,7 +42,7 @@ fi
echo "ANDROID_NDK: $ANDROID_NDK"
sleep 1
onnxruntime_version=1.17.1
onnxruntime_version=1.18.0
if [ ! -f $onnxruntime_version/jni/arm64-v8a/libonnxruntime.so ]; then
mkdir -p $onnxruntime_version

2
build-android-armv7-eabi.sh
View File

@@ -43,7 +43,7 @@ fi
echo "ANDROID_NDK: $ANDROID_NDK"
sleep 1
onnxruntime_version=1.17.1
onnxruntime_version=1.18.0
if [ ! -f $onnxruntime_version/jni/armeabi-v7a/libonnxruntime.so ]; then
mkdir -p $onnxruntime_version

2
build-android-x86-64.sh
View File

@@ -43,7 +43,7 @@ fi
echo "ANDROID_NDK: $ANDROID_NDK"
sleep 1
onnxruntime_version=1.17.1
onnxruntime_version=1.18.0
if [ ! -f $onnxruntime_version/jni/x86_64/libonnxruntime.so ]; then
mkdir -p $onnxruntime_version

2
build-android-x86.sh
View File

@@ -43,7 +43,7 @@ fi
echo "ANDROID_NDK: $ANDROID_NDK"
sleep 1
onnxruntime_version=1.17.1
onnxruntime_version=1.18.0
if [ ! -f $onnxruntime_version/jni/x86/libonnxruntime.so ]; then
mkdir -p $onnxruntime_version

2
build-ios-no-tts.sh
View File

@@ -5,7 +5,7 @@ set -e
dir=build-ios-no-tts
mkdir -p $dir
cd $dir
onnxruntime_version=1.17.1
onnxruntime_version=1.18.0
onnxruntime_dir=ios-onnxruntime/$onnxruntime_version
if [ ! -f $onnxruntime_dir/onnxruntime.xcframework/ios-arm64/onnxruntime.a ]; then

2
build-ios-shared.sh
View File

@@ -10,7 +10,7 @@ set -e
dir=build-ios-shared
mkdir -p $dir
cd $dir
onnxruntime_version=1.17.1
onnxruntime_version=1.18.0
onnxruntime_dir=ios-onnxruntime/$onnxruntime_version
SHERPA_ONNX_GITHUB=github.com

156
build-ios.sh
View File

@@ -5,7 +5,7 @@ set -e
dir=build-ios
mkdir -p $dir
cd $dir
onnxruntime_version=1.17.1
onnxruntime_version=1.18.0
onnxruntime_dir=ios-onnxruntime/$onnxruntime_version
SHERPA_ONNX_GITHUB=github.com
@@ -39,91 +39,96 @@ echo "SHERPA_ONNXRUNTIME_INCLUDE_DIR $SHERPA_ONNXRUNTIME_INCLUDE_DIR"
# The symbol _NSLog is not defined
#
cmake \
-DBUILD_PIPER_PHONMIZE_EXE=OFF \
-DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-DBUILD_ESPEAK_NG_EXE=OFF \
-DBUILD_ESPEAK_NG_TESTS=OFF \
-S .. \
-DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-DPLATFORM=SIMULATOR64 \
-DENABLE_BITCODE=0 \
-DENABLE_ARC=1 \
-DENABLE_VISIBILITY=0 \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-DDEPLOYMENT_TARGET=13.0 \
-B build/simulator_x86_64
if [[ ! -f ./build/simulator_x86_64/lib/libsherpa-onnx-c-api.a ]]; then
cmake \
-DBUILD_PIPER_PHONMIZE_EXE=OFF \
-DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-DBUILD_ESPEAK_NG_EXE=OFF \
-DBUILD_ESPEAK_NG_TESTS=OFF \
-S .. \
-DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-DPLATFORM=SIMULATOR64 \
-DENABLE_BITCODE=0 \
-DENABLE_ARC=1 \
-DENABLE_VISIBILITY=0 \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-DDEPLOYMENT_TARGET=13.0 \
-B build/simulator_x86_64
cmake --build build/simulator_x86_64 -j 4 --verbose
cmake --build build/simulator_x86_64 -j 4 --verbose
fi
echo "Building for simulator (arm64)"
cmake \
-DBUILD_PIPER_PHONMIZE_EXE=OFF \
-DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-DBUILD_ESPEAK_NG_EXE=OFF \
-DBUILD_ESPEAK_NG_TESTS=OFF \
-S .. \
-DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-DPLATFORM=SIMULATORARM64 \
-DENABLE_BITCODE=0 \
-DENABLE_ARC=1 \
-DENABLE_VISIBILITY=0 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=./install \
-DBUILD_SHARED_LIBS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-DDEPLOYMENT_TARGET=13.0 \
-B build/simulator_arm64
if [[ ! -f ./build/simulator_arm64/lib/libsherpa-onnx-c-api.a ]]; then
cmake \
-DBUILD_PIPER_PHONMIZE_EXE=OFF \
-DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-DBUILD_ESPEAK_NG_EXE=OFF \
-DBUILD_ESPEAK_NG_TESTS=OFF \
-S .. \
-DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-DPLATFORM=SIMULATORARM64 \
-DENABLE_BITCODE=0 \
-DENABLE_ARC=1 \
-DENABLE_VISIBILITY=0 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=./install \
-DBUILD_SHARED_LIBS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-DDEPLOYMENT_TARGET=13.0 \
-B build/simulator_arm64
cmake --build build/simulator_arm64 -j 4 --verbose
cmake --build build/simulator_arm64 -j 4 --verbose
fi
echo "Building for arm64"
export SHERPA_ONNXRUNTIME_LIB_DIR=$PWD/ios-onnxruntime/onnxruntime.xcframework/ios-arm64
if [[ ! -f ./build/os64/lib/libsherpa-onnx-c-api.a ]]; then
cmake \
-DBUILD_PIPER_PHONMIZE_EXE=OFF \
-DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-DBUILD_ESPEAK_NG_EXE=OFF \
-DBUILD_ESPEAK_NG_TESTS=OFF \
-S .. \
-DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-DPLATFORM=OS64 \
-DENABLE_BITCODE=0 \
-DENABLE_ARC=1 \
-DENABLE_VISIBILITY=0 \
-DCMAKE_INSTALL_PREFIX=./install \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-DDEPLOYMENT_TARGET=13.0 \
-B build/os64
cmake \
-DBUILD_PIPER_PHONMIZE_EXE=OFF \
-DBUILD_PIPER_PHONMIZE_TESTS=OFF \
-DBUILD_ESPEAK_NG_EXE=OFF \
-DBUILD_ESPEAK_NG_TESTS=OFF \
-S .. \
-DCMAKE_TOOLCHAIN_FILE=./toolchains/ios.toolchain.cmake \
-DPLATFORM=OS64 \
-DENABLE_BITCODE=0 \
-DENABLE_ARC=1 \
-DENABLE_VISIBILITY=0 \
-DCMAKE_INSTALL_PREFIX=./install \
-DCMAKE_BUILD_TYPE=Release \
-DBUILD_SHARED_LIBS=OFF \
-DSHERPA_ONNX_ENABLE_PYTHON=OFF \
-DSHERPA_ONNX_ENABLE_TESTS=OFF \
-DSHERPA_ONNX_ENABLE_CHECK=OFF \
-DSHERPA_ONNX_ENABLE_PORTAUDIO=OFF \
-DSHERPA_ONNX_ENABLE_JNI=OFF \
-DSHERPA_ONNX_ENABLE_C_API=ON \
-DSHERPA_ONNX_ENABLE_WEBSOCKET=OFF \
-DDEPLOYMENT_TARGET=13.0 \
-B build/os64
cmake --build build/os64 -j 4
# Generate headers for sherpa-onnx.xcframework
cmake --build build/os64 --target install
cmake --build build/os64 -j 4
# Generate headers for sherpa-onnx.xcframework
cmake --build build/os64 --target install
fi
echo "Generate xcframework"
@@ -165,7 +170,6 @@ libtool -static -o build/os64/sherpa-onnx.a \
build/os64/lib/libespeak-ng.a \
build/os64/lib/libssentencepiece_core.a
rm -rf sherpa-onnx.xcframework
xcodebuild -create-xcframework \

3
cmake/cmake_extension.py
View File

@@ -216,9 +216,6 @@ class BuildExtension(build_ext):
shutil.rmtree(f"{install_dir}/share")
shutil.rmtree(f"{install_dir}/lib/pkgconfig")
if is_linux():
os.remove(f"{install_dir}/lib/libonnxruntime.so")
if is_macos():
os.remove(f"{install_dir}/lib/libonnxruntime.dylib")

16
cmake/onnxruntime-linux-aarch64-static.cmake
View File

@@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-aarch64-static_lib-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-aarch64-static_lib-1.17.1.zip")
set(onnxruntime_HASH "SHA256=831b9a3869501040b4399de85f34c4f170e2bcbd41881edaeb553f8dc4080985")
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")
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")
set(onnxruntime_HASH "SHA256=82f5a17859261b16a42719afdf58ffb1a48c76f51d9463c89333ac335200fe39")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
/tmp/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
/tmp/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-static_lib-1.18.0-glibc2_17.zip
)
foreach(f IN LISTS possible_file_locations)

17
cmake/onnxruntime-linux-aarch64.cmake
View File

@@ -14,19 +14,20 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip")
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")
set(onnxruntime_HASH "SHA256=2ed01996da79d11ea486f738010bd411096ab91e744306fbd30d09f37e6d43a0")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip")
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")
# set(onnxruntime_HASH "SHA256=9b288e867f09521d3a9f17b9c0979ac92bc1817dc083dc82d54aa027c0dac781")
set(onnxruntime_HASH) # TODO(fangjun): Update it
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip
/tmp/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-glibc2_17-Release-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
/tmp/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
/star-fj/fangjun/download/github/onnxruntime-linux-aarch64-glibc2_17-Release-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

16
cmake/onnxruntime-linux-arm-static.cmake
View File

@@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-arm-static_lib-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-arm-static_lib-1.17.1.zip")
set(onnxruntime_HASH "SHA256=3f2ba38156d2facfb732c0fe53bc1eaaf2791d9a91dd240380e3d53716798b09")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-arm-static_lib-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-arm-static_lib-1.18.0.zip")
set(onnxruntime_HASH "SHA256=ba4590a386bc4aae3e03b00ccc1be42edd582fd7ecf5583614e1e0c2e7424652")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-linux-arm-static_lib-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.17.1.zip
/tmp/onnxruntime-linux-arm-static_lib-1.17.1.zip
/star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-linux-arm-static_lib-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-static_lib-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-static_lib-1.18.0.zip
/tmp/onnxruntime-linux-arm-static_lib-1.18.0.zip
/star-fj/fangjun/download/github/onnxruntime-linux-arm-static_lib-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

17
cmake/onnxruntime-linux-arm.cmake
View File

@@ -14,19 +14,20 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-arm-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-arm-1.17.1.zip")
set(onnxruntime_HASH "SHA256=08eed09b35a015fbf3a068baf6388a3b447d24dec62b75cd591a01179d0bfe7b")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-arm-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-arm-1.18.0.zip")
# set(onnxruntime_HASH "SHA256=f713a5e09bff5ff1438c26d26cf283d305e37af1fbd59e9190b17cd7f8d2b1c6")
set(onnxruntime_HASH) # TODO(fangjun): Update it
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-linux-arm-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-1.17.1.zip
/tmp/onnxruntime-linux-arm-1.17.1.zip
/star-fj/fangjun/download/github/onnxruntime-linux-arm-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-linux-arm-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-arm-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-arm-1.18.0.zip
/tmp/onnxruntime-linux-arm-1.18.0.zip
/star-fj/fangjun/download/github/onnxruntime-linux-arm-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

16
cmake/onnxruntime-linux-x86_64-gpu.cmake
View File

@@ -18,19 +18,19 @@ if(NOT SHERPA_ONNX_ENABLE_GPU)
message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}")
endif()
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-linux-x64-gpu-1.17.1.tgz")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-linux-x64-gpu-1.17.1.tgz")
set(onnxruntime_HASH "SHA256=613c53745ea4960ed368f6b3ab673558bb8561c84a8fa781b4ea7fb4a4340be4")
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-linux-x64-gpu-1.18.0.tgz")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-linux-x64-gpu-1.18.0.tgz")
set(onnxruntime_HASH "SHA256=e49980108c0b9dd718c14fa2e6ba3cd90b9ff8e9bde8ebac0a2f1aacdc0603ca")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-linux-x64-gpu-1.17.1.tgz
${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-gpu-1.17.1.tgz
${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-gpu-1.17.1.tgz
/tmp/onnxruntime-linux-x64-gpu-1.17.1.tgz
/star-fj/fangjun/download/github/onnxruntime-linux-x64-gpu-1.17.1.tgz
$ENV{HOME}/Downloads/onnxruntime-linux-x64-gpu-1.18.0.tgz
${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-gpu-1.18.0.tgz
${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-gpu-1.18.0.tgz
/tmp/onnxruntime-linux-x64-gpu-1.18.0.tgz
/star-fj/fangjun/download/github/onnxruntime-linux-x64-gpu-1.18.0.tgz
)
foreach(f IN LISTS possible_file_locations)

16
cmake/onnxruntime-linux-x86_64-static.cmake
View File

@@ -14,19 +14,19 @@ if(BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
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")
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")
set(onnxruntime_HASH "SHA256=44377e9b7eef618afd10216a597a4d2a09a74727cbc5bdd7d86ca2b6e00a28cb")
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")
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")
set(onnxruntime_HASH "SHA256=4112757cb49dd53853748813cb2b5d164c8bec465fff852be247d450b95b0737")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip
/tmp/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip
/star-fj/fangjun/download/github/onnxruntime-linux-x64-static_lib-1.17.1-gcc-8.zip
$ENV{HOME}/Downloads/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
/tmp/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
/star-fj/fangjun/download/github/onnxruntime-linux-x64-static_lib-1.18.0-glibc2_17.zip
)
foreach(f IN LISTS possible_file_locations)

16
cmake/onnxruntime-linux-x86_64.cmake
View File

@@ -14,19 +14,19 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip")
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")
set(onnxruntime_HASH "SHA256=3cfa5c2c5c21a9401572af5a4cd9d15ed8f6524f10d3b80e5a38676b3a31efe0")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip")
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")
set(onnxruntime_HASH "SHA256=96137d33c88a036d5afe64dee5f530a1b78705d41857d8aac88a3c2b53a6a5ac")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip
/tmp/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip
/star-fj/fangjun/download/github/onnxruntime-linux-x64-glibc2_17-Release-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
/tmp/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
/star-fj/fangjun/download/github/onnxruntime-linux-x64-glibc2_17-Release-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-osx-arm64-static.cmake
View File

@@ -12,18 +12,18 @@ if(BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-arm64-static_lib-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-arm64-static_lib-1.17.1.zip")
set(onnxruntime_HASH "SHA256=b88a4017251c159fea005aefe836bd0cf4d0bc7454e2810784f84a42143f17eb")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-arm64-static_lib-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-arm64-static_lib-1.18.0.zip")
set(onnxruntime_HASH "SHA256=2faea156041f0658ef60423f5b0a34ba5d9127297b429c73ce98225e66f610bf")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-osx-arm64-static_lib-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-static_lib-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-static_lib-1.17.1.zip
/tmp/onnxruntime-osx-arm64-static_lib-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-osx-arm64-static_lib-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-static_lib-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-static_lib-1.18.0.zip
/tmp/onnxruntime-osx-arm64-static_lib-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-osx-arm64.cmake
View File

@@ -12,18 +12,18 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-arm64-1.17.1.tgz")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-arm64-1.17.1.tgz")
set(onnxruntime_HASH "SHA256=89566f424624a7ad9a7d9d5e413c44b9639a994d7171cf409901d125b16e2bb3")
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-arm64-1.18.0.tgz")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-arm64-1.18.0.tgz")
set(onnxruntime_HASH "SHA256=c5ff520d2913e3360670979ca4fe43717fc3aa0c0c367a75fbb6f2f15c0cb48d")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-osx-arm64-1.17.1.tgz
${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-1.17.1.tgz
${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-1.17.1.tgz
/tmp/onnxruntime-osx-arm64-1.17.1.tgz
$ENV{HOME}/Downloads/onnxruntime-osx-arm64-1.18.0.tgz
${CMAKE_SOURCE_DIR}/onnxruntime-osx-arm64-1.18.0.tgz
${CMAKE_BINARY_DIR}/onnxruntime-osx-arm64-1.18.0.tgz
/tmp/onnxruntime-osx-arm64-1.18.0.tgz
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-osx-universal-static.cmake
View File

@@ -13,18 +13,18 @@ if(BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-universal2-static_lib-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-universal2-static_lib-1.17.1.zip")
set(onnxruntime_HASH "SHA256=45599dbd2fb9dd52d6505930c0e82ca165391e222a68f5606b9ea9d4f3922e15")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-universal2-static_lib-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-universal2-static_lib-1.18.0.zip")
set(onnxruntime_HASH "SHA256=a36c250ef90b15467fc126644825b2c4b7983f1f7c718051563f990606ab28f5")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-osx-universal2-static_lib-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-static_lib-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-static_lib-1.17.1.zip
/tmp/onnxruntime-osx-universal2-static_lib-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-osx-universal2-static_lib-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-static_lib-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-static_lib-1.18.0.zip
/tmp/onnxruntime-osx-universal2-static_lib-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-osx-universal.cmake
View File

@@ -13,18 +13,18 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-universal2-1.17.1.tgz")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-universal2-1.17.1.tgz")
set(onnxruntime_HASH "SHA256=9fa57fa6f202a373599377ef75064ae568fda8da838632b26a86024c7378d306")
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-universal2-1.18.0.tgz")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-universal2-1.18.0.tgz")
set(onnxruntime_HASH "SHA256=4df8e1fec0190ee504a68469591e8715c04bfe9deba2bb7e8985c07360c1c0f8")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-osx-universal2-1.17.1.tgz
${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-1.17.1.tgz
${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-1.17.1.tgz
/tmp/onnxruntime-osx-universal2-1.17.1.tgz
$ENV{HOME}/Downloads/onnxruntime-osx-universal2-1.18.0.tgz
${CMAKE_SOURCE_DIR}/onnxruntime-osx-universal2-1.18.0.tgz
${CMAKE_BINARY_DIR}/onnxruntime-osx-universal2-1.18.0.tgz
/tmp/onnxruntime-osx-universal2-1.18.0.tgz
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-osx-x86_64-static.cmake
View File

@@ -12,18 +12,18 @@ if(BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-osx-x86_64-static_lib-1.17.1.zip")
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")
set(onnxruntime_HASH "SHA256=5ff8efb97e50e257943c6c588328d2c57b649278098d3b468036f02755b60903")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-osx-x86_64-static_lib-1.18.0.zip")
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")
set(onnxruntime_HASH "SHA256=a7ccc5f7acce2554a43174ff7c2efc5fa71d7dc0a5a91208096120cc775a9575")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-osx-x86_64-static_lib-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-static_lib-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-static_lib-1.17.1.zip
/tmp/onnxruntime-osx-x86_64-static_lib-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-osx-x86_64-static_lib-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-static_lib-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-static_lib-1.18.0.zip
/tmp/onnxruntime-osx-x86_64-static_lib-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-osx-x86_64.cmake
View File

@@ -12,18 +12,18 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-x86_64-1.17.1.tgz")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-osx-x86_64-1.17.1.tgz")
set(onnxruntime_HASH "SHA256=86c6b6896434084ff5086eebc4e9ea90be1ed4d46743f92864f46ee43e7b5059")
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-x86_64-1.18.0.tgz")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-osx-x86_64-1.18.0.tgz")
set(onnxruntime_HASH "SHA256=3af96893675b295e5e0eb886f470de585089f92f9950158d042fbc02b44ed101")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-osx-x86_64-1.17.1.tgz
${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-1.17.1.tgz
${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-1.17.1.tgz
/tmp/onnxruntime-osx-x86_64-1.17.1.tgz
$ENV{HOME}/Downloads/onnxruntime-osx-x86_64-1.18.0.tgz
${CMAKE_SOURCE_DIR}/onnxruntime-osx-x86_64-1.18.0.tgz
${CMAKE_BINARY_DIR}/onnxruntime-osx-x86_64-1.18.0.tgz
/tmp/onnxruntime-osx-x86_64-1.18.0.tgz
)
foreach(f IN LISTS possible_file_locations)

16
cmake/onnxruntime-wasm-simd.cmake
View File

@@ -10,19 +10,19 @@ if(BUILD_SHARED_LIBS)
message(FATAL_ERROR "BUILD_SHARED_LIBS should be OFF for WebAssembly")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-wasm-static_lib-simd-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-wasm-static_lib-simd-1.17.1.zip")
set(onnxruntime_HASH "SHA256=8f07778e4233cf5a61a9d0795d90c5497177fbe8a46b701fda2d8d4e2b11cef8")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-wasm-static_lib-simd-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-wasm-static_lib-simd-1.18.0.zip")
set(onnxruntime_HASH "SHA256=590e8c8b292304e9c4ed34d980ce3fe028c76f2594e7f2d88cda80248757c6fb")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-wasm-static_lib-simd-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-wasm-static_lib-simd-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-wasm-static_lib-simd-1.17.1.zip
/tmp/onnxruntime-wasm-static_lib-simd-1.17.1.zip
/star-fj/fangjun/download/github/onnxruntime-wasm-static_lib-simd-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-wasm-static_lib-simd-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-wasm-static_lib-simd-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-wasm-static_lib-simd-1.18.0.zip
/tmp/onnxruntime-wasm-static_lib-simd-1.18.0.zip
/star-fj/fangjun/download/github/onnxruntime-wasm-static_lib-simd-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-win-arm64.cmake
View File

@@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-arm64-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-arm64-1.17.1.zip")
set(onnxruntime_HASH "SHA256=47782cebcab0fd7a1f0a3f0676b088c1bc0f4fbf21666f6fe57570dc362fa5a8")
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-arm64-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-arm64-1.18.0.zip")
set(onnxruntime_HASH "SHA256=cd8859437d71b43beb942e0f2515d27d20aa8f753b8e9c2efa01476eb1a57023")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-win-arm64-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-win-arm64-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-win-arm64-1.17.1.zip
/tmp/onnxruntime-win-arm64-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-win-arm64-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-win-arm64-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-win-arm64-1.18.0.zip
/tmp/onnxruntime-win-arm64-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-win-x64-gpu.cmake
View File

@@ -19,18 +19,18 @@ if(NOT SHERPA_ONNX_ENABLE_GPU)
message(FATAL_ERROR "This file is for NVIDIA GPU only. Given SHERPA_ONNX_ENABLE_GPU: ${SHERPA_ONNX_ENABLE_GPU}")
endif()
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x64-gpu-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x64-gpu-1.17.1.zip")
set(onnxruntime_HASH "SHA256=b7a66f50ad146c2ccb43471d2d3b5ad78084c2d4ddbd3ea82d65f86c867408b2")
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x64-gpu-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x64-gpu-1.18.0.zip")
set(onnxruntime_HASH "SHA256=ec3b668fdc818b20dbabf083b488f979dce4a61c8b922af9e79e81277ac0e322")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-win-x64-gpu-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-gpu-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-win-x64-gpu-1.17.1.zip
/tmp/onnxruntime-win-x64-gpu-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-win-x64-gpu-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-gpu-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-win-x64-gpu-1.18.0.zip
/tmp/onnxruntime-win-x64-gpu-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

18
cmake/onnxruntime-win-x64-static-debug.cmake
View File

@@ -15,14 +15,14 @@ if(BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building static libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
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")
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")
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")
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")
if(CMAKE_BUILD_TYPE STREQUAL Debug)
set(onnxruntime_HASH "SHA256=ecc68d914541c3b6ebc36148af63fe2a6af0f4f955b35199d612698d23169fa5")
set(onnxruntime_HASH "SHA256=1fbb751fcf5360466aeb4fdf0d919e891d3c7fcaf9cdda26bc82c5ff9d07b15c")
elseif(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
set(onnxruntime_HASH "SHA256=7cbe58273e55d033568f84fb16d220cea4e25ec29eb7db405c4ac7b6e41f2dfa")
set(onnxruntime_HASH "SHA256=fb59483e6e384ad6e48fe68f04716a9adef9a0106bcf2be74821a49c785be39e")
elseif(CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
set(onnxruntime_HASH "SHA256=9eb3adf0f6ac3b0e9f118e0d9e686f50fc651394e0b0cc569275af6e3ffed0e0")
set(onnxruntime_HASH "SHA256=4f2c818b1a31006d783aae929a2ad649af94797eea4dad61ab5044731daab2c9")
else()
message(FATAL_ERROR "This file is for building a debug version on Windows x64. Given ${CMAKE_BUILD_TYPE}")
endif()
@@ -31,10 +31,10 @@ endif()
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2
${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2
${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2
/tmp/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2
$ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
/tmp/onnxruntime-win-x64-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-win-x64-static.cmake
View File

@@ -19,18 +19,18 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL Release)
message(FATAL_ERROR "This file is for building a release version on Windows x64")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2")
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")
set(onnxruntime_HASH "SHA256=42a0c02fda945d1d72433b2a7cdb2187d51cb4d7f3af462c6ae07b25314d5fb3")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2")
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")
set(onnxruntime_HASH "SHA256=dcbe48216fe0e5356ddd14e2f48fa1567bbb22792fe156c6252afb044178b2de")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2
${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2
${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2
/tmp/onnxruntime-win-x64-static_lib-1.17.1.tar.bz2
$ENV{HOME}/Downloads/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2
${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2
${CMAKE_BINARY_DIR}/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2
/tmp/onnxruntime-win-x64-static_lib-1.18.0.tar.bz2
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-win-x64.cmake
View File

@@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x64-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x64-1.17.1.zip")
set(onnxruntime_HASH "SHA256=4802af9598db02153d7da39432a48823ff69b2fb4b59155461937f20782aa91c")
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x64-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x64-1.18.0.zip")
set(onnxruntime_HASH "SHA256=a91af21ca8f9bdfa5a1aac3fdd0591384b4e2866d41612925f1758d5522829e7")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-win-x64-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-win-x64-1.17.1.zip
/tmp/onnxruntime-win-x64-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-win-x64-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-win-x64-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-win-x64-1.18.0.zip
/tmp/onnxruntime-win-x64-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

18
cmake/onnxruntime-win-x86-static-debug.cmake
View File

@@ -16,14 +16,14 @@ if(BUILD_SHARED_LIBS)
endif()
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")
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")
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")
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")
if(CMAKE_BUILD_TYPE STREQUAL Debug)
set(onnxruntime_HASH "SHA256=b08b223fe09a5640472eec487ff42e4df6bf726e8aba9de40f443a1fabea3334")
set(onnxruntime_HASH "SHA256=0ccb0820a14e54e5cdbb5125647c8c6f72c8bb1ed2324945b1db2a9f35030103")
elseif(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
set(onnxruntime_HASH "SHA256=215c68d4cf07fab47434059544f4b3e1885bb68149fc7ce5b78a9feb08cf6baa")
set(onnxruntime_HASH "SHA256=9740689365f611b48d25bb0a7521848a2ea4a5365c37e85766c6f7925e0ba887")
elseif(CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
set(onnxruntime_HASH "SHA256=af6ff6f6a7ca6fb9f037bdd1cbd9b973921d069f7fce69833627ce04674bf579")
set(onnxruntime_HASH "SHA256=4b35849c452a717e9e4b88ea267beba92f4806cc29e7773dda07fa7a59897e12")
else()
message(FATAL_ERROR "This file is for building a debug version on Windows x86. Given ${CMAKE_BUILD_TYPE}")
endif()
@@ -32,10 +32,10 @@ endif()
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2
${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2
${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2
/tmp/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.17.1.tar.bz2
$ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
/tmp/onnxruntime-win-x86-static_lib-${CMAKE_BUILD_TYPE}-1.18.0.tar.bz2
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-win-x86-static.cmake
View File

@@ -19,18 +19,18 @@ if(NOT CMAKE_BUILD_TYPE STREQUAL Release)
message(FATAL_ERROR "This file is for building a release version on Windows x86")
endif()
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.17.1/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2")
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")
set(onnxruntime_HASH "SHA256=52375d3fabc7b437c955a664bfeb9cb7a6391f5219c4b7d3b87ff690416d4b9e")
set(onnxruntime_URL "https://github.com/csukuangfj/onnxruntime-libs/releases/download/v1.18.0/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2")
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")
set(onnxruntime_HASH "SHA256=895c9e284a0365732467fe19b018e3949c0755148fc386cf6d8f8e28f1a7ed80")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2
${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2
${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2
/tmp/onnxruntime-win-x86-static_lib-1.17.1.tar.bz2
$ENV{HOME}/Downloads/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2
${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2
${CMAKE_BINARY_DIR}/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2
/tmp/onnxruntime-win-x86-static_lib-1.18.0.tar.bz2
)
foreach(f IN LISTS possible_file_locations)

14
cmake/onnxruntime-win-x86.cmake
View File

@@ -15,18 +15,18 @@ if(NOT BUILD_SHARED_LIBS)
message(FATAL_ERROR "This file is for building shared libraries. BUILD_SHARED_LIBS: ${BUILD_SHARED_LIBS}")
endif()
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x86-1.17.1.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.17.1/onnxruntime-win-x86-1.17.1.zip")
set(onnxruntime_HASH "SHA256=9404130825474bd36b2538ed925d6b5f2cf1fb6a443f3e125054ae3470019291")
set(onnxruntime_URL "https://github.com/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x86-1.18.0.zip")
set(onnxruntime_URL2 "https://hub.nuaa.cf/microsoft/onnxruntime/releases/download/v1.18.0/onnxruntime-win-x86-1.18.0.zip")
set(onnxruntime_HASH "SHA256=b71a6ea9f7fee248ce79dadab45cf522a44a74270c85f8e4ff1ca6ab6bcbae42")
# If you don't have access to the Internet,
# please download onnxruntime to one of the following locations.
# You can add more if you want.
set(possible_file_locations
$ENV{HOME}/Downloads/onnxruntime-win-x86-1.17.1.zip
${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-1.17.1.zip
${CMAKE_BINARY_DIR}/onnxruntime-win-x86-1.17.1.zip
/tmp/onnxruntime-win-x86-1.17.1.zip
$ENV{HOME}/Downloads/onnxruntime-win-x86-1.18.0.zip
${CMAKE_SOURCE_DIR}/onnxruntime-win-x86-1.18.0.zip
${CMAKE_BINARY_DIR}/onnxruntime-win-x86-1.18.0.zip
/tmp/onnxruntime-win-x86-1.18.0.zip
)
foreach(f IN LISTS possible_file_locations)

2
dart-api-examples/non-streaming-asr/pubspec.yaml
View File

@@ -10,7 +10,7 @@ environment:
# Add regular dependencies here.
dependencies:
sherpa_onnx: ^1.10.12
sherpa_onnx: ^1.10.13
path: ^1.9.0
args: ^2.5.0

12
dart-api-examples/non-streaming-asr/run-paraformer-itn.sh
View File

@@ -4,11 +4,11 @@ set -ex
dart pub get
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
if [ ! -f ./itn-zh-number.wav ]; then
@@ -21,7 +21,7 @@ fi
dart run \
./bin/paraformer-itn.dart \
--model ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \
--model ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
--rule-fsts ./itn_zh_number.fst \
--input-wav ./itn-zh-number.wav

14
dart-api-examples/non-streaming-asr/run-paraformer.sh
View File

@@ -4,15 +4,15 @@ set -ex
dart pub get
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
dart run \
./bin/paraformer.dart \
--model ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \
--input-wav ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/3-sichuan.wav
--model ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
--input-wav ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/3-sichuan.wav

12
dart-api-examples/non-streaming-asr/run-vad-with-paraformer.sh
View File

@@ -12,16 +12,16 @@ if [[ ! -f ./lei-jun-test.wav ]]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav
fi
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
dart run \
./bin/vad-with-paraformer.dart \
--silero-vad ./silero_vad.onnx \
--model ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \
--model ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
--input-wav ./lei-jun-test.wav

2
dart-api-examples/streaming-asr/pubspec.yaml
View File

@@ -11,7 +11,7 @@ environment:
# Add regular dependencies here.
dependencies:
sherpa_onnx: ^1.10.12
sherpa_onnx: ^1.10.13
path: ^1.9.0
args: ^2.5.0

2
dart-api-examples/tts/pubspec.yaml
View File

@@ -8,7 +8,7 @@ environment:
# Add regular dependencies here.
dependencies:
sherpa_onnx: ^1.10.12
sherpa_onnx: ^1.10.13
path: ^1.9.0
args: ^2.5.0

2
dart-api-examples/vad/pubspec.yaml
View File

@@ -9,7 +9,7 @@ environment:
sdk: ^3.4.0
dependencies:
sherpa_onnx: ^1.10.12
sherpa_onnx: ^1.10.13
path: ^1.9.0
args: ^2.5.0

12
dotnet-examples/offline-decode-files/Program.cs
View File

@@ -118,13 +118,13 @@ to download pre-trained non-streaming zipformer models.
# Paraformer
dotnet run \
--tokens=./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \
--paraformer=./sherpa-onnx-paraformer-zh-2023-03-28/model.onnx \
--tokens=./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
--paraformer=./sherpa-onnx-paraformer-zh-2023-09-14/model.onnx \
--files ./sherpa-onnx-zipformer-en-2023-04-01/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/1.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/2.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/8k.wav
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/1.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/2.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/8k.wav
Please refer to
https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/index.html

12
dotnet-examples/offline-decode-files/run-paraformer-itn.sh
View File

@@ -2,10 +2,10 @@
set -ex
if [ ! -d ./sherpa-onnx-paraformer-zh-2023-03-28 ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -d ./sherpa-onnx-paraformer-zh-2023-09-14 ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
if [ ! -f ./itn-zh-number.wav ]; then
@@ -17,8 +17,8 @@ if [ ! -f ./itn_zh_number.fst ]; then
fi
dotnet run \
--tokens=./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \
--paraformer=./sherpa-onnx-paraformer-zh-2023-03-28/model.onnx \
--tokens=./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
--paraformer=./sherpa-onnx-paraformer-zh-2023-09-14/model.onnx \
--rule-fsts=./itn_zh_number.fst \
--num-threads=2 \
--files ./itn-zh-number.wav

20
dotnet-examples/offline-decode-files/run-paraformer.sh
View File

@@ -2,17 +2,17 @@
set -ex
if [ ! -d ./sherpa-onnx-paraformer-zh-2023-03-28 ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -d ./sherpa-onnx-paraformer-zh-2023-09-14 ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
dotnet run \
--tokens=./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \
--paraformer=./sherpa-onnx-paraformer-zh-2023-03-28/model.onnx \
--tokens=./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
--paraformer=./sherpa-onnx-paraformer-zh-2023-09-14/model.onnx \
--num-threads=2 \
--files ./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/1.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/2.wav \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/8k.wav
--files ./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/1.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/2.wav \
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/8k.wav

4
dotnet-examples/vad-non-streaming-asr-paraformer/Program.cs
View File

@@ -13,8 +13,8 @@ class VadNonStreamingAsrParaformer
// please download model files from
// https://github.com/k2-fsa/sherpa-onnx/releases/tag/asr-models
OfflineRecognizerConfig config = new OfflineRecognizerConfig();
config.ModelConfig.Paraformer.Model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";
config.ModelConfig.Tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt";
config.ModelConfig.Paraformer.Model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
config.ModelConfig.Tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
config.ModelConfig.Debug = 0;
OfflineRecognizer recognizer = new OfflineRecognizer(config);

8
dotnet-examples/vad-non-streaming-asr-paraformer/run.sh
View File

@@ -10,11 +10,11 @@ if [ ! -f ./lei-jun-test.wav ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav
fi
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
dotnet run

4
flutter-examples/streaming_asr/pubspec.yaml
View File

@@ -5,7 +5,7 @@ description: >
publish_to: 'none'
version: 1.10.12
version: 1.10.13
topics:
- speech-recognition
@@ -30,7 +30,7 @@ dependencies:
record: ^5.1.0
url_launcher: ^6.2.6
sherpa_onnx: ^1.10.12
sherpa_onnx: ^1.10.13
# sherpa_onnx:
# path: ../../flutter/sherpa_onnx

2
flutter-examples/tts/pubspec.yaml
View File

@@ -17,7 +17,7 @@ dependencies:
cupertino_icons: ^1.0.6
path_provider: ^2.1.3
path: ^1.9.0
sherpa_onnx: ^1.10.12
sherpa_onnx: ^1.10.13
url_launcher: ^6.2.6
audioplayers: ^5.0.0

12
flutter/sherpa_onnx/pubspec.yaml
View File

@@ -17,7 +17,7 @@ topics:
- voice-activity-detection
# remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec
version: 1.10.12
version: 1.10.13
homepage: https://github.com/k2-fsa/sherpa-onnx
@@ -30,19 +30,19 @@ dependencies:
flutter:
sdk: flutter
sherpa_onnx_android: ^1.10.12
sherpa_onnx_android: ^1.10.13
# path: ../sherpa_onnx_android
sherpa_onnx_macos: ^1.10.12
sherpa_onnx_macos: ^1.10.13
# path: ../sherpa_onnx_macos
sherpa_onnx_linux: ^1.10.12
sherpa_onnx_linux: ^1.10.13
# path: ../sherpa_onnx_linux
#
sherpa_onnx_windows: ^1.10.12
sherpa_onnx_windows: ^1.10.13
# path: ../sherpa_onnx_windows
sherpa_onnx_ios: ^1.10.12
sherpa_onnx_ios: ^1.10.13
# sherpa_onnx_ios:
# path: ../sherpa_onnx_ios

2
flutter/sherpa_onnx_ios/ios/sherpa_onnx_ios.podspec
View File

@@ -7,7 +7,7 @@
# https://groups.google.com/g/dart-ffi/c/nUATMBy7r0c
Pod::Spec.new do |s|
s.name = 'sherpa_onnx_ios'
s.version = '1.10.12'
s.version = '1.10.13'
s.summary = 'A new Flutter FFI plugin project.'
s.description = <<-DESC
A new Flutter FFI plugin project.

2
flutter/sherpa_onnx_linux/linux/CMakeLists.txt
View File

@@ -12,6 +12,6 @@ project(${PROJECT_NAME} LANGUAGES CXX)
# external build triggered from this build file.
set(sherpa_onnx_linux_bundled_libraries
"${CMAKE_CURRENT_SOURCE_DIR}/libsherpa-onnx-c-api.so"
"${CMAKE_CURRENT_SOURCE_DIR}/libonnxruntime.so.1.17.1"
"${CMAKE_CURRENT_SOURCE_DIR}/libonnxruntime.so"
PARENT_SCOPE
)

2
flutter/sherpa_onnx_macos/macos/sherpa_onnx_macos.podspec
View File

@@ -4,7 +4,7 @@
#
Pod::Spec.new do |s|
s.name = 'sherpa_onnx_macos'
s.version = '1.10.12'
s.version = '1.10.13'
s.summary = 'sherpa-onnx Flutter FFI plugin project.'
s.description = <<-DESC
sherpa-onnx Flutter FFI plugin project.

12
go-api-examples/non-streaming-decode-files/run-paraformer-itn.sh
View File

@@ -2,10 +2,10 @@
set -ex
if [ ! -d sherpa-onnx-paraformer-zh-2023-03-28 ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -d sherpa-onnx-paraformer-zh-2023-09-14 ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
if [ ! -f ./itn-zh-number.wav ]; then
@@ -20,8 +20,8 @@ go mod tidy
go build
./non-streaming-decode-files \
--paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \
--paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
--model-type paraformer \
--rule-fsts ./itn_zh_number.fst \
--debug 0 \

14
go-api-examples/non-streaming-decode-files/run-paraformer.sh
View File

@@ -2,18 +2,18 @@
set -ex
if [ ! -d sherpa-onnx-paraformer-zh-2023-03-28 ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -d sherpa-onnx-paraformer-zh-2023-09-14 ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
go mod tidy
go build
./non-streaming-decode-files \
--paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt \
--paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt \
--model-type paraformer \
--debug 0 \
./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav
./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav

2
ios-swift/SherpaOnnx/SherpaOnnx.xcodeproj/project.pbxproj
View File

@@ -57,7 +57,7 @@
C984A82729AA196100D74C52 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
C984A82929AA19AC00D74C52 /* Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = "<group>"; };
C984A83B29AA430B00D74C52 /* ViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
C9AC22162BB50165008B65E2 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; };
C9AC22162BB50165008B65E2 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */

6
ios-swiftui/SherpaOnnx2Pass/SherpaOnnx2Pass.xcodeproj/project.pbxproj
View File

@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
C98126502BFEED7D000AD7AA /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C981264F2BFEED7C000AD7AA /* Info.plist */; };
C9A2587D2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9A2587C2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift */; };
C9A2587F2AAEFFF100E555CA /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C9A2587E2AAEFFF100E555CA /* ContentView.swift */; };
C9A258812AAEFFF200E555CA /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C9A258802AAEFFF200E555CA /* Assets.xcassets */; };
@@ -20,6 +21,7 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
C981264F2BFEED7C000AD7AA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C9A258792AAEFFF100E555CA /* SherpaOnnx2Pass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnx2Pass.app; sourceTree = BUILT_PRODUCTS_DIR; };
C9A2587C2AAEFFF100E555CA /* SherpaOnnx2PassApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnx2PassApp.swift; sourceTree = "<group>"; };
C9A2587E2AAEFFF100E555CA /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -30,7 +32,7 @@
C9A2588D2AAF039D00E555CA /* Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Extension.swift; sourceTree = "<group>"; };
C9A258922AAF057E00E555CA /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; };
C9A258952AAF05D100E555CA /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
C9A258972AAF05E400E555CA /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; };
C9A258972AAF05E400E555CA /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -66,6 +68,7 @@
C9A2587B2AAEFFF100E555CA /* SherpaOnnx2Pass */ = {
isa = PBXGroup;
children = (
C981264F2BFEED7C000AD7AA /* Info.plist */,
C9A258922AAF057E00E555CA /* SherpaOnnx.swift */,
C9A2588D2AAF039D00E555CA /* Extension.swift */,
C9A2588A2AAF039D00E555CA /* Model.swift */,
@@ -155,6 +158,7 @@
files = (
C9A258842AAEFFF200E555CA /* Preview Assets.xcassets in Resources */,
C9A258812AAEFFF200E555CA /* Assets.xcassets in Resources */,
C98126502BFEED7D000AD7AA /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

6
ios-swiftui/SherpaOnnx2Pass/SherpaOnnx2Pass/Model.swift
View File

@@ -76,9 +76,9 @@ func getStreamingEn20MZipformer20230217() -> SherpaOnnxOnlineModelConfig {
/// Non-streaming models
/// ========================================
/// csukuangfj/sherpa-onnx-paraformer-zh-2023-03-28 (Chinese)
/// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese
func getNonStreamingZhParaformer20230328() -> SherpaOnnxOfflineModelConfig {
/// csukuangfj/sherpa-onnx-paraformer-zh-2023-09-14 (Chinese)
/// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese
func getNonStreamingZhParaformer20230914() -> SherpaOnnxOfflineModelConfig {
let model = getResource("model.int8", "onnx")
let tokens = getResource("paraformer-tokens", "txt")

2
ios-swiftui/SherpaOnnx2Pass/SherpaOnnx2Pass/SherpaOnnxViewModel.swift
View File

@@ -90,7 +90,7 @@ class SherpaOnnxViewModel: ObservableObject {
}
private func initOfflineRecognizer() {
// let modelConfig = getNonStreamingZhParaformer20230328()
// let modelConfig = getNonStreamingZhParaformer20230914()
let modelConfig = getNonStreamingWhisperTinyEn()
// let modelConfig = getNonStreamingEnZipformer20230504()

14
ios-swiftui/SherpaOnnxLangID/SherpaOnnxLangID.xcodeproj/project.pbxproj
View File

@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
C98126522BFEEDB7000AD7AA /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = C98126512BFEEDB7000AD7AA /* Info.plist */; };
DEBB2D762BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */; };
DEBB2D782BBAAA3500864EF5 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2D772BBAAA3500864EF5 /* ContentView.swift */; };
DEBB2D7A2BBAAA3600864EF5 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DEBB2D792BBAAA3600864EF5 /* Assets.xcassets */; };
@@ -22,8 +23,6 @@
DEBB2DAF2BBAAC6400864EF5 /* sherpa-onnx.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */; };
DEBB2DB02BBAAC6400864EF5 /* sherpa-onnx.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DEBB2DB22BBAAD0000864EF5 /* SherpaOnnx.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEBB2DB12BBAAD0000864EF5 /* SherpaOnnx.swift */; };
DEBB2DB42BBAB02E00864EF5 /* tiny-decoder.int8.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEBB2DB32BBAB02E00864EF5 /* tiny-decoder.int8.onnx */; };
DEBB2DB62BBAB03400864EF5 /* tiny-encoder.int8.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEBB2DB52BBAB03400864EF5 /* tiny-encoder.int8.onnx */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -59,6 +58,7 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
C98126512BFEEDB7000AD7AA /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
DEBB2D722BBAAA3500864EF5 /* SherpaOnnxLangID.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnxLangID.app; sourceTree = BUILT_PRODUCTS_DIR; };
DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnxLangIDApp.swift; sourceTree = "<group>"; };
DEBB2D772BBAAA3500864EF5 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -74,10 +74,8 @@
DEBB2DA22BBAAAE700864EF5 /* Model.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = Model.swift; path = ../../SherpaOnnx/SherpaOnnx/Model.swift; sourceTree = "<group>"; };
DEBB2DA42BBAAAFD00864EF5 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; };
DEBB2DA72BBAAC4D00864EF5 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
DEBB2DAB2BBAAC6200864EF5 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; };
DEBB2DAB2BBAAC6200864EF5 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
DEBB2DB12BBAAD0000864EF5 /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; };
DEBB2DB32BBAB02E00864EF5 /* tiny-decoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "tiny-decoder.int8.onnx"; sourceTree = "<group>"; };
DEBB2DB52BBAB03400864EF5 /* tiny-encoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "tiny-encoder.int8.onnx"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -131,9 +129,8 @@
DEBB2D742BBAAA3500864EF5 /* SherpaOnnxLangID */ = {
isa = PBXGroup;
children = (
DEBB2DB32BBAB02E00864EF5 /* tiny-decoder.int8.onnx */,
C98126512BFEEDB7000AD7AA /* Info.plist */,
DEBB2D752BBAAA3500864EF5 /* SherpaOnnxLangIDApp.swift */,
DEBB2DB52BBAB03400864EF5 /* tiny-encoder.int8.onnx */,
DEBB2D772BBAAA3500864EF5 /* ContentView.swift */,
DEBB2DA42BBAAAFD00864EF5 /* ViewModel.swift */,
DEBB2D9F2BBAAACD00864EF5 /* SherpaOnnx-Bridging-Header.h */,
@@ -286,9 +283,8 @@
buildActionMask = 2147483647;
files = (
DEBB2D7D2BBAAA3600864EF5 /* Preview Assets.xcassets in Resources */,
DEBB2DB62BBAB03400864EF5 /* tiny-encoder.int8.onnx in Resources */,
DEBB2DB42BBAB02E00864EF5 /* tiny-decoder.int8.onnx in Resources */,
DEBB2D7A2BBAAA3600864EF5 /* Assets.xcassets in Resources */,
C98126522BFEEDB7000AD7AA /* Info.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

18
ios-swiftui/SherpaOnnxSubtitle/SherpaOnnxSubtitle.xcodeproj/project.pbxproj
View File

@@ -16,10 +16,6 @@
DE8C85A62ABF23E100F667E3 /* onnxruntime.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8C85A52ABF23E100F667E3 /* onnxruntime.xcframework */; };
DE8C85AA2ABF23FA00F667E3 /* sherpa-onnx.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = DE8C85A92ABF23FA00F667E3 /* sherpa-onnx.xcframework */; };
DE8C85B22ABF257200F667E3 /* SpeechSegment.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8C85B12ABF257200F667E3 /* SpeechSegment.swift */; };
DEA22DF12AC1796C00549373 /* tiny.en-encoder.int8.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEA22DEE2AC1796C00549373 /* tiny.en-encoder.int8.onnx */; };
DEA22DF22AC1796C00549373 /* tiny.en-decoder.int8.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEA22DEF2AC1796C00549373 /* tiny.en-decoder.int8.onnx */; };
DEA22DF32AC1796C00549373 /* tiny.en-tokens.txt in Resources */ = {isa = PBXBuildFile; fileRef = DEA22DF02AC1796C00549373 /* tiny.en-tokens.txt */; };
DEA22DF52AC179E500549373 /* silero_vad.onnx in Resources */ = {isa = PBXBuildFile; fileRef = DEA22DF42AC179CA00549373 /* silero_vad.onnx */; };
DEA657152ABF19730066A81D /* SherpaOnnxSubtitleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */; };
DEA657172ABF19730066A81D /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA657162ABF19730066A81D /* ContentView.swift */; };
DEA657192ABF19740066A81D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DEA657182ABF19740066A81D /* Assets.xcassets */; };
@@ -36,13 +32,9 @@
DE081AAE2ABFF35400E8CD63 /* UTType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UTType.swift; sourceTree = "<group>"; };
DE081AB02ABFFEEE00E8CD63 /* Document.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Document.swift; sourceTree = "<group>"; };
DE081AB22ABFFF2600E8CD63 /* Errors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Errors.swift; sourceTree = "<group>"; };
DE8C85A52ABF23E100F667E3 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; };
DE8C85A52ABF23E100F667E3 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
DE8C85A92ABF23FA00F667E3 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
DE8C85B12ABF257200F667E3 /* SpeechSegment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpeechSegment.swift; sourceTree = "<group>"; };
DEA22DEE2AC1796C00549373 /* tiny.en-encoder.int8.onnx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "tiny.en-encoder.int8.onnx"; sourceTree = "<group>"; };
DEA22DEF2AC1796C00549373 /* tiny.en-decoder.int8.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; path = "tiny.en-decoder.int8.onnx"; sourceTree = "<group>"; };
DEA22DF02AC1796C00549373 /* tiny.en-tokens.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "tiny.en-tokens.txt"; sourceTree = "<group>"; };
DEA22DF42AC179CA00549373 /* silero_vad.onnx */ = {isa = PBXFileReference; lastKnownFileType = file; path = silero_vad.onnx; sourceTree = "<group>"; };
DEA657112ABF19730066A81D /* SherpaOnnxSubtitle.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SherpaOnnxSubtitle.app; sourceTree = BUILT_PRODUCTS_DIR; };
DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SherpaOnnxSubtitleApp.swift; sourceTree = "<group>"; };
DEA657162ABF19730066A81D /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
@@ -114,10 +106,6 @@
DEA657132ABF19730066A81D /* SherpaOnnxSubtitle */ = {
isa = PBXGroup;
children = (
DEA22DEF2AC1796C00549373 /* tiny.en-decoder.int8.onnx */,
DEA22DEE2AC1796C00549373 /* tiny.en-encoder.int8.onnx */,
DEA22DF02AC1796C00549373 /* tiny.en-tokens.txt */,
DEA22DF42AC179CA00549373 /* silero_vad.onnx */,
DE081AAC2ABFF30A00E8CD63 /* Info.plist */,
DE081A8E2ABF287C00E8CD63 /* SherpaOnnx.swift */,
DEA657142ABF19730066A81D /* SherpaOnnxSubtitleApp.swift */,
@@ -198,12 +186,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
DEA22DF52AC179E500549373 /* silero_vad.onnx in Resources */,
DEA6571C2ABF19740066A81D /* Preview Assets.xcassets in Resources */,
DEA22DF12AC1796C00549373 /* tiny.en-encoder.int8.onnx in Resources */,
DEA657192ABF19740066A81D /* Assets.xcassets in Resources */,
DEA22DF22AC1796C00549373 /* tiny.en-decoder.int8.onnx in Resources */,
DEA22DF32AC1796C00549373 /* tiny.en-tokens.txt in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
ios-swiftui/SherpaOnnxSubtitle/SherpaOnnxSubtitle/Info.plist
View File

@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSMicrophoneUsageDescription</key>
<string>Need microphone access for Next-gen Kaldi to work</string>
<key>UTExportedTypeDeclarations</key>
<array>
<dict>

2
ios-swiftui/SherpaOnnxSubtitle/SherpaOnnxSubtitle/SubtitleViewModel.swift
View File

@@ -59,7 +59,7 @@ class SubtitleViewModel: ObservableObject {
self.modelConfig = getNonStreamingWhisperTinyEn()
} else if modelType == "paraformer" {
// for Chinese
self.modelConfig = getNonStreamingZhParaformer20230328()
self.modelConfig = getNonStreamingZhParaformer20230914()
} else {
print("Please specify a supported modelType \(modelType)")
return

2
ios-swiftui/SherpaOnnxTts/SherpaOnnxTts.xcodeproj/project.pbxproj
View File

@@ -26,7 +26,7 @@
C9FE9FE42B0F33CD009F1003 /* ViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewModel.swift; sourceTree = "<group>"; };
C9FE9FE62B0F3620009F1003 /* SherpaOnnx.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = SherpaOnnx.swift; path = "../../../swift-api-examples/SherpaOnnx.swift"; sourceTree = "<group>"; };
C9FE9FE92B0F3754009F1003 /* sherpa-onnx.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = "sherpa-onnx.xcframework"; path = "../../build-ios/sherpa-onnx.xcframework"; sourceTree = "<group>"; };
C9FE9FEB2B0F3785009F1003 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.17.1/onnxruntime.xcframework"; sourceTree = "<group>"; };
C9FE9FEB2B0F3785009F1003 /* onnxruntime.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = onnxruntime.xcframework; path = "../../build-ios/ios-onnxruntime/1.18.0/onnxruntime.xcframework"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */

6
java-api-examples/InverseTextNormalizationNonStreamingParaformer.java
View File

@@ -7,10 +7,10 @@ import com.k2fsa.sherpa.onnx.*;
public class InverseTextNormalizationNonStreamingParaformer {
public static void main(String[] args) {
// please refer to
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese-english
// to download model files
String model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";
String tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt";
String model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
String tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
// https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn-zh-number.wav
String waveFilename = "./itn-zh-number.wav";

8
java-api-examples/NonStreamingDecodeFileParaformer.java
View File

@@ -7,12 +7,12 @@ import com.k2fsa.sherpa.onnx.*;
public class NonStreamingDecodeFileParaformer {
public static void main(String[] args) {
// please refer to
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese-english
// to download model files
String model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";
String tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt";
String model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
String tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
String waveFilename = "./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/3-sichuan.wav";
String waveFilename = "./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/3-sichuan.wav";
WaveReader reader = new WaveReader(waveFilename);

2
java-api-examples/NonStreamingDecodeFileTeleSpeechCtc.java
View File

@@ -7,7 +7,7 @@ import com.k2fsa.sherpa.onnx.*;
public class NonStreamingDecodeFileTeleSpeechCtc {
public static void main(String[] args) {
// please refer to
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/telespeech/models.html#sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04
// to download model files
String model = "./sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04/model.int8.onnx";
String tokens = "./sherpa-onnx-telespeech-ctc-int8-zh-2024-06-04/tokens.txt";

6
java-api-examples/VadFromMicWithNonStreamingParaformer.java
View File

@@ -37,10 +37,10 @@ public class VadFromMicWithNonStreamingParaformer {
public static OfflineRecognizer createOfflineRecognizer() {
// please refer to
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese-english
// to download model files
String model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";
String tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt";
String model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
String tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
// https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/itn_zh_number.fst
String ruleFsts = "./itn_zh_number.fst";

6
java-api-examples/VadNonStreamingParaformer.java
View File

@@ -34,10 +34,10 @@ public class VadNonStreamingParaformer {
public static OfflineRecognizer createOfflineRecognizer() {
// please refer to
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-03-28-chinese-english
// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/offline-paraformer/paraformer-models.html#csukuangfj-sherpa-onnx-paraformer-zh-2023-09-14-chinese-english
// to download model files
String model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx";
String tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt";
String model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx";
String tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt";
OfflineParaformerModelConfig paraformer =
OfflineParaformerModelConfig.builder().setModel(model).build();

8
java-api-examples/run-inverse-text-normalization-paraformer.sh
View File

@@ -25,11 +25,11 @@ if [ ! -f ../sherpa-onnx/java-api/build/sherpa-onnx.jar ]; then
popd
fi
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
if [ ! -f ./itn-zh-number.wav ]; then

8
java-api-examples/run-non-streaming-decode-file-paraformer.sh
View File

@@ -25,11 +25,11 @@ if [ ! -f ../sherpa-onnx/java-api/build/sherpa-onnx.jar ]; then
popd
fi
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
java \

8
java-api-examples/run-vad-from-mic-non-streaming-paraformer.sh
View File

@@ -29,11 +29,11 @@ if [ ! -f ./silero_vad.onnx ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/silero_vad.onnx
fi
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
if [ ! -f ./itn_zh_number.fst ]; then

8
java-api-examples/run-vad-non-streaming-paraformer.sh
View File

@@ -33,11 +33,11 @@ if [ ! -f ./lei-jun-test.wav ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/lei-jun-test.wav
fi
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
java \

16
kotlin-api-examples/run.sh
View File

@@ -179,10 +179,10 @@ function testOfflineAsr() {
rm sherpa-onnx-nemo-ctc-en-citrinet-512.tar.bz2
fi
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
if [ ! -f ./sherpa-onnx-zipformer-multi-zh-hans-2023-9-2/tokens.txt ]; then
@@ -205,10 +205,10 @@ function testOfflineAsr() {
}
function testInverseTextNormalizationOfflineAsr() {
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
if [ ! -f ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt ]; then
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
fi
if [ ! -f ./itn-zh-number.wav ]; then

2
kotlin-api-examples/test_offline_asr.kt
View File

@@ -11,7 +11,7 @@ fun test(type: Int) {
val recognizer = createOfflineRecognizer(type)
val waveFilename = when (type) {
0 -> "./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav"
0 -> "./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav"
2 -> "./sherpa-onnx-whisper-tiny.en/test_wavs/0.wav"
5 -> "./sherpa-onnx-zipformer-multi-zh-hans-2023-9-2/test_wavs/1.wav"
6 -> "./sherpa-onnx-nemo-ctc-en-citrinet-512/test_wavs/8k.wav"

4
mfc-examples/NonStreamingSpeechRecognition/NonStreamingSpeechRecognitionDlg.cpp
View File

@@ -338,10 +338,10 @@ void CNonStreamingSpeechRecognitionDlg::ShowInitRecognizerHelpMessage() {
msg +=
"wget "
"https://huggingface.co/csukuangfj/"
"sherpa-onnx-paraformer-zh-2023-03-28/resolve/main/model.onnx\r\n";
"sherpa-onnx-paraformer-zh-2023-09-14/resolve/main/model.onnx\r\n";
msg +=
"wget "
"https://huggingface.co/csukuangfj/sherpa-onnx-paraformer-zh-2023-03-28/"
"https://huggingface.co/csukuangfj/sherpa-onnx-paraformer-zh-2023-09-14/"
"resolve/main/tokens.txt\r\n\r\n";
msg += "\r\n Now rename them\r\n";
msg += "mv model.onnx paraformer.onnx\r\n\r\n";

12
nodejs-addon-examples/README.md
View File

@@ -140,9 +140,9 @@ node ./test_audio_tagging_zipformer.js
### Audio tagging with CED
```bash
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/audio-tagging-models/sherpa-onnx-ced-mini-audio-tagging-2024-04-19.tar.bz2
tar xvf sherpa-onnx-ced-mini-audio-tagging-2024-04-19.tar.bz2
rm sherpa-onnx-ced-mini-audio-tagging-2024-04-19.tar.bz2
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/audio-tagging-models/sherpa-onnx-ced-mini-audio-tagging-2024-09-14.tar.bz2
tar xvf sherpa-onnx-ced-mini-audio-tagging-2024-09-14.tar.bz2
rm sherpa-onnx-ced-mini-audio-tagging-2024-09-14.tar.bz2
node ./test_audio_tagging_ced.js
```
@@ -241,9 +241,9 @@ node ./test_vad_asr_non_streaming_nemo_ctc_microphone.js
### Non-streaming speech recognition with Paraformer
```bash
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
node ./test_asr_non_streaming_paraformer.js

2
nodejs-addon-examples/package.json
View File

@@ -1,5 +1,5 @@
{
"dependencies": {
"sherpa-onnx-node": "^1.10.12"
"sherpa-onnx-node": "^1.10.13"
}
}

6
nodejs-addon-examples/test_asr_non_streaming_paraformer.js
View File

@@ -10,9 +10,9 @@ const config = {
},
'modelConfig': {
'paraformer': {
'model': './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx',
'model': './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
},
'tokens': './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt',
'tokens': './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
'numThreads': 2,
'provider': 'cpu',
'debug': 1,
@@ -20,7 +20,7 @@ const config = {
};
const waveFilename =
'./sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/5-henan.wav';
'./sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/5-henan.wav';
const recognizer = new sherpa_onnx.OfflineRecognizer(config);
console.log('Started')

4
nodejs-addon-examples/test_asr_non_streaming_paraformer_itn.js
View File

@@ -10,9 +10,9 @@ const config = {
},
'modelConfig': {
'paraformer': {
'model': './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx',
'model': './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
},
'tokens': './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt',
'tokens': './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
'numThreads': 2,
'provider': 'cpu',
'debug': 1,

4
nodejs-addon-examples/test_vad_asr_non_streaming_paraformer_microphone.js
View File

@@ -15,9 +15,9 @@ function createRecognizer() {
},
'modelConfig': {
'paraformer': {
'model': './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx',
'model': './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
},
'tokens': './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt',
'tokens': './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
'numThreads': 2,
'provider': 'cpu',
'debug': 1,

6
nodejs-examples/README.md
View File

@@ -78,13 +78,13 @@ node ./test-offline-nemo-ctc.js
[./test-offline-paraformer.js](./test-offline-paraformer.js) demonstrates
how to decode a file with a non-streaming Paraformer model. In the code we use
[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).
[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).
You can use the following command to run it:
```bash
wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
wget -q https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
node ./test-offline-paraformer.js
```

4
nodejs-examples/test-offline-paraformer-itn.js
View File

@@ -19,7 +19,7 @@ function createOfflineRecognizer() {
joiner: '',
},
paraformer: {
model: './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx',
model: './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
},
nemoCtc: {
model: '',
@@ -34,7 +34,7 @@ function createOfflineRecognizer() {
tdnn: {
model: '',
},
tokens: './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt',
tokens: './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
numThreads: 1,
debug: 0,
provider: 'cpu',

6
nodejs-examples/test-offline-paraformer.js
View File

@@ -19,7 +19,7 @@ function createOfflineRecognizer() {
joiner: '',
},
paraformer: {
model: './sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx',
model: './sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx',
},
nemoCtc: {
model: '',
@@ -34,7 +34,7 @@ function createOfflineRecognizer() {
tdnn: {
model: '',
},
tokens: './sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt',
tokens: './sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt',
numThreads: 1,
debug: 0,
provider: 'cpu',
@@ -63,7 +63,7 @@ function createOfflineRecognizer() {
const recognizer = createOfflineRecognizer();
const stream = recognizer.createStream();
const waveFilename = './sherpa-onnx-paraformer-zh-2023-03-28/test_wavs/0.wav';
const waveFilename = './sherpa-onnx-paraformer-zh-2023-09-14/test_wavs/0.wav';
const reader = new wav.Reader();
const readable = new Readable().wrap(reader);

10
python-api-examples/inverse-text-normalization-offline-asr.py
View File

@@ -9,9 +9,9 @@ Usage:
(1) Download the test model
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
wget https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
(2) Download rule fst
@@ -36,8 +36,8 @@ import soundfile as sf
def create_recognizer():
model = "./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx"
tokens = "./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt"
model = "./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx"
tokens = "./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt"
rule_fsts = "./itn_zh_number.fst"
if (

10
python-api-examples/non_streaming_server.py
View File

@@ -36,13 +36,13 @@ python3 ./python-api-examples/non_streaming_server.py \
(2) Use a non-streaming paraformer
cd /path/to/sherpa-onnx
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-03-28.tar.bz2
curl -SL -O https://github.com/k2-fsa/sherpa-onnx/releases/download/asr-models/sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
tar xvf sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
rm sherpa-onnx-paraformer-zh-2023-09-14.tar.bz2
python3 ./python-api-examples/non_streaming_server.py \
--paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt
--paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
--tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt
(3) Use a non-streaming CTC model from NeMo

4
python-api-examples/two-pass-speech-recognition-from-microphone.py
View File

@@ -27,8 +27,8 @@ python3 ./python-api-examples/two-pass-speech-recognition-from-microphone.py \
--first-joiner ./sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23/joiner-epoch-99-avg-1.onnx \
--first-tokens ./sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23/tokens.txt \
\
--second-paraformer ./sherpa-onnx-paraformer-zh-2023-03-28/model.int8.onnx \
--second-tokens ./sherpa-onnx-paraformer-zh-2023-03-28/tokens.txt
--second-paraformer ./sherpa-onnx-paraformer-zh-2023-09-14/model.int8.onnx \
--second-tokens ./sherpa-onnx-paraformer-zh-2023-09-14/tokens.txt
(2) English: Streaming zipformer (1st pass) + Non-streaming whisper (2nd pass)

4
scripts/apk/generate-asr-2pass-apk-script.py
View File

@@ -67,7 +67,7 @@ def get_2nd_models():
""",
),
Model(
model_name="sherpa-onnx-paraformer-zh-2023-03-28",
model_name="sherpa-onnx-paraformer-zh-2023-09-14",
idx=0,
lang="zh",
short_name="paraformer",
@@ -270,7 +270,7 @@ def get_models():
combinations = [
(
"sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23",
"sherpa-onnx-paraformer-zh-2023-03-28",
"sherpa-onnx-paraformer-zh-2023-09-14",
),
(
"sherpa-onnx-streaming-zipformer-zh-14M-2023-02-23",

2
scripts/apk/generate-vad-asr-apk-script.py
View File

@@ -69,7 +69,7 @@ def get_models():
""",
),
Model(
model_name="sherpa-onnx-paraformer-zh-2023-03-28",
model_name="sherpa-onnx-paraformer-zh-2023-09-14",
idx=0,
lang="zh",
short_name="paraformer",

2
scripts/ced/run.sh
View File

@@ -6,7 +6,7 @@ set -ex
function install_dependencies() {
pip install -qq torch==2.1.0+cpu torchaudio==2.1.0+cpu -f https://download.pytorch.org/whl/torch_stable.html
pip install -qq onnx onnxruntime==1.17.1
pip install -qq onnx onnxruntime==1.18.0
pip install -r ./requirements.txt
}

2
scripts/dart/sherpa-onnx-pubspec.yaml
View File

@@ -17,7 +17,7 @@ topics:
- voice-activity-detection
# remember to change the version in ../sherpa_onnx_macos/macos/sherpa_onnx.podspec
version: 1.10.12
version: 1.10.13
homepage: https://github.com/k2-fsa/sherpa-onnx

Some files were not shown because too many files have changed in this diff Show More