From 219c2482ab755fbd4e49dfbdee91bf1a8a4ec49a Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期五, 19 五月 2023 11:33:27 +0800
Subject: [PATCH] websocket 2pass bugfix
---
funasr/build_utils/build_args.py | 37 +++++++++++++++++++++----------------
1 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/funasr/build_utils/build_args.py b/funasr/build_utils/build_args.py
index a50122d..517c85b 100644
--- a/funasr/build_utils/build_args.py
+++ b/funasr/build_utils/build_args.py
@@ -7,37 +7,37 @@
from funasr.utils.types import str_or_none
-def build_args(args, extra_task_params):
- parser = config_argparse.ArgumentParser("Task related config")
+def build_args(args, parser, extra_task_params):
+ task_parser = config_argparse.ArgumentParser("Task related config")
if args.task_name == "asr":
from funasr.build_utils.build_asr_model import class_choices_list
for class_choices in class_choices_list:
- class_choices.add_arguments(parser)
- parser.add_argument(
+ class_choices.add_arguments(task_parser)
+ task_parser.add_argument(
"--split_with_space",
type=str2bool,
default=True,
help="whether to split text using <space>",
)
- parser.add_argument(
+ task_parser.add_argument(
"--seg_dict_file",
type=str,
default=None,
help="seg_dict_file for text processing",
)
- parser.add_argument(
+ task_parser.add_argument(
"--input_size",
type=int_or_none,
default=None,
help="The number of input dimension of the feature",
)
- parser.add_argument(
+ task_parser.add_argument(
"--ctc_conf",
action=NestedDictAction,
default=get_default_kwargs(CTC),
help="The keyword arguments for CTC class.",
)
- parser.add_argument(
+ task_parser.add_argument(
"--cmvn_file",
type=str_or_none,
default=None,
@@ -47,8 +47,8 @@
elif args.task_name == "pretrain":
from funasr.build_utils.build_pretrain_model import class_choices_list
for class_choices in class_choices_list:
- class_choices.add_arguments(parser)
- parser.add_argument(
+ class_choices.add_arguments(task_parser)
+ task_parser.add_argument(
"--input_size",
type=int_or_none,
default=None,
@@ -58,18 +58,18 @@
elif args.task_name == "lm":
from funasr.build_utils.build_lm_model import class_choices_list
for class_choices in class_choices_list:
- class_choices.add_arguments(parser)
+ class_choices.add_arguments(task_parser)
elif args.task_name == "punc":
from funasr.build_utils.build_punc_model import class_choices_list
for class_choices in class_choices_list:
- class_choices.add_arguments(parser)
+ class_choices.add_arguments(task_parser)
elif args.task_name == "vad":
from funasr.build_utils.build_vad_model import class_choices_list
for class_choices in class_choices_list:
- class_choices.add_arguments(parser)
- parser.add_argument(
+ class_choices.add_arguments(task_parser)
+ task_parser.add_argument(
"--input_size",
type=int_or_none,
default=None,
@@ -79,10 +79,15 @@
elif args.task_name == "diar":
from funasr.build_utils.build_diar_model import class_choices_list
for class_choices in class_choices_list:
- class_choices.add_arguments(parser)
+ class_choices.add_arguments(task_parser)
else:
raise NotImplementedError("Not supported task: {}".format(args.task_name))
- task_args = parser.parse_args(extra_task_params)
+ for action in parser._actions:
+ if not any(action.dest == a.dest for a in task_parser._actions):
+ task_parser._add_action(action)
+
+ task_parser.set_defaults(**vars(args))
+ task_args = task_parser.parse_args(extra_task_params)
return task_args
--
Gitblit v1.9.1