From f2e7ea83c9d8b580d09eb31acf6c2fa60e683e3b Mon Sep 17 00:00:00 2001
From: zhaomingwork <zhaomingwork@qq.com>
Date: 星期六, 13 五月 2023 08:02:33 +0800
Subject: [PATCH] fix bug for cpp msg not return right name
---
funasr/bin/asr_inference_launch.py | 49 +++++++++++++++++++++++--------------------------
1 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/funasr/bin/asr_inference_launch.py b/funasr/bin/asr_inference_launch.py
index b9be3e2..7b04a9e 100644
--- a/funasr/bin/asr_inference_launch.py
+++ b/funasr/bin/asr_inference_launch.py
@@ -1,6 +1,4 @@
#!/usr/bin/env python3
-# Copyright ESPnet (https://github.com/espnet/espnet). All Rights Reserved.
-# Apache 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
import argparse
import logging
@@ -73,7 +71,13 @@
)
group.add_argument("--key_file", type=str_or_none)
group.add_argument("--allow_variable_data_keys", type=str2bool, default=False)
-
+ group.add_argument(
+ "--mc",
+ type=bool,
+ default=False,
+ help="MultiChannel input",
+ )
+
group = parser.add_argument_group("The model configuration related")
group.add_argument(
"--vad_infer_config",
@@ -250,24 +254,15 @@
elif mode == "uniasr":
from funasr.bin.asr_inference_uniasr import inference_modelscope
return inference_modelscope(**kwargs)
- elif mode == "uniasr_vad":
- from funasr.bin.asr_inference_uniasr_vad import inference_modelscope
- return inference_modelscope(**kwargs)
elif mode == "paraformer":
from funasr.bin.asr_inference_paraformer import inference_modelscope
return inference_modelscope(**kwargs)
- elif mode == "paraformer_vad":
- from funasr.bin.asr_inference_paraformer_vad import inference_modelscope
+ elif mode == "paraformer_streaming":
+ from funasr.bin.asr_inference_paraformer_streaming import inference_modelscope
return inference_modelscope(**kwargs)
- elif mode == "paraformer_punc":
- logging.info("Unknown decoding mode: {}".format(mode))
- return None
- elif mode == "paraformer_vad_punc":
- from funasr.bin.asr_inference_paraformer_vad_punc import inference_modelscope
- return inference_modelscope(**kwargs)
- elif mode == "vad":
- from funasr.bin.vad_inference import inference_modelscope
- return inference_modelscope(**kwargs)
+ elif mode.startswith("paraformer_vad"):
+ from funasr.bin.asr_inference_paraformer import inference_modelscope_vad_punc
+ return inference_modelscope_vad_punc(**kwargs)
elif mode == "mfcca":
from funasr.bin.asr_inference_mfcca import inference_modelscope
return inference_modelscope(**kwargs)
@@ -287,18 +282,20 @@
if mode == "asr":
from funasr.bin.asr_inference import inference
return inference(**kwargs)
+ elif mode == "sa_asr":
+ from funasr.bin.sa_asr_inference import inference
+ return inference(**kwargs)
elif mode == "uniasr":
from funasr.bin.asr_inference_uniasr import inference
return inference(**kwargs)
elif mode == "paraformer":
- from funasr.bin.asr_inference_paraformer import inference
- return inference(**kwargs)
- elif mode == "paraformer_vad_punc":
- from funasr.bin.asr_inference_paraformer_vad_punc import inference
- return inference(**kwargs)
- elif mode == "vad":
- from funasr.bin.vad_inference import inference
- return inference(**kwargs)
+ from funasr.bin.asr_inference_paraformer import inference_modelscope
+ inference_pipeline = inference_modelscope(**kwargs)
+ return inference_pipeline(kwargs["data_path_and_name_and_type"], hotword=kwargs.get("hotword", None))
+ elif mode.startswith("paraformer_vad"):
+ from funasr.bin.asr_inference_paraformer import inference_modelscope_vad_punc
+ inference_pipeline = inference_modelscope_vad_punc(**kwargs)
+ return inference_pipeline(kwargs["data_path_and_name_and_type"], hotword=kwargs.get("hotword", None))
elif mode == "mfcca":
from funasr.bin.asr_inference_mfcca import inference_modelscope
return inference_modelscope(**kwargs)
@@ -341,4 +338,4 @@
if __name__ == "__main__":
- main()
+ main()
\ No newline at end of file
--
Gitblit v1.9.1