[Refactory] Refactory BaseSegmentor based BaseModel

SheffieldCao · Jun 19, 2022 · b23982d · b23982d
1 parent 46723a9
commit b23982d
Show file tree

Hide file tree

Showing 345 changed files with 1,655 additions and 1,806 deletions.
diff --git a/configs/_base_/datasets/ade20k.py b/configs/_base_/datasets/ade20k.py
@@ -44,5 +44,5 @@
         pipeline=test_pipeline))
 test_dataloader = val_dataloader
 
-val_evaluator = dict(type='IoUMetric', metrics=['mIoU'])
+val_evaluator = dict(type='IoUMetric', iou_metrics=['mIoU'])
 test_evaluator = val_evaluator
diff --git a/configs/_base_/models/ann_r50-d8.py b/configs/_base_/models/ann_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/apcnet_r50-d8.py b/configs/_base_/models/apcnet_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/bisenetv1_r18-d32.py b/configs/_base_/models/bisenetv1_r18-d32.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     backbone=dict(
         type='BiSeNetV1',
         in_channels=3,

diff --git a/configs/_base_/models/bisenetv2.py b/configs/_base_/models/bisenetv2.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained=None,
     backbone=dict(
         type='BiSeNetV2',

diff --git a/configs/_base_/models/ccnet_r50-d8.py b/configs/_base_/models/ccnet_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/cgnet.py b/configs/_base_/models/cgnet.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', eps=1e-03, requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[72.39239876, 82.90891754, 73.15835921],
     std=[1, 1, 1],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     backbone=dict(
         type='CGNet',
         norm_cfg=norm_cfg,

diff --git a/configs/_base_/models/danet_r50-d8.py b/configs/_base_/models/danet_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/deeplabv3_r50-d8.py b/configs/_base_/models/deeplabv3_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/deeplabv3_unet_s5-d16.py b/configs/_base_/models/deeplabv3_unet_s5-d16.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained=None,
     backbone=dict(
         type='UNet',

diff --git a/configs/_base_/models/deeplabv3plus_r50-d8.py b/configs/_base_/models/deeplabv3plus_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/dmnet_r50-d8.py b/configs/_base_/models/dmnet_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/dnl_r50-d8.py b/configs/_base_/models/dnl_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/dpt_vit-b16.py b/configs/_base_/models/dpt_vit-b16.py
@@ -1,13 +1,14 @@
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='pretrain/vit-b16_p16_224-80ecf9dd.pth', # noqa
     backbone=dict(
         type='VisionTransformer',

diff --git a/configs/_base_/models/emanet_r50-d8.py b/configs/_base_/models/emanet_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/encnet_r50-d8.py b/configs/_base_/models/encnet_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/erfnet_fcn.py b/configs/_base_/models/erfnet_fcn.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained=None,
     backbone=dict(
         type='ERFNet',

diff --git a/configs/_base_/models/fast_scnn.py b/configs/_base_/models/fast_scnn.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True, momentum=0.01)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     backbone=dict(
         type='FastSCNN',
         downsample_dw_channels=(32, 48),

diff --git a/configs/_base_/models/fastfcn_r50-d32_jpu_psp.py b/configs/_base_/models/fastfcn_r50-d32_jpu_psp.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',

diff --git a/configs/_base_/models/fcn_hr18.py b/configs/_base_/models/fcn_hr18.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://msra/hrnetv2_w18',
     backbone=dict(
         type='HRNet',

diff --git a/configs/_base_/models/fcn_r50-d8.py b/configs/_base_/models/fcn_r50-d8.py
@@ -1,14 +1,15 @@
 # model settings
 norm_cfg = dict(type='SyncBN', requires_grad=True)
-preprocess_cfg = dict(
+data_preprocessor = dict(
+    type='SegDataPreProcessor',
     mean=[123.675, 116.28, 103.53],
     std=[58.395, 57.12, 57.375],
-    to_rgb=True,
+    bgr_to_rgb=True,
     pad_val=0,
     seg_pad_val=255)
 model = dict(
     type='EncoderDecoder',
-    preprocess_cfg=preprocess_cfg,
+    data_preprocessor=data_preprocessor,
     pretrained='open-mmlab://resnet50_v1c',
     backbone=dict(
         type='ResNetV1c',