Merge branch 'yeyupiaoling-move-cnn' into dev_gzf_funasr2 add

游雁

2023-12-19 ea4453cc88f60c3f04b0c92cdb8e85b3f07f58ab

Merge branch 'yeyupiaoling-move-cnn' into dev_gzf_funasr2
add

 funasr/models/campplus/__init__.py

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

 funasr/models/campplus/campplus.py

File was renamed from funasr/models/cnn/DTDNN.py
@@ -6,7 +6,8 @@
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



 funasr/models/campplus/layers.py

 funasr/models/cnn/__init__.py

File was deleted

 funasr/models/eres2net/__init__.py

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

 funasr/models/eres2net/eres2net.py

File was renamed from funasr/models/cnn/ResNet.py
@@ -16,7 +16,8 @@
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):

 funasr/models/eres2net/eres2net_aug.py

File was renamed from funasr/models/cnn/ResNet_aug.py
@@ -16,7 +16,8 @@
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):

 funasr/models/eres2net/fusion.py