Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
xuning
/
sherpaonnx
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
Fangjun Kuang
2023-06-27 18:11:37 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Committed by
GitHub
2023-06-27 18:11:37 +0800
Commit
b2e0c4c9c266e2e985c8efb1aff03a3cba96ae4c
b2e0c4c9
1 parent
dab22c47
Update iOS and Android demos to include the latest streaming zipformer (#189)
显示空白字符变更
内嵌
并排对比
正在显示
7 个修改的文件
包含
76 行增加
和
4 行删除
CMakeLists.txt
android/SherpaOnnx/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt
android/SherpaOnnx/app/src/main/java/com/k2fsa/sherpa/onnx/SherpaOnnx.kt
build-android-arm64-v8a.sh
build-android-armv7-eabi.sh
ios-swift/SherpaOnnx/SherpaOnnx/Model.swift
ios-swift/SherpaOnnx/SherpaOnnx/ViewController.swift
CMakeLists.txt
查看文件 @
b2e0c4c
cmake_minimum_required
(
VERSION 3.13 FATAL_ERROR
)
project
(
sherpa-onnx
)
set
(
SHERPA_ONNX_VERSION
"1.4.
5
"
)
set
(
SHERPA_ONNX_VERSION
"1.4.
6
"
)
# Disable warning about
#
...
...
android/SherpaOnnx/app/src/main/java/com/k2fsa/sherpa/onnx/MainActivity.kt
查看文件 @
b2e0c4c
...
...
@@ -177,7 +177,7 @@ class MainActivity : AppCompatActivity() {
// Please change getModelConfig() to add new models
// See https://k2-fsa.github.io/sherpa/onnx/pretrained_models/index.html
// for a list of available models
val type =
0
val type =
3
println("Select model type ${type}")
val config = OnlineRecognizerConfig(
featConfig = getFeatureConfig(sampleRate = sampleRateInHz, featureDim = 80),
...
...
android/SherpaOnnx/app/src/main/java/com/k2fsa/sherpa/onnx/SherpaOnnx.kt
查看文件 @
b2e0c4c
...
...
@@ -19,7 +19,7 @@ data class OnlineTransducerModelConfig(
var decoder: String,
var joiner: String,
var tokens: String,
var numThreads: Int =
2
,
var numThreads: Int =
1
,
var debug: Boolean = false,
)
...
...
@@ -122,6 +122,9 @@ by following the code)
2 - csukuangfj/sherpa-onnx-lstm-en-2023-02-17 (English)
https://k2-fsa.github.io/sherpa/onnx/pretrained_models/lstm-transducer-models.html#csukuangfj-sherpa-onnx-lstm-en-2023-02-17-english
3 - pkufool/icefall-asr-zipformer-streaming-wenetspeech-20230615
https://huggingface.co/pkufool/icefall-asr-zipformer-streaming-wenetspeech-20230615
*/
fun getModelConfig(type: Int): OnlineTransducerModelConfig? {
when (type) {
...
...
@@ -153,6 +156,26 @@ fun getModelConfig(type: Int): OnlineTransducerModelConfig? {
tokens = "$modelDir/tokens.txt",
)
}
3 -> {
val modelDir = "icefall-asr-zipformer-streaming-wenetspeech-20230615"
return OnlineTransducerModelConfig(
encoder = "$modelDir/exp/encoder-epoch-12-avg-4-chunk-16-left-128.int8.onnx",
decoder = "$modelDir/exp/decoder-epoch-12-avg-4-chunk-16-left-128.onnx",
joiner = "$modelDir/exp/joiner-epoch-12-avg-4-chunk-16-left-128.onnx",
tokens = "$modelDir/data/lang_char/tokens.txt",
)
}
4 -> {
val modelDir = "icefall-asr-zipformer-streaming-wenetspeech-20230615"
return OnlineTransducerModelConfig(
encoder = "$modelDir/exp/encoder-epoch-12-avg-4-chunk-16-left-128.onnx",
decoder = "$modelDir/exp/decoder-epoch-12-avg-4-chunk-16-left-128.onnx",
joiner = "$modelDir/exp/joiner-epoch-12-avg-4-chunk-16-left-128.onnx",
tokens = "$modelDir/data/lang_char/tokens.txt",
)
}
}
return null;
}
...
...
build-android-arm64-v8a.sh
查看文件 @
b2e0c4c
...
...
@@ -74,6 +74,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
-DSHERPA_ONNX_ENABLE_CHECK
=
OFF
\
-DSHERPA_ONNX_ENABLE_PORTAUDIO
=
OFF
\
-DSHERPA_ONNX_ENABLE_JNI
=
ON
\
-DSHERPA_ONNX_ENABLE_C_API
=
OFF
\
-DCMAKE_INSTALL_PREFIX
=
./install
\
-DANDROID_ABI
=
"arm64-v8a"
\
-DANDROID_PLATFORM
=
android-21 ..
...
...
build-android-armv7-eabi.sh
查看文件 @
b2e0c4c
...
...
@@ -74,6 +74,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
-DSHERPA_ONNX_ENABLE_CHECK
=
OFF
\
-DSHERPA_ONNX_ENABLE_PORTAUDIO
=
OFF
\
-DSHERPA_ONNX_ENABLE_JNI
=
ON
\
-DSHERPA_ONNX_ENABLE_C_API
=
OFF
\
-DCMAKE_INSTALL_PREFIX
=
./install
\
-DANDROID_ABI
=
"armeabi-v7a"
-DANDROID_ARM_NEON
=
ON
\
-DANDROID_PLATFORM
=
android-21 ..
...
...
ios-swift/SherpaOnnx/SherpaOnnx/Model.swift
查看文件 @
b2e0c4c
...
...
@@ -30,6 +30,51 @@ func getBilingualStreamZhEnZipformer20230220() -> SherpaOnnxOnlineTransducerMode
)
}
func
getZhZipformer20230615
()
->
SherpaOnnxOnlineTransducerModelConfig
{
let
encoder
=
getResource
(
"encoder-epoch-12-avg-4-chunk-16-left-128"
,
"onnx"
)
let
decoder
=
getResource
(
"decoder-epoch-12-avg-4-chunk-16-left-128"
,
"onnx"
)
let
joiner
=
getResource
(
"joiner-epoch-12-avg-4-chunk-16-left-128"
,
"onnx"
)
let
tokens
=
getResource
(
"tokens"
,
"txt"
)
return
sherpaOnnxOnlineTransducerModelConfig
(
encoder
:
encoder
,
decoder
:
decoder
,
joiner
:
joiner
,
tokens
:
tokens
,
numThreads
:
2
)
}
func
getZhZipformer20230615Int8
()
->
SherpaOnnxOnlineTransducerModelConfig
{
let
encoder
=
getResource
(
"encoder-epoch-12-avg-4-chunk-16-left-128.int8"
,
"onnx"
)
let
decoder
=
getResource
(
"decoder-epoch-12-avg-4-chunk-16-left-128"
,
"onnx"
)
let
joiner
=
getResource
(
"joiner-epoch-12-avg-4-chunk-16-left-128"
,
"onnx"
)
let
tokens
=
getResource
(
"tokens"
,
"txt"
)
return
sherpaOnnxOnlineTransducerModelConfig
(
encoder
:
encoder
,
decoder
:
decoder
,
joiner
:
joiner
,
tokens
:
tokens
,
numThreads
:
2
)
}
func
getEnZipformer20230626
()
->
SherpaOnnxOnlineTransducerModelConfig
{
let
encoder
=
getResource
(
"encoder-epoch-99-avg-1-chunk-16-left-128"
,
"onnx"
)
let
decoder
=
getResource
(
"decoder-epoch-99-avg-1-chunk-16-left-128"
,
"onnx"
)
let
joiner
=
getResource
(
"joiner-epoch-99-avg-1-chunk-16-left-128"
,
"onnx"
)
let
tokens
=
getResource
(
"tokens"
,
"txt"
)
return
sherpaOnnxOnlineTransducerModelConfig
(
encoder
:
encoder
,
decoder
:
decoder
,
joiner
:
joiner
,
tokens
:
tokens
,
numThreads
:
2
)
}
/// Please refer to
/// https://k2-fsa.github.io/sherpa/onnx/pretrained_models/index.html
/// to add more models if you need
...
...
ios-swift/SherpaOnnx/SherpaOnnx/ViewController.swift
查看文件 @
b2e0c4c
...
...
@@ -85,7 +85,9 @@ class ViewController: UIViewController {
// You can also modify Model.swift to add new pre-trained models from
// https://k2-fsa.github.io/sherpa/ncnn/pretrained_models/index.html
let
modelConfig
=
getBilingualStreamZhEnZipformer20230220
()
// let modelConfig = getBilingualStreamZhEnZipformer20230220()
// let modelConfig = getZhZipformer20230615()
let
modelConfig
=
getEnZipformer20230626
()
let
featConfig
=
sherpaOnnxFeatureConfig
(
sampleRate
:
16000
,
...
...
请
注册
或
登录
后发表评论