From 53fccccb24d15d788919d91c8c2b06a115ddacf3 Mon Sep 17 00:00:00 2001
From: 夜雨飘零 <yeyupiaoling@foxmail.com>
Date: 星期二, 19 十二月 2023 15:39:39 +0800
Subject: [PATCH] 修改cnn为合理的包名
---
funasr/models/eres2net/__init__.py | 2 ++
/dev/null | 3 ---
funasr/models/campplus/__init__.py | 1 +
funasr/models/eres2net/fusion.py | 0
funasr/models/eres2net/eres2net_aug.py | 2 +-
funasr/models/campplus/layers.py | 0
funasr/models/campplus/campplus.py | 2 +-
funasr/models/eres2net/eres2net.py | 2 +-
8 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/funasr/models/campplus/__init__.py b/funasr/models/campplus/__init__.py
index e69de29..ff44fed 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 96%
rename from funasr/models/cnn/DTDNN.py
rename to funasr/models/campplus/campplus.py
index 3de0b1e..7a3a12b 100644
--- a/funasr/models/cnn/DTDNN.py
+++ b/funasr/models/campplus/campplus.py
@@ -6,7 +6,7 @@
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 d434c98..0000000
--- 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 0000000..570bbb1
--- /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 54c3901..c2eeb06 100644
--- a/funasr/models/cnn/ResNet.py
+++ b/funasr/models/eres2net/eres2net.py
@@ -16,7 +16,7 @@
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 6b03c67..23e6b8f 100644
--- a/funasr/models/cnn/ResNet_aug.py
+++ b/funasr/models/eres2net/eres2net_aug.py
@@ -16,7 +16,7 @@
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
--
Gitblit v1.9.1