Merge 561c428e508da15074afb4b3496f5f6aafbe65d5 into f24b76e64bb59e157e3904d0330a132a308f18c0

egs/aidatatang_200zh/ASR/local/prepare_char.py

@@ -39,7 +39,8 @@ from typing import Dict, List
 
 import k2
 import torch
-from prepare_lang import (
+
+from .prepare_lang import (
     Lexicon,
     add_disambig_symbols,
     add_self_loops,

egs/aidatatang_200zh/ASR/local/test_prepare_lang.py

@@ -22,7 +22,8 @@ import os
 import tempfile
 
 import k2
-from prepare_lang import (
+
+from .prepare_lang import (
     add_disambig_symbols,
     generate_id_map,
     get_phones,

egs/aidatatang_200zh/ASR/pruned_transducer_stateless2/decode.py

@@ -59,21 +59,8 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from asr_datamodule import Aidatatang_200zhAsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
-from train import get_params, get_transducer_model
 
-from icefall.checkpoint import (
-    average_checkpoints,
-    find_checkpoints,
-    load_checkpoint,
-)
+from icefall.checkpoint import average_checkpoints, find_checkpoints, load_checkpoint
 from icefall.lexicon import Lexicon
 from icefall.utils import (
     AttributeDict,
@@ -82,6 +69,16 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import Aidatatang_200zhAsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .train import get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aidatatang_200zh/ASR/pruned_transducer_stateless2/export.py

@@ -46,12 +46,13 @@ import logging
 from pathlib import Path
 
 import torch
-from train import get_params, get_transducer_model
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.lexicon import Lexicon
 from icefall.utils import str2bool
 
+from .train import get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aidatatang_200zh/ASR/pruned_transducer_stateless2/pretrained.py

@@ -63,17 +63,18 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from beam_search import (
+from torch.nn.utils.rnn import pad_sequence
+
+from icefall.lexicon import Lexicon
+
+from .beam_search import (
     beam_search,
     fast_beam_search_one_best,
     greedy_search,
     greedy_search_batch,
     modified_beam_search,
 )
-from torch.nn.utils.rnn import pad_sequence
-from train import get_params, get_transducer_model
-
-from icefall.lexicon import Lexicon
+from .train import get_params, get_transducer_model
 
 
 def get_parser():

egs/aidatatang_200zh/ASR/pruned_transducer_stateless2/train.py

@@ -53,19 +53,12 @@ from shutil import copyfile
 from typing import Any, Dict, Optional, Tuple, Union
 
 import k2
-import optim
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import Aidatatang_200zhAsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse.cut import Cut
 from lhotse.dataset.sampling.base import CutSampler
 from lhotse.utils import fix_random_seed
-from model import Transducer
-from optim import Eden, Eve
 from torch import Tensor
 from torch.cuda.amp import GradScaler
 from torch.nn.parallel import DistributedDataParallel as DDP
@@ -81,8 +74,15 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from .asr_datamodule import Aidatatang_200zhAsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .optim import Eden, Eve, LRScheduler
+
 LRSchedulerType = Union[
-    torch.optim.lr_scheduler._LRScheduler, optim.LRScheduler
+    torch.optim.lr_scheduler._LRScheduler, LRScheduler
 ]
 
 os.environ["CUDA_LAUNCH_BLOCKING"] = "1"

egs/aishell/ASR/conformer_ctc/conformer.py

@@ -22,7 +22,8 @@ from typing import Optional, Tuple
 
 import torch
 from torch import Tensor, nn
-from transformer import Supervisions, Transformer, encoder_padding_mask
+
+from .transformer import Supervisions, Transformer, encoder_padding_mask
 
 
 class Conformer(Transformer):

egs/aishell/ASR/conformer_ctc/decode.py

@@ -26,8 +26,6 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from conformer import Conformer
 
 from icefall.char_graph_compiler import CharCtcTrainingGraphCompiler
 from icefall.checkpoint import average_checkpoints, load_checkpoint
@@ -48,6 +46,9 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import AishellAsrDataModule
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/conformer_ctc/export.py

@@ -24,12 +24,13 @@ import logging
 from pathlib import Path
 
 import torch
-from conformer import Conformer
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, str2bool
 
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/conformer_ctc/pretrained.py

@@ -26,7 +26,6 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from conformer import Conformer
 from torch.nn.utils.rnn import pad_sequence
 
 from icefall.decode import (
@@ -36,6 +35,8 @@ from icefall.decode import (
 )
 from icefall.utils import AttributeDict, get_texts
 
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/conformer_ctc/test_subsampling.py

@@ -16,10 +16,10 @@
 # limitations under the License.
 
 
-from subsampling import Conv2dSubsampling
-from subsampling import VggSubsampling
 import torch
 
+from .subsampling import Conv2dSubsampling, VggSubsampling
+
 
 def test_conv2d_subsampling():
     N = 3

egs/aishell/ASR/conformer_ctc/test_transformer.py

@@ -18,7 +18,8 @@
 
 import torch
 from torch.nn.utils.rnn import pad_sequence
-from transformer import (
+
+from .transformer import (
     Transformer,
     add_eos,
     add_sos,

egs/aishell/ASR/conformer_ctc/train.py

@@ -26,13 +26,10 @@ import k2
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from conformer import Conformer
 from lhotse.utils import fix_random_seed
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
 from icefall.char_graph_compiler import CharCtcTrainingGraphCompiler
 from icefall.checkpoint import load_checkpoint
@@ -48,6 +45,10 @@ from icefall.utils import (
     str2bool,
 )
 
+from .asr_datamodule import AishellAsrDataModule
+from .conformer import Conformer
+from .transformer import Noam
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/conformer_ctc/transformer.py

@@ -20,10 +20,11 @@ from typing import Dict, List, Optional, Tuple
 
 import torch
 import torch.nn as nn
-from label_smoothing import LabelSmoothingLoss
-from subsampling import Conv2dSubsampling, VggSubsampling
 from torch.nn.utils.rnn import pad_sequence
 
+from .label_smoothing import LabelSmoothingLoss
+from .subsampling import Conv2dSubsampling, VggSubsampling
+
 # Note: TorchScript requires Dict/List/etc. to be fully typed.
 Supervisions = Dict[str, torch.Tensor]
 

egs/aishell/ASR/conformer_mmi/conformer.py

@@ -22,7 +22,8 @@ from typing import Optional, Tuple
 
 import torch
 from torch import Tensor, nn
-from transformer import Supervisions, Transformer, encoder_padding_mask
+
+from .transformer import Supervisions, Transformer, encoder_padding_mask
 
 
 class Conformer(Transformer):

egs/aishell/ASR/conformer_mmi/decode.py

@@ -26,8 +26,6 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from conformer import Conformer
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.decode import (
@@ -49,6 +47,9 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import AishellAsrDataModule
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/conformer_mmi/train.py

@@ -28,13 +28,10 @@ import k2
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from conformer import Conformer
 from lhotse.utils import fix_random_seed
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
 from icefall.checkpoint import load_checkpoint
 from icefall.checkpoint import save_checkpoint as save_checkpoint_impl
@@ -51,6 +48,10 @@ from icefall.utils import (
     str2bool,
 )
 
+from .asr_datamodule import AishellAsrDataModule
+from .conformer import Conformer
+from .transformer import Noam
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/conformer_mmi/transformer.py

@@ -20,10 +20,11 @@ from typing import Dict, List, Optional, Tuple
 
 import torch
 import torch.nn as nn
-from label_smoothing import LabelSmoothingLoss
-from subsampling import Conv2dSubsampling, VggSubsampling
 from torch.nn.utils.rnn import pad_sequence
 
+from .label_smoothing import LabelSmoothingLoss
+from .subsampling import Conv2dSubsampling, VggSubsampling
+
 # Note: TorchScript requires Dict/List/etc. to be fully typed.
 Supervisions = Dict[str, torch.Tensor]
 

egs/aishell/ASR/local/prepare_char.py

@@ -39,7 +39,8 @@ from typing import Dict, List
 
 import k2
 import torch
-from prepare_lang import (
+
+from .prepare_lang import (
     Lexicon,
     add_disambig_symbols,
     add_self_loops,

egs/aishell/ASR/local/test_prepare_lang.py

@@ -22,7 +22,8 @@ import os
 import tempfile
 
 import k2
-from prepare_lang import (
+
+from .prepare_lang import (
     add_disambig_symbols,
     generate_id_map,
     get_phones,

egs/aishell/ASR/pruned_transducer_stateless3/decode.py

@@ -66,16 +66,6 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from aishell import AIShell
-from asr_datamodule import AsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
-from train import add_model_arguments, get_params, get_transducer_model
 
 from icefall.checkpoint import (
     average_checkpoints,
@@ -92,6 +82,17 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .aishell import AIShell
+from .asr_datamodule import AsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .train import add_model_arguments, get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/pruned_transducer_stateless3/export.py

@@ -48,7 +48,6 @@ import logging
 from pathlib import Path
 
 import torch
-from train import add_model_arguments, get_params, get_transducer_model
 
 from icefall.checkpoint import (
     average_checkpoints,
@@ -59,6 +58,8 @@ from icefall.checkpoint import (
 from icefall.lexicon import Lexicon
 from icefall.utils import str2bool
 
+from .train import add_model_arguments, get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/pruned_transducer_stateless3/model.py

@@ -20,11 +20,12 @@ from typing import Optional
 import k2
 import torch
 import torch.nn as nn
-from encoder_interface import EncoderInterface
-from scaling import ScaledLinear
 
 from icefall.utils import add_sos
 
+from .encoder_interface import EncoderInterface
+from .scaling import ScaledLinear
+
 
 class Transducer(nn.Module):
     """It implements https://arxiv.org/pdf/1211.3711.pdf

egs/aishell/ASR/pruned_transducer_stateless3/pretrained.py

@@ -65,17 +65,18 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from beam_search import (
+from torch.nn.utils.rnn import pad_sequence
+
+from icefall.lexicon import Lexicon
+
+from .beam_search import (
     beam_search,
     fast_beam_search_one_best,
     greedy_search,
     greedy_search_batch,
     modified_beam_search,
 )
-from torch.nn.utils.rnn import pad_sequence
-from train import add_model_arguments, get_params, get_transducer_model
-
-from icefall.lexicon import Lexicon
+from .train import add_model_arguments, get_params, get_transducer_model
 
 
 def get_parser():

egs/aishell/ASR/pruned_transducer_stateless3/train.py

@@ -58,23 +58,13 @@ from shutil import copyfile
 from typing import Any, Dict, Optional, Tuple, Union
 
 import k2
-import optim
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-
-from aidatatang_200zh import AIDatatang200zh
-from aishell import AIShell
-from asr_datamodule import AsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse import CutSet, load_manifest
 from lhotse.cut import Cut
 from lhotse.dataset.sampling.base import CutSampler
 from lhotse.utils import fix_random_seed
-from model import Transducer
-from optim import Eden, Eve
 from torch import Tensor
 from torch.cuda.amp import GradScaler
 from torch.nn.parallel import DistributedDataParallel as DDP
@@ -93,8 +83,17 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from .aidatatang_200zh import AIDatatang200zh
+from .aishell import AIShell
+from .asr_datamodule import AsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .optim import Eden, Eve, LRScheduler
+
 LRSchedulerType = Union[
-    torch.optim.lr_scheduler._LRScheduler, optim.LRScheduler
+    torch.optim.lr_scheduler._LRScheduler, LRScheduler
 ]
 
 

egs/aishell/ASR/tdnn_lstm_ctc/decode.py

@@ -24,8 +24,6 @@ from typing import Dict, List, Tuple
 import k2
 import torch
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from model import TdnnLstm
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.decode import get_lattice, nbest_decoding, one_best_decoding
@@ -39,6 +37,9 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import AishellAsrDataModule
+from .model import TdnnLstm
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/tdnn_lstm_ctc/pretrained.py

@@ -25,12 +25,13 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from model import TdnnLstm
 from torch.nn.utils.rnn import pad_sequence
 
 from icefall.decode import get_lattice, one_best_decoding
 from icefall.utils import AttributeDict, get_texts
 
+from .model import TdnnLstm
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/tdnn_lstm_ctc/train.py

@@ -36,9 +36,7 @@ import torch.distributed as dist
 import torch.multiprocessing as mp
 import torch.nn as nn
 import torch.optim as optim
-from asr_datamodule import AishellAsrDataModule
 from lhotse.utils import fix_random_seed
-from model import TdnnLstm
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.optim.lr_scheduler import StepLR
@@ -49,12 +47,10 @@ from icefall.checkpoint import save_checkpoint as save_checkpoint_impl
 from icefall.dist import cleanup_dist, setup_dist
 from icefall.graph_compiler import CtcTrainingGraphCompiler
 from icefall.lexicon import Lexicon
-from icefall.utils import (
-    AttributeDict,
-    encode_supervisions,
-    setup_logger,
-    str2bool,
-)
+from icefall.utils import AttributeDict, encode_supervisions, setup_logger, str2bool
+
+from .asr_datamodule import AishellAsrDataModule
+from .model import TdnnLstm
 
 
 def get_parser():

egs/aishell/ASR/transducer_stateless/beam_search.py

@@ -19,7 +19,8 @@ from typing import Dict, List, Optional
 
 import numpy as np
 import torch
-from model import Transducer
+
+from .model import Transducer
 
 
 def greedy_search(

egs/aishell/ASR/transducer_stateless/conformer.py

@@ -22,10 +22,11 @@ from typing import Optional, Tuple
 
 import torch
 from torch import Tensor, nn
-from transformer import Transformer
 
 from icefall.utils import make_pad_mask
 
+from .transformer import Transformer
+
 
 class Conformer(Transformer):
     """

egs/aishell/ASR/transducer_stateless/decode.py

@@ -24,12 +24,6 @@ from typing import Dict, List, Tuple
 
 import torch
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from beam_search import beam_search, greedy_search
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
-from model import Transducer
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.env import get_env_info
@@ -38,10 +32,17 @@ from icefall.utils import (
     AttributeDict,
     setup_logger,
     store_transcripts,
-    write_error_stats,
     str2bool,
+    write_error_stats,
 )
 
+from .asr_datamodule import AishellAsrDataModule
+from .beam_search import beam_search, greedy_search
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless/export.py

@@ -49,16 +49,17 @@ from pathlib import Path
 
 import torch
 import torch.nn as nn
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
-from model import Transducer
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, str2bool
 
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless/model.py

@@ -17,10 +17,11 @@
 import k2
 import torch
 import torch.nn as nn
-from encoder_interface import EncoderInterface
 
 from icefall.utils import add_sos
 
+from .encoder_interface import EncoderInterface
+
 
 class Transducer(nn.Module):
     """It implements https://arxiv.org/pdf/1211.3711.pdf

egs/aishell/ASR/transducer_stateless/pretrained.py

@@ -51,11 +51,6 @@ import kaldifeat
 import torch
 import torch.nn as nn
 import torchaudio
-from beam_search import beam_search, greedy_search
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
-from model import Transducer
 from torch.nn.utils.rnn import pad_sequence
 
 from icefall.char_graph_compiler import CharCtcTrainingGraphCompiler
@@ -63,6 +58,12 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict
 
+from .beam_search import beam_search, greedy_search
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless/test_decoder.py

@@ -23,7 +23,8 @@ To run this file, do:
 """
 
 import torch
-from decoder import Decoder
+
+from .decoder import Decoder
 
 
 def test_decoder():

egs/aishell/ASR/transducer_stateless/train.py

@@ -30,18 +30,12 @@ import k2
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse.cut import Cut
 from lhotse.utils import fix_random_seed
-from model import Transducer
 from torch import Tensor
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
 from icefall.char_graph_compiler import CharCtcTrainingGraphCompiler
 from icefall.checkpoint import load_checkpoint
@@ -51,6 +45,13 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from .asr_datamodule import AishellAsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .transformer import Noam
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless/transformer.py

@@ -20,11 +20,12 @@ from typing import Optional, Tuple
 
 import torch
 import torch.nn as nn
-from encoder_interface import EncoderInterface
-from subsampling import Conv2dSubsampling, VggSubsampling
 
 from icefall.utils import make_pad_mask
 
+from .encoder_interface import EncoderInterface
+from .subsampling import Conv2dSubsampling, VggSubsampling
+
 
 class Transformer(EncoderInterface):
     def __init__(

egs/aishell/ASR/transducer_stateless_modified-2/asr_datamodule.py

@@ -29,10 +29,7 @@ from lhotse.dataset import (
     K2SpeechRecognitionDataset,
     SpecAugment,
 )
-from lhotse.dataset.input_strategies import (
-    OnTheFlyFeatures,
-    PrecomputedFeatures,
-)
+from lhotse.dataset.input_strategies import OnTheFlyFeatures, PrecomputedFeatures
 from torch.utils.data import DataLoader
 
 from icefall.utils import str2bool

egs/aishell/ASR/transducer_stateless_modified-2/decode.py

@@ -63,16 +63,6 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from aishell import AIShell
-from asr_datamodule import AsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
-from train import get_params, get_transducer_model
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.lexicon import Lexicon
@@ -83,6 +73,17 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .aishell import AIShell
+from .asr_datamodule import AsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .train import get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless_modified-2/export.py

@@ -48,16 +48,17 @@ from pathlib import Path
 
 import torch
 import torch.nn as nn
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
-from model import Transducer
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, str2bool
 
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless_modified-2/model.py

@@ -20,10 +20,11 @@ from typing import Optional
 import k2
 import torch
 import torch.nn as nn
-from encoder_interface import EncoderInterface
 
 from icefall.utils import add_sos
 
+from .encoder_interface import EncoderInterface
+
 
 class Transducer(nn.Module):
     """It implements https://arxiv.org/pdf/1211.3711.pdf

egs/aishell/ASR/transducer_stateless_modified-2/pretrained.py

@@ -65,17 +65,18 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from beam_search import (
+from torch.nn.utils.rnn import pad_sequence
+
+from icefall.lexicon import Lexicon
+
+from .beam_search import (
     beam_search,
     fast_beam_search_one_best,
     greedy_search,
     greedy_search_batch,
     modified_beam_search,
 )
-from torch.nn.utils.rnn import pad_sequence
-from train import get_params, get_transducer_model
-
-from icefall.lexicon import Lexicon
+from .train import get_params, get_transducer_model
 
 
 def get_parser():

egs/aishell/ASR/transducer_stateless_modified-2/train.py

@@ -50,21 +50,13 @@ import k2
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from aidatatang_200zh import AIDatatang200zh
-from aishell import AIShell
-from asr_datamodule import AsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse import CutSet, load_manifest
 from lhotse.cut import Cut
 from lhotse.utils import fix_random_seed
-from model import Transducer
 from torch import Tensor
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
 from icefall.char_graph_compiler import CharCtcTrainingGraphCompiler
 from icefall.checkpoint import load_checkpoint
@@ -74,6 +66,15 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from .aidatatang_200zh import AIDatatang200zh
+from .aishell import AIShell
+from .asr_datamodule import AsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .transformer import Noam
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless_modified/decode.py

@@ -65,15 +65,6 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
-from train import get_params, get_transducer_model
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.lexicon import Lexicon
@@ -84,6 +75,16 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import AishellAsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .train import get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless_modified/export.py

@@ -48,16 +48,17 @@ from pathlib import Path
 
 import torch
 import torch.nn as nn
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
-from model import Transducer
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, str2bool
 
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell/ASR/transducer_stateless_modified/pretrained.py

@@ -65,17 +65,18 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from beam_search import (
+from torch.nn.utils.rnn import pad_sequence
+
+from icefall.lexicon import Lexicon
+
+from .beam_search import (
     beam_search,
     fast_beam_search_one_best,
     greedy_search,
     greedy_search_batch,
     modified_beam_search,
 )
-from torch.nn.utils.rnn import pad_sequence
-from train import get_params, get_transducer_model
-
-from icefall.lexicon import Lexicon
+from .train import get_params, get_transducer_model
 
 
 def get_parser():

egs/aishell/ASR/transducer_stateless_modified/test_decoder.py

@@ -23,7 +23,8 @@ To run this file, do:
 """
 
 import torch
-from decoder import Decoder
+
+from .decoder import Decoder
 
 
 def test_decoder():

egs/aishell/ASR/transducer_stateless_modified/train.py

@@ -46,18 +46,12 @@ import k2
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import AishellAsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse.cut import Cut
 from lhotse.utils import fix_random_seed
-from model import Transducer
 from torch import Tensor
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
 from icefall.char_graph_compiler import CharCtcTrainingGraphCompiler
 from icefall.checkpoint import load_checkpoint
@@ -67,6 +61,13 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from .asr_datamodule import AishellAsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .transformer import Noam
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell2/ASR/pruned_transducer_stateless5/decode.py

@@ -110,18 +110,6 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from asr_datamodule import AiShell2AsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_nbest,
-    fast_beam_search_nbest_LG,
-    fast_beam_search_nbest_oracle,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
-from train import add_model_arguments, get_params, get_transducer_model
 
 from icefall.char_graph_compiler import CharCtcTrainingGraphCompiler
 from icefall.checkpoint import (
@@ -139,6 +127,19 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import AiShell2AsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_nbest,
+    fast_beam_search_nbest_LG,
+    fast_beam_search_nbest_oracle,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .train import add_model_arguments, get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell2/ASR/pruned_transducer_stateless5/export.py

@@ -49,7 +49,6 @@ import logging
 from pathlib import Path
 
 import torch
-from train import add_model_arguments, get_params, get_transducer_model
 
 from icefall.checkpoint import (
     average_checkpoints,
@@ -60,6 +59,8 @@ from icefall.checkpoint import (
 from icefall.lexicon import Lexicon
 from icefall.utils import str2bool
 
+from .train import add_model_arguments, get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell2/ASR/pruned_transducer_stateless5/pretrained.py

@@ -59,17 +59,18 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from beam_search import (
+from torch.nn.utils.rnn import pad_sequence
+
+from icefall.lexicon import Lexicon
+
+from .beam_search import (
     beam_search,
     fast_beam_search_one_best,
     greedy_search,
     greedy_search_batch,
     modified_beam_search,
 )
-from torch.nn.utils.rnn import pad_sequence
-from train import add_model_arguments, get_params, get_transducer_model
-
-from icefall.lexicon import Lexicon
+from .train import add_model_arguments, get_params, get_transducer_model
 
 
 def get_parser():

egs/aishell2/ASR/pruned_transducer_stateless5/train.py

@@ -61,19 +61,12 @@ from shutil import copyfile
 from typing import Any, Dict, Optional, Tuple, Union
 
 import k2
-import optim
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import AiShell2AsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse.cut import Cut
 from lhotse.dataset.sampling.base import CutSampler
 from lhotse.utils import fix_random_seed
-from model import Transducer
-from optim import Eden, Eve
 from torch import Tensor
 from torch.cuda.amp import GradScaler
 from torch.nn.parallel import DistributedDataParallel as DDP
@@ -92,8 +85,15 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from .asr_datamodule import AiShell2AsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .optim import Eden, Eve, LRScheduler
+
 LRSchedulerType = Union[
-    torch.optim.lr_scheduler._LRScheduler, optim.LRScheduler
+    torch.optim.lr_scheduler._LRScheduler, LRScheduler
 ]
 
 

egs/aishell4/ASR/local/prepare_char.py

@@ -39,7 +39,8 @@ from typing import Dict, List
 
 import k2
 import torch
-from prepare_lang import (
+
+from .prepare_lang import (
     Lexicon,
     add_disambig_symbols,
     add_self_loops,

egs/aishell4/ASR/local/test_prepare_lang.py

@@ -22,7 +22,8 @@ import os
 import tempfile
 
 import k2
-from prepare_lang import (
+
+from .prepare_lang import (
     add_disambig_symbols,
     generate_id_map,
     get_phones,

egs/aishell4/ASR/pruned_transducer_stateless5/decode.py

@@ -61,17 +61,7 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from asr_datamodule import Aishell4AsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
 from lhotse.cut import Cut
-from local.text_normalize import text_normalize
-from train import add_model_arguments, get_params, get_transducer_model
 
 from icefall.checkpoint import (
     average_checkpoints,
@@ -88,6 +78,17 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from ..local.text_normalize import text_normalize
+from .asr_datamodule import Aishell4AsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .train import add_model_arguments, get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell4/ASR/pruned_transducer_stateless5/export.py

@@ -49,7 +49,6 @@ import logging
 from pathlib import Path
 
 import torch
-from train import add_model_arguments, get_params, get_transducer_model
 
 from icefall.checkpoint import (
     average_checkpoints,
@@ -60,6 +59,8 @@ from icefall.checkpoint import (
 from icefall.lexicon import Lexicon
 from icefall.utils import str2bool
 
+from .train import add_model_arguments, get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/aishell4/ASR/pruned_transducer_stateless5/pretrained.py

@@ -72,17 +72,18 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from beam_search import (
+from torch.nn.utils.rnn import pad_sequence
+
+from icefall.lexicon import Lexicon
+
+from .beam_search import (
     beam_search,
     fast_beam_search_one_best,
     greedy_search,
     greedy_search_batch,
     modified_beam_search,
 )
-from torch.nn.utils.rnn import pad_sequence
-from train import add_model_arguments, get_params, get_transducer_model
-
-from icefall.lexicon import Lexicon
+from .train import add_model_arguments, get_params, get_transducer_model
 
 
 def get_parser():

egs/aishell4/ASR/pruned_transducer_stateless5/test_model.py

@@ -23,7 +23,7 @@ To run this file, do:
     python ./pruned_transducer_stateless5/test_model.py
 """
 
-from train import get_params, get_transducer_model
+from .train import get_params, get_transducer_model
 
 
 def test_model_1():

egs/aishell4/ASR/pruned_transducer_stateless5/train.py

@@ -53,20 +53,12 @@ from shutil import copyfile
 from typing import Any, Dict, Optional, Tuple, Union
 
 import k2
-import optim
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import Aishell4AsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse.cut import Cut
 from lhotse.dataset.sampling.base import CutSampler
 from lhotse.utils import fix_random_seed
-from local.text_normalize import text_normalize
-from model import Transducer
-from optim import Eden, Eve
 from torch import Tensor
 from torch.cuda.amp import GradScaler
 from torch.nn.parallel import DistributedDataParallel as DDP
@@ -85,8 +77,16 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from ..local.text_normalize import text_normalize
+from .asr_datamodule import Aishell4AsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .optim import Eden, Eve, LRScheduler
+
 LRSchedulerType = Union[
-    torch.optim.lr_scheduler._LRScheduler, optim.LRScheduler
+    torch.optim.lr_scheduler._LRScheduler, LRScheduler
 ]
 
 

egs/alimeeting/ASR/local/prepare_char.py

@@ -39,7 +39,8 @@ from typing import Dict, List
 
 import k2
 import torch
-from prepare_lang import (
+
+from .prepare_lang import (
     Lexicon,
     add_disambig_symbols,
     add_self_loops,

egs/alimeeting/ASR/local/test_prepare_lang.py

@@ -22,7 +22,8 @@ import os
 import tempfile
 
 import k2
-from prepare_lang import (
+
+from .prepare_lang import (
     add_disambig_symbols,
     generate_id_map,
     get_phones,

egs/alimeeting/ASR/pruned_transducer_stateless2/decode.py

@@ -59,22 +59,9 @@ from typing import Dict, List, Optional, Tuple
 import k2
 import torch
 import torch.nn as nn
-from asr_datamodule import AlimeetingAsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
 from lhotse.cut import Cut
-from train import get_params, get_transducer_model
 
-from icefall.checkpoint import (
-    average_checkpoints,
-    find_checkpoints,
-    load_checkpoint,
-)
+from icefall.checkpoint import average_checkpoints, find_checkpoints, load_checkpoint
 from icefall.lexicon import Lexicon
 from icefall.utils import (
     AttributeDict,
@@ -83,6 +70,16 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import AlimeetingAsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .train import get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/alimeeting/ASR/pruned_transducer_stateless2/export.py

@@ -46,12 +46,13 @@ import logging
 from pathlib import Path
 
 import torch
-from train import get_params, get_transducer_model
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.lexicon import Lexicon
 from icefall.utils import str2bool
 
+from .train import get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/alimeeting/ASR/pruned_transducer_stateless2/pretrained.py

@@ -63,17 +63,18 @@ import k2
 import kaldifeat
 import torch
 import torchaudio
-from beam_search import (
+from torch.nn.utils.rnn import pad_sequence
+
+from icefall.lexicon import Lexicon
+
+from .beam_search import (
     beam_search,
     fast_beam_search_one_best,
     greedy_search,
     greedy_search_batch,
     modified_beam_search,
 )
-from torch.nn.utils.rnn import pad_sequence
-from train import get_params, get_transducer_model
-
-from icefall.lexicon import Lexicon
+from .train import get_params, get_transducer_model
 
 
 def get_parser():

egs/alimeeting/ASR/pruned_transducer_stateless2/train.py

@@ -53,19 +53,12 @@ from shutil import copyfile
 from typing import Any, Dict, Optional, Tuple, Union
 
 import k2
-import optim
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import AlimeetingAsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse.cut import Cut
 from lhotse.dataset.sampling.base import CutSampler
 from lhotse.utils import fix_random_seed
-from model import Transducer
-from optim import Eden, Eve
 from torch import Tensor
 from torch.cuda.amp import GradScaler
 from torch.nn.parallel import DistributedDataParallel as DDP
@@ -81,8 +74,15 @@ from icefall.env import get_env_info
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from .asr_datamodule import AlimeetingAsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .optim import Eden, Eve, LRScheduler
+
 LRSchedulerType = Union[
-    torch.optim.lr_scheduler._LRScheduler, optim.LRScheduler
+    torch.optim.lr_scheduler._LRScheduler, LRScheduler
 ]
 
 os.environ["CUDA_LAUNCH_BLOCKING"] = "1"

egs/gigaspeech/ASR/conformer_ctc/conformer.py

@@ -21,7 +21,8 @@ from typing import Optional, Tuple, Union
 
 import torch
 from torch import Tensor, nn
-from transformer import Supervisions, Transformer, encoder_padding_mask
+
+from .transformer import Supervisions, Transformer, encoder_padding_mask
 
 
 class Conformer(Transformer):

egs/gigaspeech/ASR/conformer_ctc/decode.py

@@ -27,9 +27,6 @@ import k2
 import sentencepiece as spm
 import torch
 import torch.nn as nn
-from asr_datamodule import GigaSpeechAsrDataModule
-from conformer import Conformer
-from gigaspeech_scoring import asr_text_post_processing
 
 from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall.checkpoint import average_checkpoints, load_checkpoint
@@ -52,6 +49,10 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import GigaSpeechAsrDataModule
+from .conformer import Conformer
+from .gigaspeech_scoring import asr_text_post_processing
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/gigaspeech/ASR/conformer_ctc/train.py

@@ -27,14 +27,11 @@ import k2
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import GigaSpeechAsrDataModule
-from conformer import Conformer
 from lhotse.utils import fix_random_seed
 from torch import Tensor
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
 from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall.checkpoint import load_checkpoint
@@ -50,6 +47,10 @@ from icefall.utils import (
     str2bool,
 )
 
+from .asr_datamodule import GigaSpeechAsrDataModule
+from .conformer import Conformer
+from .transformer import Noam
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/gigaspeech/ASR/conformer_ctc/transformer.py

@@ -19,10 +19,11 @@ from typing import Dict, List, Optional, Tuple, Union
 
 import torch
 import torch.nn as nn
-from label_smoothing import LabelSmoothingLoss
-from subsampling import Conv2dSubsampling, VggSubsampling
 from torch.nn.utils.rnn import pad_sequence
 
+from .label_smoothing import LabelSmoothingLoss
+from .subsampling import Conv2dSubsampling, VggSubsampling
+
 # Note: TorchScript requires Dict/List/etc. to be fully typed.
 Supervisions = Dict[str, torch.Tensor]
 

egs/gigaspeech/ASR/pruned_transducer_stateless2/decode.py

@@ -66,22 +66,8 @@ import k2
 import sentencepiece as spm
 import torch
 import torch.nn as nn
-from asr_datamodule import GigaSpeechAsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
-from gigaspeech_scoring import asr_text_post_processing
-from train import get_params, get_transducer_model
 
-from icefall.checkpoint import (
-    average_checkpoints,
-    find_checkpoints,
-    load_checkpoint,
-)
+from icefall.checkpoint import average_checkpoints, find_checkpoints, load_checkpoint
 from icefall.utils import (
     AttributeDict,
     setup_logger,
@@ -89,6 +75,17 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import GigaSpeechAsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .gigaspeech_scoring import asr_text_post_processing
+from .train import get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/gigaspeech/ASR/pruned_transducer_stateless2/export.py

@@ -49,15 +49,12 @@ from pathlib import Path
 
 import sentencepiece as spm
 import torch
-from train import get_params, get_transducer_model
 
-from icefall.checkpoint import (
-    average_checkpoints,
-    find_checkpoints,
-    load_checkpoint,
-)
+from icefall.checkpoint import average_checkpoints, find_checkpoints, load_checkpoint
 from icefall.utils import str2bool
 
+from .train import get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/gigaspeech/ASR/pruned_transducer_stateless2/train.py

@@ -56,14 +56,8 @@ import sentencepiece as spm
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import GigaSpeechAsrDataModule
-from conformer import Conformer
-from decoder import Decoder
-from joiner import Joiner
 from lhotse.dataset.sampling.base import CutSampler
 from lhotse.utils import fix_random_seed
-from model import Transducer
-from optim import Eden, Eve
 from torch import Tensor
 from torch.cuda.amp import GradScaler
 from torch.nn.parallel import DistributedDataParallel as DDP
@@ -77,6 +71,13 @@ from icefall.dist import cleanup_dist, setup_dist
 from icefall.env import get_env_info
 from icefall.utils import AttributeDict, MetricsTracker, setup_logger, str2bool
 
+from .asr_datamodule import GigaSpeechAsrDataModule
+from .conformer import Conformer
+from .decoder import Decoder
+from .joiner import Joiner
+from .model import Transducer
+from .optim import Eden, Eve
+
 LRSchedulerType = Union[
     torch.optim.lr_scheduler._LRScheduler, optim.LRScheduler
 ]

egs/librispeech/ASR/conformer_ctc/ali.py

@@ -34,8 +34,6 @@ from pathlib import Path
 import k2
 import numpy as np
 import torch
-from asr_datamodule import LibriSpeechAsrDataModule
-from conformer import Conformer
 from lhotse import CutSet
 from lhotse.features.io import FeaturesWriter, NumpyHdf5Writer
 
@@ -51,6 +49,9 @@ from icefall.utils import (
     setup_logger,
 )
 
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/librispeech/ASR/conformer_ctc/conformer.py

@@ -21,7 +21,8 @@ from typing import Optional, Tuple, Union
 
 import torch
 from torch import Tensor, nn
-from transformer import Supervisions, Transformer, encoder_padding_mask
+
+from .transformer import Supervisions, Transformer, encoder_padding_mask
 
 
 class Conformer(Transformer):

egs/librispeech/ASR/conformer_ctc/decode.py

@@ -26,8 +26,6 @@ import k2
 import sentencepiece as spm
 import torch
 import torch.nn as nn
-from asr_datamodule import LibriSpeechAsrDataModule
-from conformer import Conformer
 
 from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall.checkpoint import load_checkpoint
@@ -54,6 +52,9 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/librispeech/ASR/conformer_ctc/export.py

@@ -24,12 +24,13 @@ import logging
 from pathlib import Path
 
 import torch
-from conformer import Conformer
 
 from icefall.checkpoint import average_checkpoints, load_checkpoint
 from icefall.lexicon import Lexicon
 from icefall.utils import AttributeDict, str2bool
 
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/librispeech/ASR/conformer_ctc/pretrained.py

@@ -27,7 +27,6 @@ import kaldifeat
 import sentencepiece as spm
 import torch
 import torchaudio
-from conformer import Conformer
 from torch.nn.utils.rnn import pad_sequence
 
 from icefall.decode import (
@@ -38,6 +37,8 @@ from icefall.decode import (
 )
 from icefall.utils import AttributeDict, get_texts
 
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/librispeech/ASR/conformer_ctc/test_label_smoothing.py

@@ -18,7 +18,8 @@
 from distutils.version import LooseVersion
 
 import torch
-from label_smoothing import LabelSmoothingLoss
+
+from .label_smoothing import LabelSmoothingLoss
 
 torch_ver = LooseVersion(torch.__version__)
 

egs/librispeech/ASR/conformer_ctc/test_subsampling.py

@@ -17,7 +17,8 @@
 
 
 import torch
-from subsampling import Conv2dSubsampling, VggSubsampling
+
+from .subsampling import Conv2dSubsampling, VggSubsampling
 
 
 def test_conv2d_subsampling():

egs/librispeech/ASR/conformer_ctc/test_transformer.py

@@ -18,7 +18,8 @@
 
 import torch
 from torch.nn.utils.rnn import pad_sequence
-from transformer import (
+
+from .transformer import (
     Transformer,
     add_eos,
     add_sos,

egs/librispeech/ASR/conformer_ctc/train.py

@@ -38,15 +38,12 @@ import k2
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import LibriSpeechAsrDataModule
-from conformer import Conformer
 from lhotse.cut import Cut
 from lhotse.utils import fix_random_seed
 from torch import Tensor
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
 from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall.checkpoint import load_checkpoint
@@ -63,6 +60,10 @@ from icefall.utils import (
     str2bool,
 )
 
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .conformer import Conformer
+from .transformer import Noam
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/librispeech/ASR/conformer_ctc/transformer.py

@@ -19,10 +19,11 @@ from typing import Dict, List, Optional, Tuple, Union
 
 import torch
 import torch.nn as nn
-from label_smoothing import LabelSmoothingLoss
-from subsampling import Conv2dSubsampling, VggSubsampling
 from torch.nn.utils.rnn import pad_sequence
 
+from .label_smoothing import LabelSmoothingLoss
+from .subsampling import Conv2dSubsampling, VggSubsampling
+
 # Note: TorchScript requires Dict/List/etc. to be fully typed.
 Supervisions = Dict[str, torch.Tensor]
 

egs/librispeech/ASR/conformer_ctc2/attention.py

@@ -21,7 +21,7 @@ import torch.nn as nn
 from torch import Tensor
 from torch.nn.init import xavier_normal_
 
-from scaling import ScaledLinear
+from .scaling import ScaledLinear
 
 
 class MultiheadAttention(nn.Module):

egs/librispeech/ASR/conformer_ctc2/conformer.py

@@ -22,17 +22,17 @@ import warnings
 from typing import Optional, Tuple
 
 import torch
-from scaling import (
+from torch import Tensor, nn
+
+from .scaling import (
     ActivationBalancer,
     BasicNorm,
     DoubleSwish,
     ScaledConv1d,
     ScaledLinear,
 )
-from torch import Tensor, nn
-from subsampling import Conv2dSubsampling
-
-from transformer import Supervisions, Transformer, encoder_padding_mask
+from .subsampling import Conv2dSubsampling
+from .transformer import Supervisions, Transformer, encoder_padding_mask
 
 
 class Conformer(Transformer):

egs/librispeech/ASR/conformer_ctc2/decode.py

@@ -28,17 +28,14 @@ import k2
 import sentencepiece as spm
 import torch
 import torch.nn as nn
-from asr_datamodule import LibriSpeechAsrDataModule
-from conformer import Conformer
 
+from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall.checkpoint import (
     average_checkpoints,
     average_checkpoints_with_averaged_model,
     find_checkpoints,
     load_checkpoint,
 )
-
-from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall.decode import (
     get_lattice,
     nbest_decoding,
@@ -62,6 +59,9 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/librispeech/ASR/conformer_ctc2/export.py

@@ -47,7 +47,6 @@ import logging
 from pathlib import Path
 
 import torch
-from decode import get_params
 
 from icefall.checkpoint import (
     average_checkpoints,
@@ -55,10 +54,11 @@ from icefall.checkpoint import (
     find_checkpoints,
     load_checkpoint,
 )
-from conformer import Conformer
-
-from icefall.utils import str2bool
 from icefall.lexicon import Lexicon
+from icefall.utils import str2bool
+
+from .conformer import Conformer
+from .decode import get_params
 
 
 def get_parser():

egs/librispeech/ASR/conformer_ctc2/subsampling.py

@@ -17,14 +17,15 @@
 # limitations under the License.
 
 import torch
-from scaling import (
+from torch import nn
+
+from .scaling import (
     ActivationBalancer,
     BasicNorm,
     DoubleSwish,
     ScaledConv2d,
     ScaledLinear,
 )
-from torch import nn
 
 
 class Conv2dSubsampling(nn.Module):

egs/librispeech/ASR/conformer_ctc2/train.py

@@ -54,23 +54,19 @@ from shutil import copyfile
 from typing import Any, Dict, Optional, Tuple, Union
 
 import k2
-import optim
 import torch
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import LibriSpeechAsrDataModule
-from conformer import Conformer
 from lhotse.cut import Cut
 from lhotse.dataset.sampling.base import CutSampler
 from lhotse.utils import fix_random_seed
-from optim import Eden, Eve
 from torch import Tensor
 from torch.cuda.amp import GradScaler
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.utils.tensorboard import SummaryWriter
 
-from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall import diagnostics
+from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall.checkpoint import load_checkpoint, remove_checkpoints
 from icefall.checkpoint import save_checkpoint as save_checkpoint_impl
 from icefall.checkpoint import (
@@ -89,8 +85,12 @@ from icefall.utils import (
     str2bool,
 )
 
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .conformer import Conformer
+from .optim import Eden, Eve, LRScheduler
+
 LRSchedulerType = Union[
-    torch.optim.lr_scheduler._LRScheduler, optim.LRScheduler
+    torch.optim.lr_scheduler._LRScheduler, LRScheduler
 ]
 
 

egs/librispeech/ASR/conformer_ctc2/transformer.py

@@ -21,19 +21,18 @@ from typing import Dict, List, Optional, Tuple
 
 import torch
 import torch.nn as nn
-from label_smoothing import LabelSmoothingLoss
-from subsampling import Conv2dSubsampling
-from attention import MultiheadAttention
 from torch.nn.utils.rnn import pad_sequence
 
-from scaling import (
+from .attention import MultiheadAttention
+from .label_smoothing import LabelSmoothingLoss
+from .scaling import (
     ActivationBalancer,
     BasicNorm,
     DoubleSwish,
-    ScaledLinear,
     ScaledEmbedding,
+    ScaledLinear,
 )
-
+from .subsampling import Conv2dSubsampling
 
 # Note: TorchScript requires Dict/List/etc. to be fully typed.
 Supervisions = Dict[str, torch.Tensor]

egs/librispeech/ASR/conformer_mmi/conformer.py

@@ -22,7 +22,8 @@ from typing import Optional, Tuple
 
 import torch
 from torch import Tensor, nn
-from transformer import Supervisions, Transformer, encoder_padding_mask
+
+from .transformer import Supervisions, Transformer, encoder_padding_mask
 
 
 class Conformer(Transformer):

egs/librispeech/ASR/conformer_mmi/decode.py

@@ -26,8 +26,6 @@ import k2
 import sentencepiece as spm
 import torch
 import torch.nn as nn
-from asr_datamodule import LibriSpeechAsrDataModule
-from conformer import Conformer
 
 from icefall.bpe_graph_compiler import BpeCtcTrainingGraphCompiler
 from icefall.checkpoint import average_checkpoints, load_checkpoint
@@ -50,6 +48,9 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .conformer import Conformer
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/librispeech/ASR/conformer_mmi/test_subsampling.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-from subsampling import Conv2dSubsampling
-from subsampling import VggSubsampling
 import torch
 
+from .subsampling import Conv2dSubsampling, VggSubsampling
+
 
 def test_conv2d_subsampling():
     N = 3

egs/librispeech/ASR/conformer_mmi/test_transformer.py

@@ -1,17 +1,17 @@
 #!/usr/bin/env python3
 
 import torch
-from transformer import (
+from torch.nn.utils.rnn import pad_sequence
+
+from .transformer import (
     Transformer,
+    add_eos,
+    add_sos,
+    decoder_padding_mask,
     encoder_padding_mask,
     generate_square_subsequent_mask,
-    decoder_padding_mask,
-    add_sos,
-    add_eos,
 )
 
-from torch.nn.utils.rnn import pad_sequence
-
 
 def test_encoder_padding_mask():
     supervisions = {

egs/librispeech/ASR/conformer_mmi/train-with-attention.py

@@ -28,31 +28,23 @@ import torch
 import torch.distributed as dist
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import LibriSpeechAsrDataModule
-from conformer import Conformer
 from lhotse.utils import fix_random_seed
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
-from icefall.ali import (
-    convert_alignments_to_tensor,
-    load_alignments,
-    lookup_alignments,
-)
+from icefall.ali import convert_alignments_to_tensor, load_alignments, lookup_alignments
 from icefall.checkpoint import load_checkpoint
 from icefall.checkpoint import save_checkpoint as save_checkpoint_impl
 from icefall.dist import cleanup_dist, setup_dist
 from icefall.lexicon import Lexicon
 from icefall.mmi import LFMMILoss
 from icefall.mmi_graph_compiler import MmiTrainingGraphCompiler
-from icefall.utils import (
-    AttributeDict,
-    encode_supervisions,
-    setup_logger,
-    str2bool,
-)
+from icefall.utils import AttributeDict, encode_supervisions, setup_logger, str2bool
+
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .conformer import Conformer
+from .transformer import Noam
 
 
 def get_parser():

egs/librispeech/ASR/conformer_mmi/train.py

@@ -28,31 +28,23 @@ import torch
 import torch.distributed as dist
 import torch.multiprocessing as mp
 import torch.nn as nn
-from asr_datamodule import LibriSpeechAsrDataModule
-from conformer import Conformer
 from lhotse.utils import fix_random_seed
 from torch.nn.parallel import DistributedDataParallel as DDP
 from torch.nn.utils import clip_grad_norm_
 from torch.utils.tensorboard import SummaryWriter
-from transformer import Noam
 
-from icefall.ali import (
-    convert_alignments_to_tensor,
-    load_alignments,
-    lookup_alignments,
-)
+from icefall.ali import convert_alignments_to_tensor, load_alignments, lookup_alignments
 from icefall.checkpoint import load_checkpoint
 from icefall.checkpoint import save_checkpoint as save_checkpoint_impl
 from icefall.dist import cleanup_dist, setup_dist
 from icefall.lexicon import Lexicon
 from icefall.mmi import LFMMILoss
 from icefall.mmi_graph_compiler import MmiTrainingGraphCompiler
-from icefall.utils import (
-    AttributeDict,
-    encode_supervisions,
-    setup_logger,
-    str2bool,
-)
+from icefall.utils import AttributeDict, encode_supervisions, setup_logger, str2bool
+
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .conformer import Conformer
+from .transformer import Noam
 
 
 def get_parser():

egs/librispeech/ASR/conformer_mmi/transformer.py

@@ -20,9 +20,10 @@ from typing import Dict, List, Optional, Tuple
 
 import torch
 import torch.nn as nn
-from subsampling import Conv2dSubsampling, VggSubsampling
 from torch.nn.utils.rnn import pad_sequence
 
+from .subsampling import Conv2dSubsampling, VggSubsampling
+
 # Note: TorchScript requires Dict/List/etc. to be fully typed.
 Supervisions = Dict[str, torch.Tensor]
 

egs/librispeech/ASR/conv_emformer_transducer_stateless/decode.py

@@ -80,15 +80,6 @@ import k2
 import sentencepiece as spm
 import torch
 import torch.nn as nn
-from asr_datamodule import LibriSpeechAsrDataModule
-from beam_search import (
-    beam_search,
-    fast_beam_search_one_best,
-    greedy_search,
-    greedy_search_batch,
-    modified_beam_search,
-)
-from train import add_model_arguments, get_params, get_transducer_model
 
 from icefall.checkpoint import (
     average_checkpoints,
@@ -104,6 +95,16 @@ from icefall.utils import (
     write_error_stats,
 )
 
+from .asr_datamodule import LibriSpeechAsrDataModule
+from .beam_search import (
+    beam_search,
+    fast_beam_search_one_best,
+    greedy_search,
+    greedy_search_batch,
+    modified_beam_search,
+)
+from .train import add_model_arguments, get_params, get_transducer_model
+
 LOG_EPS = math.log(1e-10)
 
 

egs/librispeech/ASR/conv_emformer_transducer_stateless/emformer.py

@@ -23,8 +23,11 @@ from typing import List, Optional, Tuple
 
 import torch
 import torch.nn as nn
-from encoder_interface import EncoderInterface
-from scaling import (
+
+from icefall.utils import make_pad_mask
+
+from .encoder_interface import EncoderInterface
+from .scaling import (
     ActivationBalancer,
     BasicNorm,
     DoubleSwish,
@@ -33,9 +36,6 @@ from scaling import (
     ScaledLinear,
 )
 
-from icefall.utils import make_pad_mask
-
-
 LOG_EPSILON = math.log(1e-10)
 
 

egs/librispeech/ASR/conv_emformer_transducer_stateless/export.py

@@ -64,7 +64,6 @@ from pathlib import Path
 
 import sentencepiece as spm
 import torch
-from train import add_model_arguments, get_params, get_transducer_model
 
 from icefall.checkpoint import (
     average_checkpoints,
@@ -74,6 +73,8 @@ from icefall.checkpoint import (
 )
 from icefall.utils import str2bool
 
+from .train import add_model_arguments, get_params, get_transducer_model
+
 
 def get_parser():
     parser = argparse.ArgumentParser(

egs/librispeech/ASR/conv_emformer_transducer_stateless/stream.py

@@ -20,10 +20,11 @@ from typing import List, Optional, Tuple
 
 import k2
 import torch
-from beam_search import Hypothesis, HypothesisList
 
 from icefall.utils import AttributeDict
 
+from .beam_search import Hypothesis, HypothesisList
+
 
 class Stream(object):
     def __init__(