From 993fdd8ecf50e9260c2885c273a279186a68d1f3 Mon Sep 17 00:00:00 2001
From: speech_asr <wangjiaming.wjm@alibaba-inc.com>
Date: 星期四, 20 四月 2023 17:01:47 +0800
Subject: [PATCH] update
---
funasr/build_utils/build_asr_model.py | 0
funasr/build_utils/build_pretrain_model.py | 0
funasr/build_utils/build_model.py | 5 +++--
funasr/bin/train.py | 12 ++++++------
funasr/build_utils/build_scheduler.py | 0
funasr/build_utils/build_args.py | 4 ++--
funasr/build_utils/build_distributed.py | 0
funasr/build_utils/build_dataloader.py | 0
funasr/build_utils/__init__.py | 0
funasr/build_utils/build_optimizer.py | 0
funasr/build_utils/build_lm_model.py | 2 +-
11 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/funasr/bin/train.py b/funasr/bin/train.py
index c6f19b6..c173167 100644
--- a/funasr/bin/train.py
+++ b/funasr/bin/train.py
@@ -10,12 +10,12 @@
from funasr.torch_utils.pytorch_version import pytorch_cudnn_version
from funasr.torch_utils.set_all_random_seed import set_all_random_seed
from funasr.utils import config_argparse
-from funasr.utils.build_args import build_args
-from funasr.utils.build_dataloader import build_dataloader
-from funasr.utils.build_distributed import build_distributed
-from funasr.utils.build_model import build_model
-from funasr.utils.build_optimizer import build_optimizer
-from funasr.utils.build_scheduler import build_scheduler
+from funasr.build_utils.build_args import build_args
+from funasr.build_utils.build_dataloader import build_dataloader
+from funasr.build_utils.build_distributed import build_distributed
+from funasr.build_utils.build_model import build_model
+from funasr.build_utils.build_optimizer import build_optimizer
+from funasr.build_utils.build_scheduler import build_scheduler
from funasr.utils.prepare_data import prepare_data
from funasr.utils.types import str2bool
from funasr.utils.yaml_no_alias_safe_dump import yaml_no_alias_safe_dump
diff --git a/funasr/build_utils/__init__.py b/funasr/build_utils/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/funasr/build_utils/__init__.py
diff --git a/funasr/utils/build_args.py b/funasr/build_utils/build_args.py
similarity index 96%
rename from funasr/utils/build_args.py
rename to funasr/build_utils/build_args.py
index f57f495..e85597e 100644
--- a/funasr/utils/build_args.py
+++ b/funasr/build_utils/build_args.py
@@ -11,7 +11,7 @@
def build_args(args):
parser = argparse.ArgumentParser("Task related config")
if args.task_name == "asr":
- from funasr.utils.build_asr_model import class_choices_list
+ from funasr.build_utils.build_asr_model import class_choices_list
for class_choices in class_choices_list:
# Append --<name> and --<name>_conf.
# e.g. --encoder and --encoder_conf
@@ -80,7 +80,7 @@
help="The file path of noise scp file.",
)
elif args.task_name == "pretrain":
- from funasr.utils.build_pretrain_model import class_choices_list
+ from funasr.build_utils.build_pretrain_model import class_choices_list
for class_choices in class_choices_list:
# Append --<name> and --<name>_conf.
# e.g. --encoder and --encoder_conf
diff --git a/funasr/utils/build_asr_model.py b/funasr/build_utils/build_asr_model.py
similarity index 100%
rename from funasr/utils/build_asr_model.py
rename to funasr/build_utils/build_asr_model.py
diff --git a/funasr/utils/build_dataloader.py b/funasr/build_utils/build_dataloader.py
similarity index 100%
rename from funasr/utils/build_dataloader.py
rename to funasr/build_utils/build_dataloader.py
diff --git a/funasr/utils/build_distributed.py b/funasr/build_utils/build_distributed.py
similarity index 100%
rename from funasr/utils/build_distributed.py
rename to funasr/build_utils/build_distributed.py
diff --git a/funasr/utils/build_lm_model.py b/funasr/build_utils/build_lm_model.py
similarity index 95%
rename from funasr/utils/build_lm_model.py
rename to funasr/build_utils/build_lm_model.py
index 4fe4625..2cd869d 100644
--- a/funasr/utils/build_lm_model.py
+++ b/funasr/build_utils/build_lm_model.py
@@ -20,7 +20,7 @@
]
-def build_pretrain_model(args):
+def build_lm_model(args):
# token_list
if args.token_list is not None:
with open(args.token_list) as f:
diff --git a/funasr/utils/build_model.py b/funasr/build_utils/build_model.py
similarity index 64%
rename from funasr/utils/build_model.py
rename to funasr/build_utils/build_model.py
index b774304..8222631 100644
--- a/funasr/utils/build_model.py
+++ b/funasr/build_utils/build_model.py
@@ -1,5 +1,6 @@
-from funasr.utils.build_asr_model import build_asr_model
-from funasr.utils.build_pretrain_model import build_pretrain_model
+from funasr.build_utils.build_asr_model import build_asr_model
+from funasr.build_utils.build_pretrain_model import build_pretrain_model
+from funasr.build_utils.build_lm_model import build_lm_model
def build_model(args):
diff --git a/funasr/utils/build_optimizer.py b/funasr/build_utils/build_optimizer.py
similarity index 100%
rename from funasr/utils/build_optimizer.py
rename to funasr/build_utils/build_optimizer.py
diff --git a/funasr/utils/build_pretrain_model.py b/funasr/build_utils/build_pretrain_model.py
similarity index 100%
rename from funasr/utils/build_pretrain_model.py
rename to funasr/build_utils/build_pretrain_model.py
diff --git a/funasr/utils/build_scheduler.py b/funasr/build_utils/build_scheduler.py
similarity index 100%
rename from funasr/utils/build_scheduler.py
rename to funasr/build_utils/build_scheduler.py
--
Gitblit v1.9.1