[models] mv all models to models dir

Author: robin1001

wenet/bin/export_onnx_bpu.py

@@ -36,21 +36,21 @@
 
 from __future__ import print_function
 
-import os
-import sys
 import copy
-import math
-import yaml
 import logging
+import math
+import os
+import sys
 from typing import Tuple
 
-import torch
 import numpy as np
+import torch
+import yaml
 
-from wenet.transformer.embedding import NoPositionalEncoding
+from wenet.bin.export_onnx_cpu import (get_args, print_input_output_info,
+                                       to_numpy)
+from wenet.models.transformer.embedding import NoPositionalEncoding
 from wenet.utils.init_model import init_model
-from wenet.bin.export_onnx_cpu import (get_args, to_numpy,
-                                       print_input_output_info)
 
 try:
     import onnx

wenet/bin/export_onnx_gpu.py

@@ -22,9 +22,10 @@
 import torch
 import torch.nn.functional as F
 import yaml
-from wenet.transformer.ctc import CTC
-from wenet.transformer.decoder import TransformerDecoder
-from wenet.transformer.encoder import BaseEncoder
+
+from wenet.models.transformer.ctc import CTC
+from wenet.models.transformer.decoder import TransformerDecoder
+from wenet.models.transformer.encoder import BaseEncoder
 from wenet.utils.init_model import init_model
 from wenet.utils.mask import make_pad_mask
 

wenet/cli/punc_model.py

@@ -3,8 +3,9 @@
 
 import jieba
 import torch
+
 from wenet.cli.hub import Hub
-from wenet.paraformer.search import _isAllAlpha
+from wenet.models.paraformer.search import _isAllAlpha
 from wenet.text.char_tokenizer import CharTokenizer
 
 

wenet/branchformer/__init__.py renamed to wenet/models/branchformer/__init__.py

@@ -15,15 +15,14 @@
 # Modified from ESPnet(https://github.com/espnet/espnet)
 """Encoder definition."""
 
-import torch
-
 from typing import List, Optional, Union
 
-from wenet.branchformer.encoder_layer import BranchformerEncoderLayer
-from wenet.branchformer.cgmlp import ConvolutionalGatingMLP
-from wenet.transformer.encoder import BaseEncoder
-from wenet.utils.class_utils import (
-    WENET_ATTENTION_CLASSES, )
+import torch
+
+from wenet.models.branchformer.cgmlp import ConvolutionalGatingMLP
+from wenet.models.branchformer.encoder_layer import BranchformerEncoderLayer
+from wenet.models.transformer.encoder import BaseEncoder
+from wenet.utils.class_utils import WENET_ATTENTION_CLASSES
 
 
 class BranchformerEncoder(BaseEncoder):

wenet/branchformer/cgmlp.py renamed to wenet/models/branchformer/cgmlp.py

@@ -15,11 +15,12 @@
 # Modified from ESPnet(https://github.com/espnet/espnet)
 """BranchformerEncoderLayer definition."""
 
+from typing import Optional, Tuple
+
 import torch
 import torch.nn as nn
-from typing import Optional, Tuple
 
-from wenet.transformer.attention import T_CACHE
+from wenet.models.transformer.attention import T_CACHE
 
 
 class BranchformerEncoderLayer(torch.nn.Module):

wenet/branchformer/encoder.py renamed to wenet/models/branchformer/encoder.py

@@ -19,10 +19,11 @@
 
 import torch
 import torch.nn.functional as F
-from wenet.transformer.ctc import CTC
-from wenet.transformer.decoder import TransformerDecoder
-from wenet.ctl_model.encoder import TransformerEncoder
-from wenet.transformer.asr_model import ASRModel
+
+from wenet.models.ctl_model.encoder import TransformerEncoder
+from wenet.models.transformer.asr_model import ASRModel
+from wenet.models.transformer.ctc import CTC
+from wenet.models.transformer.decoder import TransformerDecoder
 from wenet.utils.common import IGNORE_ID
 
 

wenet/branchformer/encoder_layer.py renamed to wenet/models/branchformer/encoder_layer.py

@@ -19,8 +19,9 @@
 
 import torch
 
+from wenet.models.transformer.encoder import (ConformerEncoder,
+                                              TransformerEncoder)
 from wenet.utils.mask import make_pad_mask
-from wenet.transformer.encoder import TransformerEncoder, ConformerEncoder
 
 
 class DualTransformerEncoder(TransformerEncoder):