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

Add Android APKs for NeMo CTC models. (#866)

Browse Source
This commit is contained in:
Fangjun Kuang
2024-05-12 14:58:36 +08:00
committed by GitHub
parent 7322f4e0a3
commit db85b2c1d8
9 changed files with 210 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sherpa-onnx/csrc/offline-ctc-model.cc
View File

@@ -163,7 +163,8 @@ std::unique_ptr<OfflineCtcModel> OfflineCtcModel::Create(
return std::make_unique<OfflineNemoEncDecCtcModel>(mgr, config);
break;
case ModelType::kEncDecHybridRNNTCTCBPEModel:
return std::make_unique<OfflineNemoEncDecHybridRNNTCTCBPEModel>(config);
return std::make_unique<OfflineNemoEncDecHybridRNNTCTCBPEModel>(mgr,
config);
break;
case ModelType::kTdnn:
return std::make_unique<OfflineTdnnCtcModel>(mgr, config);

12
sherpa-onnx/jni/online-recognizer.cc
View File

@@ -159,6 +159,18 @@ static OnlineRecognizerConfig GetConfig(JNIEnv *env, jobject config) {
ans.model_config.zipformer2_ctc.model = p;
env->ReleaseStringUTFChars(s, p);
// streaming NeMo CTC
fid = env->GetFieldID(model_config_cls, "neMoCtc",
"Lcom/k2fsa/sherpa/onnx/OnlineNeMoCtcModelConfig;");
jobject nemo_ctc_config = env->GetObjectField(model_config, fid);
jclass nemo_ctc_config_cls = env->GetObjectClass(nemo_ctc_config);
fid = env->GetFieldID(nemo_ctc_config_cls, "model", "Ljava/lang/String;");
s = (jstring)env->GetObjectField(nemo_ctc_config, fid);
p = env->GetStringUTFChars(s, nullptr);
ans.model_config.nemo_ctc.model = p;
env->ReleaseStringUTFChars(s, p);
fid = env->GetFieldID(model_config_cls, "tokens", "Ljava/lang/String;");
s = (jstring)env->GetObjectField(model_config, fid);
p = env->GetStringUTFChars(s, nullptr);

39
sherpa-onnx/kotlin-api/OfflineRecognizer.kt
View File

@@ -231,6 +231,45 @@ fun getOfflineModelConfig(type: Int): OfflineModelConfig? {
)
}
7 -> {
val modelDir = "sherpa-onnx-nemo-fast-conformer-ctc-be-de-en-es-fr-hr-it-pl-ru-uk-20k"
return OfflineModelConfig(
nemo = OfflineNemoEncDecCtcModelConfig(
model = "$modelDir/model.onnx",
),
tokens = "$modelDir/tokens.txt",
)
}
8 -> {
val modelDir = "sherpa-onnx-nemo-fast-conformer-ctc-en-24500"
return OfflineModelConfig(
nemo = OfflineNemoEncDecCtcModelConfig(
model = "$modelDir/model.onnx",
),
tokens = "$modelDir/tokens.txt",
)
}
9 -> {
val modelDir = "sherpa-onnx-nemo-fast-conformer-ctc-en-de-es-fr-14288"
return OfflineModelConfig(
nemo = OfflineNemoEncDecCtcModelConfig(
model = "$modelDir/model.onnx",
),
tokens = "$modelDir/tokens.txt",
)
}
10 -> {
val modelDir = "sherpa-onnx-nemo-fast-conformer-ctc-es-1424"
return OfflineModelConfig(
nemo = OfflineNemoEncDecCtcModelConfig(
model = "$modelDir/model.onnx",
),
tokens = "$modelDir/tokens.txt",
)
}
}
return null
}

35
sherpa-onnx/kotlin-api/OnlineRecognizer.kt
View File

@@ -29,10 +29,15 @@ data class OnlineZipformer2CtcModelConfig(
var model: String = "",
)
data class OnlineNeMoCtcModelConfig(
var model: String = "",
)
data class OnlineModelConfig(
var transducer: OnlineTransducerModelConfig = OnlineTransducerModelConfig(),
var paraformer: OnlineParaformerModelConfig = OnlineParaformerModelConfig(),
var zipformer2Ctc: OnlineZipformer2CtcModelConfig = OnlineZipformer2CtcModelConfig(),
var neMoCtc: OnlineNeMoCtcModelConfig = OnlineNeMoCtcModelConfig(),
var tokens: String,
var numThreads: Int = 1,
var debug: Boolean = false,
@@ -318,6 +323,36 @@ fun getModelConfig(type: Int): OnlineModelConfig? {
modelType = "zipformer",
)
}
11 -> {
val modelDir = "sherpa-onnx-nemo-streaming-fast-conformer-ctc-en-80ms"
return OnlineModelConfig(
neMoCtc = OnlineNeMoCtcModelConfig(
model = "$modelDir/model.onnx",
),
tokens = "$modelDir/tokens.txt",
)
}
12 -> {
val modelDir = "sherpa-onnx-nemo-streaming-fast-conformer-ctc-en-480ms"
return OnlineModelConfig(
neMoCtc = OnlineNeMoCtcModelConfig(
model = "$modelDir/model.onnx",
),
tokens = "$modelDir/tokens.txt",
)
}
13 -> {
val modelDir = "sherpa-onnx-nemo-streaming-fast-conformer-ctc-en-1040ms"
return OnlineModelConfig(
neMoCtc = OnlineNeMoCtcModelConfig(
model = "$modelDir/model.onnx",
),
tokens = "$modelDir/tokens.txt",
)
}
}
return null
}