From 12a7adfdf3dd4f80b5d3a51cfc4eecc84eaa7c64 Mon Sep 17 00:00:00 2001
From: jmwang66 <wangjiaming.wjm@alibaba-inc.com>
Date: 星期一, 16 一月 2023 18:46:40 +0800
Subject: [PATCH] update version 0.1.6
---
funasr/bin/asr_inference_launch.py | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 deletions(-)
diff --git a/funasr/bin/asr_inference_launch.py b/funasr/bin/asr_inference_launch.py
old mode 100755
new mode 100644
index 84e1422..67a85d2
--- a/funasr/bin/asr_inference_launch.py
+++ b/funasr/bin/asr_inference_launch.py
@@ -76,6 +76,21 @@
group = parser.add_argument_group("The model configuration related")
group.add_argument(
+ "--vad_infer_config",
+ type=str,
+ help="VAD infer configuration",
+ )
+ group.add_argument(
+ "--vad_model_file",
+ type=str,
+ help="VAD model parameter file",
+ )
+ group.add_argument(
+ "--cmvn_file",
+ type=str,
+ help="Global CMVN file",
+ )
+ group.add_argument(
"--asr_train_config",
type=str,
help="ASR training configuration",
@@ -147,7 +162,7 @@
group.add_argument(
"--ctc_weight",
type=float,
- default=0.5,
+ default=0.0,
help="CTC weight in joint decoding",
)
group.add_argument("--lm_weight", type=float, default=1.0, help="RNNLM weight")
@@ -182,26 +197,28 @@
return parser
-def set_parameters(language: str = None,
- sample_rate: Union[int, Dict[Any, int]] = None):
- if language is not None:
- global global_asr_language
- global_asr_language = language
- if sample_rate is not None:
- global global_sample_rate
- global_sample_rate = sample_rate
-
-def inference_launch(mode, **kwargs):
+def inference_launch(**kwargs):
+ if 'mode' in kwargs:
+ mode = kwargs['mode']
+ else:
+ logging.info("Unknown decoding mode.")
+ return None
if mode == "asr":
- from funasr.bin.asr_inference import inference
- return inference(**kwargs)
+ from funasr.bin.asr_inference import inference_modelscope
+ return inference_modelscope(**kwargs)
elif mode == "uniasr":
- from funasr.bin.asr_inference_uniasr import inference
- return inference(**kwargs)
+ from funasr.bin.asr_inference_uniasr import inference_modelscope
+ return inference_modelscope(**kwargs)
elif mode == "paraformer":
- from funasr.bin.asr_inference_paraformer import inference
- return inference(**kwargs)
+ from funasr.bin.asr_inference_paraformer import inference_modelscope
+ return inference_modelscope(**kwargs)
+ 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)
else:
logging.info("Unknown decoding mode: {}".format(mode))
return None
--
Gitblit v1.9.1