From b3b4c1bc5bb068c9aff99740e6257d12c6676ff7 Mon Sep 17 00:00:00 2001
From: aky15 <ankeyu.aky@11.17.44.249>
Date: 星期一, 17 四月 2023 11:19:14 +0800
Subject: [PATCH] rename some functions
---
funasr/modules/e2e_asr_common.py | 2 +-
funasr/models/joint_net/joint_network.py | 0
funasr/modules/beam_search/beam_search_transducer.py | 2 +-
funasr/tasks/asr_transducer.py | 6 +++---
funasr/models/e2e_asr_transducer_unified.py | 2 +-
funasr/models/e2e_asr_transducer.py | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/funasr/models/e2e_transducer.py b/funasr/models/e2e_asr_transducer.py
similarity index 99%
rename from funasr/models/e2e_transducer.py
rename to funasr/models/e2e_asr_transducer.py
index 460a6d7..6eb0023 100644
--- a/funasr/models/e2e_transducer.py
+++ b/funasr/models/e2e_asr_transducer.py
@@ -13,7 +13,7 @@
from funasr.models.rnnt_predictor.abs_decoder import AbsDecoder
from funasr.models.decoder.abs_decoder import AbsDecoder as AbsAttDecoder
from funasr.models.encoder.conformer_encoder import ConformerChunkEncoder as Encoder
-from funasr.models.joint_network import JointNetwork
+from funasr.models.joint_net.joint_network import JointNetwork
from funasr.modules.nets_utils import get_transducer_task_io
from funasr.layers.abs_normalize import AbsNormalize
from funasr.torch_utils.device_funcs import force_gatherable
diff --git a/funasr/models/e2e_transducer_unified.py b/funasr/models/e2e_asr_transducer_unified.py
similarity index 99%
rename from funasr/models/e2e_transducer_unified.py
rename to funasr/models/e2e_asr_transducer_unified.py
index f79ba57..ad61d12 100644
--- a/funasr/models/e2e_transducer_unified.py
+++ b/funasr/models/e2e_asr_transducer_unified.py
@@ -12,7 +12,7 @@
from funasr.models.specaug.abs_specaug import AbsSpecAug
from funasr.models.rnnt_predictor.abs_decoder import AbsDecoder
from funasr.models.encoder.conformer_encoder import ConformerChunkEncoder as Encoder
-from funasr.models.joint_network import JointNetwork
+from funasr.models.joint_net.joint_network import JointNetwork
from funasr.modules.nets_utils import get_transducer_task_io
from funasr.layers.abs_normalize import AbsNormalize
from funasr.torch_utils.device_funcs import force_gatherable
diff --git a/funasr/models/joint_network.py b/funasr/models/joint_net/joint_network.py
similarity index 100%
rename from funasr/models/joint_network.py
rename to funasr/models/joint_net/joint_network.py
diff --git a/funasr/modules/beam_search/beam_search_transducer.py b/funasr/modules/beam_search/beam_search_transducer.py
index 49cce92..8b7e613 100644
--- a/funasr/modules/beam_search/beam_search_transducer.py
+++ b/funasr/modules/beam_search/beam_search_transducer.py
@@ -7,7 +7,7 @@
import torch
from funasr.models.rnnt_predictor.abs_decoder import AbsDecoder
-from funasr.models.joint_network import JointNetwork
+from funasr.models.joint_net.joint_network import JointNetwork
@dataclass
diff --git a/funasr/modules/e2e_asr_common.py b/funasr/modules/e2e_asr_common.py
index 3746036..a01cd5e 100644
--- a/funasr/modules/e2e_asr_common.py
+++ b/funasr/modules/e2e_asr_common.py
@@ -19,7 +19,7 @@
from funasr.modules.beam_search.beam_search_transducer import BeamSearchTransducer
from funasr.models.rnnt_predictor.abs_decoder import AbsDecoder
-from funasr.models.joint_network import JointNetwork
+from funasr.models.joint_net.joint_network import JointNetwork
def end_detect(ended_hyps, i, M=3, D_end=np.log(1 * np.exp(-10))):
"""End detection.
diff --git a/funasr/tasks/asr_transducer.py b/funasr/tasks/asr_transducer.py
index 99b3d0c..d4136d0 100644
--- a/funasr/tasks/asr_transducer.py
+++ b/funasr/tasks/asr_transducer.py
@@ -25,9 +25,9 @@
from funasr.models.rnnt_predictor.rnn_decoder import RNNDecoder
from funasr.models.rnnt_predictor.stateless_decoder import StatelessDecoder
from funasr.models.encoder.conformer_encoder import ConformerChunkEncoder
-from funasr.models.e2e_transducer import TransducerModel
-from funasr.models.e2e_transducer_unified import UnifiedTransducerModel
-from funasr.models.joint_network import JointNetwork
+from funasr.models.e2e_asr_transducer import TransducerModel
+from funasr.models.e2e_asr_transducer_unified import UnifiedTransducerModel
+from funasr.models.joint_net.joint_network import JointNetwork
from funasr.layers.abs_normalize import AbsNormalize
from funasr.layers.global_mvn import GlobalMVN
from funasr.layers.utterance_mvn import UtteranceMVN
--
Gitblit v1.9.1