Mask input support

jbwang1997 · jbwang1997 · commit a1769b9900eb · 2022-01-16T17:01:38.000+08:00
diff --git a/configs/obb/_base_/datasets/dior.py b/configs/obb/_base_/datasets/dior.py
@@ -5,7 +5,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='Resize', img_scale=(800, 800), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
     dict(type='Normalize', **img_norm_cfg),
diff --git a/configs/obb/_base_/datasets/dota.py b/configs/obb/_base_/datasets/dota.py
@@ -5,7 +5,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/_base_/datasets/hrsc.py b/configs/obb/_base_/datasets/hrsc.py
@@ -1,11 +1,11 @@
 dataset_type = 'HRSCDataset'
-data_root = 'data/hrsc/'
+data_root = 'data/HRSC2016/'
 img_norm_cfg = dict(
     mean=[123.675, 116.28, 103.53], std=[58.395, 57.12, 57.375], to_rgb=True)
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='Resize', img_scale=(1333, 800), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
     dict(type='Normalize', **img_norm_cfg),
diff --git a/configs/obb/_base_/datasets/msra_td500.py b/configs/obb/_base_/datasets/msra_td500.py
@@ -5,7 +5,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='Resize', img_scale=(1333, 800), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
     dict(type='Normalize', **img_norm_cfg),
diff --git a/configs/obb/_base_/datasets/rctw17.py b/configs/obb/_base_/datasets/rctw17.py
@@ -5,7 +5,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='Resize', img_scale=(1333, 800), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
     dict(type='Normalize', **img_norm_cfg),
diff --git a/configs/obb/fcos_obb/fcos_obb_r50_caffe_fpn_gn-head_4x4_1x_dota10.py b/configs/obb/fcos_obb/fcos_obb_r50_caffe_fpn_gn-head_4x4_1x_dota10.py
@@ -64,7 +64,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/gliding_vertex/gliding_vertex_r50_fpn_1x_dota10.py b/configs/obb/gliding_vertex/gliding_vertex_r50_fpn_1x_dota10.py
@@ -130,7 +130,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/gliding_vertex/gliding_vertex_r50_fpn_3x_hrsc.py b/configs/obb/gliding_vertex/gliding_vertex_r50_fpn_3x_hrsc.py
@@ -133,7 +133,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='Resize', img_scale=(1333, 800), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
     dict(type='Normalize', **img_norm_cfg),
diff --git a/configs/obb/oriented_rcnn/faster_rcnn_orpn_r50_fpn_1x_ms_rr_dota10.py b/configs/obb/oriented_rcnn/faster_rcnn_orpn_r50_fpn_1x_ms_rr_dota10.py
@@ -8,7 +8,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/oriented_rcnn/faster_rcnn_orpn_r50_fpn_3x_hrsc.py b/configs/obb/oriented_rcnn/faster_rcnn_orpn_r50_fpn_3x_hrsc.py
@@ -4,6 +4,8 @@
     '../../_base_/default_runtime.py'
 ]
 
+random_fp=True
+
 
 model = dict(
     type='OrientedRCNN',
diff --git a/configs/obb/oriented_rcnn/orpn_r50_fpn_1x_dota10.py b/configs/obb/oriented_rcnn/orpn_r50_fpn_1x_dota10.py
@@ -81,7 +81,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=False, with_poly_as_mask=True),
+         with_label=False, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/random_fp/datasets/01fp_dota10.py b/configs/obb/random_fp/datasets/01fp_dota10.py
@@ -1,13 +1,13 @@
 # Patches with no object are added
 
 dataset_type = 'DOTADataset'
-data_root = 'data/split_ss_dota1_0/'
+data_root = '/data3/wjb/dataset/split_ss_dota1_0/'
 img_norm_cfg = dict(
     mean=[123.675, 116.28, 103.53], std=[58.395, 57.12, 57.375], to_rgb=True)
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/random_fp/datasets/03fp_dota10.py b/configs/obb/random_fp/datasets/03fp_dota10.py
@@ -1,13 +1,13 @@
 # Patches with no object are added
 
 dataset_type = 'DOTADataset'
-data_root = 'data/split_ss_dota1_0/'
+data_root = '/data3/wjb/dataset/split_ss_dota1_0/'
 img_norm_cfg = dict(
     mean=[123.675, 116.28, 103.53], std=[58.395, 57.12, 57.375], to_rgb=True)
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/random_fp/datasets/05fp_dota10.py b/configs/obb/random_fp/datasets/05fp_dota10.py
@@ -1,13 +1,13 @@
 # Patches with no object are added
 
 dataset_type = 'DOTADataset'
-data_root = 'data/split_ss_dota1_0/'
+data_root = '/data3/wjb/dataset/split_ss_dota1_0/'
 img_norm_cfg = dict(
     mean=[123.675, 116.28, 103.53], std=[58.395, 57.12, 57.375], to_rgb=True)
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/random_fp/fcos_obb_r50_caffe_fpn_gn-head_4x4_1x_01fp_dota10.py b/configs/obb/random_fp/fcos_obb_r50_caffe_fpn_gn-head_4x4_1x_01fp_dota10.py
@@ -64,7 +64,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/random_fp/fcos_obb_r50_caffe_fpn_gn-head_4x4_1x_03fp_dota10.py b/configs/obb/random_fp/fcos_obb_r50_caffe_fpn_gn-head_4x4_1x_03fp_dota10.py
@@ -64,7 +64,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/configs/obb/random_fp/fcos_obb_r50_caffe_fpn_gn-head_4x4_1x_05fp_dota10.py b/configs/obb/random_fp/fcos_obb_r50_caffe_fpn_gn-head_4x4_1x_05fp_dota10.py
@@ -64,7 +64,7 @@
 train_pipeline = [
     dict(type='LoadImageFromFile'),
     dict(type='LoadOBBAnnotations', with_bbox=True,
-         with_label=True, with_poly_as_mask=True),
+         with_label=True, obb_as_mask=True),
     dict(type='LoadDOTASpecialInfo'),
     dict(type='Resize', img_scale=(1024, 1024), keep_ratio=True),
     dict(type='OBBRandomFlip', h_flip_ratio=0.5, v_flip_ratio=0.5),
diff --git a/mmdet/datasets/__init__.py b/mmdet/datasets/__init__.py
@@ -16,6 +16,7 @@
 from .obb.hrsc import HRSCDataset
 from .obb.msra_td500 import MSRATD500Dataset
 from .obb.rctw17 import RCTW17Dataset
+from .obb.isaid import ISAIDDataset
 
 __all__ = [
     'CustomDataset', 'XMLDataset', 'CocoDataset', 'DeepFashionDataset',
diff --git a/mmdet/datasets/obb/isaid.py b/mmdet/datasets/obb/isaid.py
@@ -0,0 +1,11 @@
+from ..builder import DATASETS
+from ..coco import CocoDataset
+
+
+@DATASETS.register_module()
+class ISAIDDataset(CocoDataset):
+
+    CLASSES = ('ship', 'storage_tank', 'baseball_diamond', 'tennis_court',
+               'basketball_court', 'Ground_Track_Field', 'Bridge',
+               'Large_Vehicle', 'Small_Vehicle', 'Helicopter', 'Swimming_pool',
+               'Roundabout', 'Soccer_ball_field', 'plane', 'Harbor')
diff --git a/mmdet/datasets/pipelines/__init__.py b/mmdet/datasets/pipelines/__init__.py
@@ -10,7 +10,6 @@
                          PhotoMetricDistortion, RandomCenterCropPad,
                          RandomCrop, RandomFlip, Resize, SegRescale)
 
-from .obb.base import mask2obb, mask2poly, poly2mask
 from .obb.base import (LoadOBBAnnotations, Mask2OBB, OBBDefaultFormatBundle,
                        OBBRandomFlip, RandomOBBRotate, MultiScaleFlipRotateAug,
                        FliterEmpty)
diff --git a/mmdet/datasets/pipelines/obb/base.py b/mmdet/datasets/pipelines/obb/base.py
diff --git a/mmdet/datasets/pipelines/obb/dota.py b/mmdet/datasets/pipelines/obb/dota.py
diff --git a/mmdet/datasets/pipelines/obb/misc.py b/mmdet/datasets/pipelines/obb/misc.py

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,8 @@`
`4`	`4`	`'../../_base_/default_runtime.py'`
`5`	`5`	`]`
`6`	`6`
	`7`	`+random_fp=True`
	`8`	`+`
`7`	`9`
`8`	`10`	`model = dict(`
`9`	`11`	`type='OrientedRCNN',`