From 53fccccb24d15d788919d91c8c2b06a115ddacf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E9=9B=A8=E9=A3=98=E9=9B=B6?=
 <yeyupiaoling@foxmail.com>
Date: Tue, 19 Dec 2023 15:39:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9cnn=E4=B8=BA=E5=90=88?=
 =?UTF-8?q?=E7=90=86=E7=9A=84=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 funasr/models/campplus/__init__.py                            | 1 +
 funasr/models/{cnn/DTDNN.py => campplus/campplus.py}          | 2 +-
 funasr/models/{cnn => campplus}/layers.py                     | 0
 funasr/models/cnn/__init__.py                                 | 3 ---
 funasr/models/eres2net/__init__.py                            | 2 ++
 funasr/models/{cnn/ResNet.py => eres2net/eres2net.py}         | 2 +-
 funasr/models/{cnn/ResNet_aug.py => eres2net/eres2net_aug.py} | 2 +-
 funasr/models/{cnn => eres2net}/fusion.py                     | 0
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename funasr/models/{cnn/DTDNN.py => campplus/campplus.py} (97%)
 rename funasr/models/{cnn => campplus}/layers.py (100%)
 delete mode 100644 funasr/models/cnn/__init__.py
 create mode 100644 funasr/models/eres2net/__init__.py
 rename funasr/models/{cnn/ResNet.py => eres2net/eres2net.py} (99%)
 rename funasr/models/{cnn/ResNet_aug.py => eres2net/eres2net_aug.py} (99%)
 rename funasr/models/{cnn => eres2net}/fusion.py (100%)

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 3de0b1e45..7a3a12b17 100644
--- a/funasr/models/cnn/DTDNN.py
+++ b/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
 
 
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 54c390152..c2eeb0605 100644
--- a/funasr/models/cnn/ResNet.py
+++ b/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):
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 6b03c67fc..23e6b8f19 100644
--- a/funasr/models/cnn/ResNet_aug.py
+++ b/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):
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