Skip to content

Commit f3e9802

Browse files
author
LittleMouse
committed
[update] Update sherpa-onnx commit reference, add fire-red-asr-ctc model configuration, and include model in llm_pack
1 parent 29f1df4 commit f3e9802

4 files changed

Lines changed: 38 additions & 5 deletions

File tree

ext_components/sherpa-onnx/SConstruct

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ _SDK_PATH = os.path.normpath(
1212

1313
env["GIT_REPO_LISTS"]["sherpa-onnx"] = {
1414
"url": "https://github.com/Abandon-ht/sherpa-onnx.git",
15-
"commit": "2d08532b0ddbe96817242324d826442ba4d3a8a4",
15+
"commit": "69fa06760c06f24d657aab6beb9150a34de5730c",
1616
"path": str(Path(_SDK_PATH) / "github_source" / "sherpa-onnx"),
1717
}
1818

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"mode": "fire-red-asr-ctc-10s-ax650",
3+
"type": "asr",
4+
"homepage": "https://huggingface.co/Abandon-ht/FireRedASR2.axera",
5+
"pulsar_version": "5.1-patch1-cd6c30b4",
6+
"capabilities": [
7+
"Chinese",
8+
"English"
9+
],
10+
"input_type": [
11+
"sys.pcm",
12+
"sys.cap.0_0"
13+
],
14+
"output_type": [
15+
"asr.utf-8"
16+
],
17+
"mode_param": {
18+
"model_config.fire_red_asr_ctc.model": "model-10s.axmodel",
19+
"model_config.tokens": "tokens.txt",
20+
"silero_vad.model": "silero_vad.ort",
21+
"model_config.provider": "axera",
22+
"silence_timeout": 2000,
23+
"awake_delay": 50
24+
},
25+
"mode_param_bak": {}
26+
}

projects/llm_framework/main_asr/src/main.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,7 @@ class llm_task {
280280
ONNX_ASR_CONFIG_AUTO_SET(file_body["mode_param"], model_config.canary.tgt_lang);
281281
ONNX_ASR_CONFIG_AUTO_SET(file_body["mode_param"], model_config.canary.use_pnc);
282282
ONNX_ASR_CONFIG_AUTO_SET(file_body["mode_param"], model_config.omnilingual.model);
283+
ONNX_ASR_CONFIG_AUTO_SET(file_body["mode_param"], model_config.fire_red_asr_ctc.model);
283284
ONNX_ASR_CONFIG_AUTO_SET(file_body["mode_param"], model_config.telespeech_ctc);
284285
ONNX_ASR_CONFIG_AUTO_SET(file_body["mode_param"], model_config.tokens);
285286
ONNX_ASR_CONFIG_AUTO_SET(file_body["mode_param"], model_config.num_threads);
@@ -333,9 +334,14 @@ class llm_task {
333334
else if (file_body["mode_param"].contains("silence_timeout"))
334335
silence_timeout = file_body["mode_param"]["silence_timeout"];
335336

336-
onnx_asr_config_.model_config.sense_voice.model = base_model + onnx_asr_config_.model_config.sense_voice.model;
337-
onnx_asr_config_.model_config.tokens = base_model + onnx_asr_config_.model_config.tokens;
338-
vad_config_.silero_vad.model = base_model + vad_config_.silero_vad.model;
337+
if (!onnx_asr_config_.model_config.sense_voice.model.empty())
338+
onnx_asr_config_.model_config.sense_voice.model =
339+
base_model + onnx_asr_config_.model_config.sense_voice.model;
340+
if (!onnx_asr_config_.model_config.fire_red_asr_ctc.model.empty())
341+
onnx_asr_config_.model_config.fire_red_asr_ctc.model =
342+
base_model + onnx_asr_config_.model_config.fire_red_asr_ctc.model;
343+
onnx_asr_config_.model_config.tokens = base_model + onnx_asr_config_.model_config.tokens;
344+
vad_config_.silero_vad.model = base_model + vad_config_.silero_vad.model;
339345

340346
onnx_recognizer_ = std::make_unique<sherpa_onnx::OfflineRecognizer>(onnx_asr_config_);
341347
vad_ = std::make_unique<sherpa_onnx::VoiceActivityDetector>(vad_config_);
@@ -1118,7 +1124,7 @@ class llm_asr : public StackFlow {
11181124
ret = llm_channel->subscriber_work_id(
11191125
data,
11201126
std::bind(&llm_asr::kws_awake, this, std::weak_ptr<llm_task>(llm_task_obj),
1121-
std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1, std::placeholders::_2));
1127+
std::weak_ptr<llm_channel_obj>(llm_channel), std::placeholders::_1, std::placeholders::_2));
11221128
llm_task_obj->inputs_.push_back(data);
11231129
}
11241130

projects/llm_framework/tools/llm_pack.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,7 @@ def create_bin_deb(package_name, version, src_folder, revision = 'm5stack1', dep
410410
'llm-model-sense-voice-small-10s':[create_data_deb,'llm-model-sense-voice-small-10s', '0.4', src_folder, revision],
411411
## AX650
412412
'llm-model-sense-voice-small-10s-ax650':[create_data_deb,'llm-model-sense-voice-small-10s-ax650', '0.4', src_folder, revision],
413+
'llm-model-fire-red-asr-ctc-10s-ax650':[create_data_deb,'llm-model-fire-red-asr-ctc-10s-ax650', '0.4', src_folder, revision],
413414
# TTS model
414415
'llm-model-single-speaker-english-fast':[create_data_deb,'llm-model-single-speaker-english-fast', '0.3', src_folder, revision],
415416
'llm-model-single-speaker-fast':[create_data_deb,'llm-model-single-speaker-fast', '0.3', src_folder, revision],

0 commit comments

Comments
 (0)