修改cnn为合理的包名

funasr/models/campplus/__init__.py

@@ -0,0 +1 @@
+from .campplus import CAMPPlus

funasr/models/cnn/DTDNN.py → funasr/models/campplus/campplus.py

@@ -6,7 +6,7 @@ from collections import OrderedDict
 import torch.nn.functional as F
 from torch import nn
 
-from funasr.modules.cnn.layers import DenseLayer, StatsPool, TDNNLayer, CAMDenseTDNNBlock, TransitLayer, \
+from funasr.models.campplus.layers import DenseLayer, StatsPool, TDNNLayer, CAMDenseTDNNBlock, TransitLayer, \
     BasicResBlock, get_nonlinear
 
 

funasr/models/cnn/__init__.py

@@ -1,3 +0,0 @@
-from .DTDNN import CAMPPlus
-from .ResNet import ERes2Net
-from .ResNet_aug import ERes2NetAug

funasr/models/eres2net/__init__.py

@@ -0,0 +1,2 @@
+from .eres2net import ERes2Net
+from .eres2net_aug import ERes2NetAug

funasr/models/cnn/ResNet.py → funasr/models/eres2net/eres2net.py

@@ -16,7 +16,7 @@ import torch.nn as nn
 import torch.nn.functional as F
 
 import funasr.models.sond.pooling.pooling_layers as pooling_layers
-from funasr.modules.cnn.fusion import AFF
+from funasr.models.eres2net.fusion import AFF
 
 
 class ReLU(nn.Hardtanh):

funasr/models/cnn/ResNet_aug.py → funasr/models/eres2net/eres2net_aug.py

@@ -16,7 +16,7 @@ import torch.nn as nn
 import torch.nn.functional as F
 
 import funasr.models.sond.pooling.pooling_layers as pooling_layers
-from funasr.modules.cnn.fusion import AFF
+from funasr.models.eres2net.fusion import AFF
 
 
 class ReLU(nn.Hardtanh):