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

游雁

2023-12-19 ea4453cc88f60c3f04b0c92cdb8e85b3f07f58ab

 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):