From b077e3c5598b96c9f919676cab399c4d216c41aa Mon Sep 17 00:00:00 2001 From: LDOUBLEV Date: Wed, 27 Apr 2022 19:57:48 +0800 Subject: [PATCH] rename --- configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_cml.yml | 6 +++--- configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_student.yml | 2 +- ppocr/modeling/necks/__init__.py | 2 +- ppocr/modeling/necks/db_fpn.py | 12 ++++++------ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_cml.yml b/configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_cml.yml index 6c60e12f..3e77577c 100644 --- a/configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_cml.yml +++ b/configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_cml.yml @@ -33,7 +33,7 @@ Architecture: model_name: large disable_se: true Neck: - name: CAFPN + name: RSEFPN out_channels: 96 shortcut: True Head: @@ -49,7 +49,7 @@ Architecture: model_name: large disable_se: true Neck: - name: CAFPN + name: RSEFPN out_channels: 96 shortcut: True Head: @@ -65,7 +65,7 @@ Architecture: in_channels: 3 layers: 50 Neck: - name: FEPAN + name: LKPAN out_channels: 256 Head: name: DBHead diff --git a/configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_student.yml b/configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_student.yml index 0e04cd9b..0e8af776 100644 --- a/configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_student.yml +++ b/configs/det/ch_PP-OCRv3/ch_PP-OCRv3_det_student.yml @@ -28,7 +28,7 @@ Architecture: model_name: large disable_se: True Neck: - name: CAFPN + name: RSEFPN out_channels: 96 shortcut: True Head: diff --git a/ppocr/modeling/necks/__init__.py b/ppocr/modeling/necks/__init__.py index 9a4218d1..6ee683e6 100644 --- a/ppocr/modeling/necks/__init__.py +++ b/ppocr/modeling/necks/__init__.py @@ -26,7 +26,7 @@ def build_neck(config): from .fce_fpn import FCEFPN from .pren_fpn import PRENFPN support_dict = [ - 'FPN', 'FCEFPN', 'FEPAN', 'DBFPN', 'CAFPN', 'EASTFPN', 'SASTFPN', + 'FPN', 'FCEFPN', 'LKPAN', 'DBFPN', 'RSEFPN', 'EASTFPN', 'SASTFPN', 'SequenceEncoder', 'PGFPN', 'TableFPN', 'PRENFPN' ] diff --git a/ppocr/modeling/necks/db_fpn.py b/ppocr/modeling/necks/db_fpn.py index 1c81be4a..c6cad70f 100644 --- a/ppocr/modeling/necks/db_fpn.py +++ b/ppocr/modeling/necks/db_fpn.py @@ -190,9 +190,9 @@ class DBFPN(nn.Layer): return fuse -class CALayer(nn.Layer): +class RSELayer(nn.Layer): def __init__(self, in_channels, out_channels, kernel_size, shortcut=True): - super(CALayer, self).__init__() + super(RSELayer, self).__init__() weight_attr = paddle.nn.initializer.KaimingUniform() self.out_channels = out_channels self.in_conv = nn.Conv2D( @@ -214,9 +214,9 @@ class CALayer(nn.Layer): return out -class CAFPN(nn.Layer): +class RSEFPN(nn.Layer): def __init__(self, in_channels, out_channels, shortcut=True, **kwargs): - super(CAFPN, self).__init__() + super(RSEFPN, self).__init__() self.out_channels = out_channels self.ins_conv = nn.LayerList() self.inp_conv = nn.LayerList() @@ -263,9 +263,9 @@ class CAFPN(nn.Layer): return fuse -class FEPAN(nn.Layer): +class LKPAN(nn.Layer): def __init__(self, in_channels, out_channels, mode='large', **kwargs): - super(FEPAN, self).__init__() + super(LKPAN, self).__init__() self.out_channels = out_channels weight_attr = paddle.nn.initializer.KaimingUniform() -- GitLab