From 33d3d2084403fd34b79c835d2f2fe04f6cd8f738 Mon Sep 17 00:00:00 2001
From: 游雁 <zhifu.gzf@alibaba-inc.com>
Date: 星期三, 13 九月 2023 09:33:54 +0800
Subject: [PATCH] Merge branch 'main' of github.com:alibaba-damo-academy/FunASR add
---
funasr/tasks/lm.py | 26 ++++++++------------------
1 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/funasr/tasks/lm.py b/funasr/tasks/lm.py
index 46b9fe0..c0259a8 100644
--- a/funasr/tasks/lm.py
+++ b/funasr/tasks/lm.py
@@ -9,15 +9,13 @@
import numpy as np
import torch
-from typeguard import check_argument_types
-from typeguard import check_return_type
from funasr.datasets.collate_fn import CommonCollateFn
from funasr.datasets.preprocessor import CommonPreprocessor
-from funasr.lm.abs_model import AbsLM
-from funasr.lm.espnet_model import ESPnetLanguageModel
-from funasr.lm.seq_rnn_lm import SequentialRNNLM
-from funasr.lm.transformer_lm import TransformerLM
+from funasr.train.abs_model import AbsLM
+from funasr.train.abs_model import LanguageModel
+from funasr.models.seq_rnn_lm import SequentialRNNLM
+from funasr.models.transformer_lm import TransformerLM
from funasr.tasks.abs_task import AbsTask
from funasr.text.phoneme_tokenizer import g2p_choices
from funasr.torch_utils.initialize import initialize
@@ -52,13 +50,12 @@
@classmethod
def add_task_arguments(cls, parser: argparse.ArgumentParser):
# NOTE(kamo): Use '_' instead of '-' to avoid confusion
- assert check_argument_types()
group = parser.add_argument_group(description="Task related")
# NOTE(kamo): add_arguments(..., required=True) can't be used
# to provide --print_config mode. Instead of it, do as
required = parser.get_default("required")
- required += ["token_list"]
+ # required += ["token_list"]
group.add_argument(
"--token_list",
@@ -83,7 +80,7 @@
group.add_argument(
"--model_conf",
action=NestedDictAction,
- default=get_default_kwargs(ESPnetLanguageModel),
+ default=get_default_kwargs(LanguageModel),
help="The keyword arguments for model class.",
)
@@ -130,7 +127,6 @@
for class_choices in cls.class_choices_list:
class_choices.add_arguments(group)
- assert check_return_type(parser)
return parser
@classmethod
@@ -140,14 +136,12 @@
[Collection[Tuple[str, Dict[str, np.ndarray]]]],
Tuple[List[str], Dict[str, torch.Tensor]],
]:
- assert check_argument_types()
return CommonCollateFn(int_pad_value=0)
@classmethod
def build_preprocess_fn(
cls, args: argparse.Namespace, train: bool
) -> Optional[Callable[[str, Dict[str, np.array]], Dict[str, np.ndarray]]]:
- assert check_argument_types()
if args.use_preprocessor:
retval = CommonPreprocessor(
train=train,
@@ -160,7 +154,6 @@
)
else:
retval = None
- assert check_return_type(retval)
return retval
@classmethod
@@ -178,8 +171,7 @@
return retval
@classmethod
- def build_model(cls, args: argparse.Namespace) -> ESPnetLanguageModel:
- assert check_argument_types()
+ def build_model(cls, args: argparse.Namespace) -> LanguageModel:
if isinstance(args.token_list, str):
with open(args.token_list, encoding="utf-8") as f:
token_list = [line.rstrip() for line in f]
@@ -201,11 +193,9 @@
# 2. Build ESPnetModel
# Assume the last-id is sos_and_eos
- model = ESPnetLanguageModel(lm=lm, vocab_size=vocab_size, **args.model_conf)
+ model = LanguageModel(lm=lm, vocab_size=vocab_size, **args.model_conf)
# 3. Initialize
if args.init is not None:
initialize(model, args.init)
-
- assert check_return_type(model)
return model
--
Gitblit v1.9.1