diff --git a/funasr/models/campplus/__init__.py b/funasr/models/campplus/__init__.py index e69de29bb..ff44fed85 100644 --- a/funasr/models/campplus/__init__.py +++ b/funasr/models/campplus/__init__.py @@ -0,0 +1 @@ +from .campplus import CAMPPlus diff --git a/funasr/models/cnn/DTDNN.py b/funasr/models/campplus/campplus.py similarity index 97% rename from funasr/models/cnn/DTDNN.py rename to funasr/models/campplus/campplus.py index 02fcfdf68..88113ece0 100644 --- a/funasr/models/cnn/DTDNN.py +++ b/funasr/models/campplus/campplus.py @@ -6,7 +6,8 @@ from collections import OrderedDict import torch.nn.functional as F from torch import nn -from funasr.models.cnn.layers import DenseLayer, StatsPool, TDNNLayer, CAMDenseTDNNBlock, TransitLayer, \ + +from funasr.models.campplus.layers import DenseLayer, StatsPool, TDNNLayer, CAMDenseTDNNBlock, TransitLayer, \ BasicResBlock, get_nonlinear diff --git a/funasr/models/cnn/layers.py b/funasr/models/campplus/layers.py similarity index 100% rename from funasr/models/cnn/layers.py rename to funasr/models/campplus/layers.py diff --git a/funasr/models/cnn/__init__.py b/funasr/models/cnn/__init__.py deleted file mode 100644 index d434c988e..000000000 --- a/funasr/models/cnn/__init__.py +++ /dev/null @@ -1,3 +0,0 @@ -from .DTDNN import CAMPPlus -from .ResNet import ERes2Net -from .ResNet_aug import ERes2NetAug diff --git a/funasr/models/eres2net/__init__.py b/funasr/models/eres2net/__init__.py new file mode 100644 index 000000000..570bbb1f1 --- /dev/null +++ b/funasr/models/eres2net/__init__.py @@ -0,0 +1,2 @@ +from .eres2net import ERes2Net +from .eres2net_aug import ERes2NetAug diff --git a/funasr/models/cnn/ResNet.py b/funasr/models/eres2net/eres2net.py similarity index 99% rename from funasr/models/cnn/ResNet.py rename to funasr/models/eres2net/eres2net.py index b846e9eed..3ea9fdfba 100644 --- a/funasr/models/cnn/ResNet.py +++ b/funasr/models/eres2net/eres2net.py @@ -16,7 +16,8 @@ import torch.nn as nn import torch.nn.functional as F import funasr.models.sond.pooling.pooling_layers as pooling_layers -from funasr.models.cnn.fusion import AFF + +from funasr.models.eres2net.fusion import AFF class ReLU(nn.Hardtanh): diff --git a/funasr/models/cnn/ResNet_aug.py b/funasr/models/eres2net/eres2net_aug.py similarity index 99% rename from funasr/models/cnn/ResNet_aug.py rename to funasr/models/eres2net/eres2net_aug.py index 95416ef34..8e4fc211d 100644 --- a/funasr/models/cnn/ResNet_aug.py +++ b/funasr/models/eres2net/eres2net_aug.py @@ -16,7 +16,8 @@ import torch.nn as nn import torch.nn.functional as F import funasr.models.sond.pooling.pooling_layers as pooling_layers -from funasr.models.cnn.fusion import AFF + +from funasr.models.eres2net.fusion import AFF class ReLU(nn.Hardtanh): diff --git a/funasr/models/cnn/fusion.py b/funasr/models/eres2net/fusion.py similarity index 100% rename from funasr/models/cnn/fusion.py rename to funasr/models/eres2net/fusion.py