From f3db8d779de9a2ee947bb7b10ffa3ed270c4c17b Mon Sep 17 00:00:00 2001
From: Miao Zheng <76149310+MeowZheng@users.noreply.github.com>
Date: Mon, 5 Dec 2022 22:27:04 +0800
Subject: [PATCH] [Fix]Add input argument for datasets (#2379)
---
mmseg/datasets/ade.py | 12 ++++++++----
mmseg/datasets/chase_db1.py | 12 ++++++++----
mmseg/datasets/coco_stuff.py | 7 +++++--
mmseg/datasets/dark_zurich.py | 9 +++++----
mmseg/datasets/drive.py | 12 ++++++++----
mmseg/datasets/hrf.py | 12 ++++++++----
mmseg/datasets/isaid.py | 12 ++++++++----
mmseg/datasets/isprs.py | 12 ++++++++----
mmseg/datasets/lip.py | 8 ++++++--
mmseg/datasets/loveda.py | 12 ++++++++----
mmseg/datasets/night_driving.py | 9 +++++----
mmseg/datasets/pascal_context.py | 23 ++++++++++++++++-------
mmseg/datasets/potsdam.py | 12 ++++++++----
mmseg/datasets/stare.py | 12 ++++++++----
mmseg/datasets/voc.py | 10 +++++++---
15 files changed, 116 insertions(+), 58 deletions(-)
diff --git a/mmseg/datasets/ade.py b/mmseg/datasets/ade.py
index 1f97fcb2c..e9bdae742 100644
--- a/mmseg/datasets/ade.py
+++ b/mmseg/datasets/ade.py
@@ -80,9 +80,13 @@ class ADE20KDataset(BaseSegDataset):
[184, 255, 0], [0, 133, 255], [255, 214, 0], [25, 194, 194],
[102, 255, 0], [92, 0, 255]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.jpg',
+ seg_map_suffix='.png',
+ reduce_zero_label=True,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.jpg',
- seg_map_suffix='.png',
- reduce_zero_label=True,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
diff --git a/mmseg/datasets/chase_db1.py b/mmseg/datasets/chase_db1.py
index 71139f2aa..5cc1fc567 100644
--- a/mmseg/datasets/chase_db1.py
+++ b/mmseg/datasets/chase_db1.py
@@ -17,10 +17,14 @@ class ChaseDB1Dataset(BaseSegDataset):
classes=('background', 'vessel'),
palette=[[120, 120, 120], [6, 230, 230]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.png',
+ seg_map_suffix='_1stHO.png',
+ reduce_zero_label=False,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.png',
- seg_map_suffix='_1stHO.png',
- reduce_zero_label=False,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
assert self.file_client.exists(self.data_prefix['img_path'])
diff --git a/mmseg/datasets/coco_stuff.py b/mmseg/datasets/coco_stuff.py
index b0891a387..1e1574d97 100644
--- a/mmseg/datasets/coco_stuff.py
+++ b/mmseg/datasets/coco_stuff.py
@@ -91,6 +91,9 @@ class COCOStuffDataset(BaseSegDataset):
[192, 192, 0], [128, 64, 96], [192, 32, 64], [192, 64, 128],
[64, 192, 96], [64, 160, 64], [64, 64, 0]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.jpg',
+ seg_map_suffix='_labelTrainIds.png',
+ **kwargs) -> None:
super().__init__(
- img_suffix='.jpg', seg_map_suffix='_labelTrainIds.png', **kwargs)
+ img_suffix=img_suffix, seg_map_suffix=seg_map_suffix, **kwargs)
diff --git a/mmseg/datasets/dark_zurich.py b/mmseg/datasets/dark_zurich.py
index c59249a02..9b5393fa9 100644
--- a/mmseg/datasets/dark_zurich.py
+++ b/mmseg/datasets/dark_zurich.py
@@ -7,8 +7,9 @@ from .cityscapes import CityscapesDataset
class DarkZurichDataset(CityscapesDataset):
"""DarkZurichDataset dataset."""
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='_rgb_anon.png',
+ seg_map_suffix='_gt_labelTrainIds.png',
+ **kwargs) -> None:
super().__init__(
- img_suffix='_rgb_anon.png',
- seg_map_suffix='_gt_labelTrainIds.png',
- **kwargs)
+ img_suffix=img_suffix, seg_map_suffix=seg_map_suffix, **kwargs)
diff --git a/mmseg/datasets/drive.py b/mmseg/datasets/drive.py
index fbaf729be..c42e18e71 100644
--- a/mmseg/datasets/drive.py
+++ b/mmseg/datasets/drive.py
@@ -17,10 +17,14 @@ class DRIVEDataset(BaseSegDataset):
classes=('background', 'vessel'),
palette=[[120, 120, 120], [6, 230, 230]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.png',
+ seg_map_suffix='_manual1.png',
+ reduce_zero_label=False,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.png',
- seg_map_suffix='_manual1.png',
- reduce_zero_label=False,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
assert self.file_client.exists(self.data_prefix['img_path'])
diff --git a/mmseg/datasets/hrf.py b/mmseg/datasets/hrf.py
index f8d330918..0df6ccc49 100644
--- a/mmseg/datasets/hrf.py
+++ b/mmseg/datasets/hrf.py
@@ -17,10 +17,14 @@ class HRFDataset(BaseSegDataset):
classes=('background', 'vessel'),
palette=[[120, 120, 120], [6, 230, 230]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.png',
+ seg_map_suffix='.png',
+ reduce_zero_label=False,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.png',
- seg_map_suffix='.png',
- reduce_zero_label=False,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
assert self.file_client.exists(self.data_prefix['img_path'])
diff --git a/mmseg/datasets/isaid.py b/mmseg/datasets/isaid.py
index a91a12b3b..d75cfcb7e 100644
--- a/mmseg/datasets/isaid.py
+++ b/mmseg/datasets/isaid.py
@@ -23,10 +23,14 @@ class iSAIDDataset(BaseSegDataset):
[0, 0, 127], [0, 0, 191], [0, 0, 255], [0, 191, 127],
[0, 127, 191], [0, 127, 255], [0, 100, 155]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.png',
+ seg_map_suffix='_instance_color_RGB.png',
+ ignore_index=255,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.png',
- seg_map_suffix='_instance_color_RGB.png',
- ignore_index=255,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ ignore_index=ignore_index,
**kwargs)
assert self.file_client.exists(self.data_prefix['img_path'])
diff --git a/mmseg/datasets/isprs.py b/mmseg/datasets/isprs.py
index 78df4e385..30af53c56 100644
--- a/mmseg/datasets/isprs.py
+++ b/mmseg/datasets/isprs.py
@@ -17,9 +17,13 @@ class ISPRSDataset(BaseSegDataset):
palette=[[255, 255, 255], [0, 0, 255], [0, 255, 255], [0, 255, 0],
[255, 255, 0], [255, 0, 0]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.png',
+ seg_map_suffix='.png',
+ reduce_zero_label=True,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.png',
- seg_map_suffix='.png',
- reduce_zero_label=True,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
diff --git a/mmseg/datasets/lip.py b/mmseg/datasets/lip.py
index 40a703ffd..3a32a193a 100644
--- a/mmseg/datasets/lip.py
+++ b/mmseg/datasets/lip.py
@@ -39,5 +39,9 @@ class LIPDataset(BaseSegDataset):
[255, 170, 0],
))
- def __init__(self, **kwargs) -> None:
- super().__init__(img_suffix='.jpg', seg_map_suffix='.png', **kwargs)
+ def __init__(self,
+ img_suffix='.jpg',
+ seg_map_suffix='.png',
+ **kwargs) -> None:
+ super().__init__(
+ img_suffix=img_suffix, seg_map_suffix=seg_map_suffix, **kwargs)
diff --git a/mmseg/datasets/loveda.py b/mmseg/datasets/loveda.py
index b5d80f25a..5c16db503 100644
--- a/mmseg/datasets/loveda.py
+++ b/mmseg/datasets/loveda.py
@@ -17,9 +17,13 @@ class LoveDADataset(BaseSegDataset):
palette=[[255, 255, 255], [255, 0, 0], [255, 255, 0], [0, 0, 255],
[159, 129, 183], [0, 255, 0], [255, 195, 128]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.png',
+ seg_map_suffix='.png',
+ reduce_zero_label=True,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.png',
- seg_map_suffix='.png',
- reduce_zero_label=True,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
diff --git a/mmseg/datasets/night_driving.py b/mmseg/datasets/night_driving.py
index 5e542194f..3ead91ec7 100644
--- a/mmseg/datasets/night_driving.py
+++ b/mmseg/datasets/night_driving.py
@@ -7,8 +7,9 @@ from .cityscapes import CityscapesDataset
class NightDrivingDataset(CityscapesDataset):
"""NightDrivingDataset dataset."""
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='_leftImg8bit.png',
+ seg_map_suffix='_gtCoarse_labelTrainIds.png',
+ **kwargs) -> None:
super().__init__(
- img_suffix='_leftImg8bit.png',
- seg_map_suffix='_gtCoarse_labelTrainIds.png',
- **kwargs)
+ img_suffix=img_suffix, seg_map_suffix=seg_map_suffix, **kwargs)
diff --git a/mmseg/datasets/pascal_context.py b/mmseg/datasets/pascal_context.py
index a98372352..a6b2fba7b 100644
--- a/mmseg/datasets/pascal_context.py
+++ b/mmseg/datasets/pascal_context.py
@@ -45,10 +45,14 @@ class PascalContextDataset(BaseSegDataset):
[255, 31, 0], [255, 224, 0], [153, 255, 0], [0, 0, 255],
[255, 71, 0], [0, 235, 255], [0, 173, 255], [31, 0, 255]])
- def __init__(self, ann_file: str, **kwargs) -> None:
+ def __init__(self,
+ ann_file: str,
+ img_suffix='.jpg',
+ seg_map_suffix='.png',
+ **kwargs) -> None:
super().__init__(
- img_suffix='.jpg',
- seg_map_suffix='.png',
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
ann_file=ann_file,
reduce_zero_label=False,
**kwargs)
@@ -95,12 +99,17 @@ class PascalContextDataset59(BaseSegDataset):
[255, 31, 0], [255, 224, 0], [153, 255, 0], [0, 0, 255],
[255, 71, 0], [0, 235, 255], [0, 173, 255], [31, 0, 255]])
- def __init__(self, ann_file: str, **kwargs):
+ def __init__(self,
+ ann_file: str,
+ img_suffix='.jpg',
+ seg_map_suffix='.png',
+ reduce_zero_label=True,
+ **kwargs):
super().__init__(
- img_suffix='.jpg',
- seg_map_suffix='.png',
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
ann_file=ann_file,
- reduce_zero_label=True,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
assert self.file_client.exists(
self.data_prefix['img_path']) and osp.isfile(self.ann_file)
diff --git a/mmseg/datasets/potsdam.py b/mmseg/datasets/potsdam.py
index 808cf6ec7..6892de3dd 100644
--- a/mmseg/datasets/potsdam.py
+++ b/mmseg/datasets/potsdam.py
@@ -17,9 +17,13 @@ class PotsdamDataset(BaseSegDataset):
palette=[[255, 255, 255], [0, 0, 255], [0, 255, 255], [0, 255, 0],
[255, 255, 0], [255, 0, 0]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.png',
+ seg_map_suffix='.png',
+ reduce_zero_label=True,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.png',
- seg_map_suffix='.png',
- reduce_zero_label=True,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
diff --git a/mmseg/datasets/stare.py b/mmseg/datasets/stare.py
index 485470277..2bfce2344 100644
--- a/mmseg/datasets/stare.py
+++ b/mmseg/datasets/stare.py
@@ -16,10 +16,14 @@ class STAREDataset(BaseSegDataset):
classes=('background', 'vessel'),
palette=[[120, 120, 120], [6, 230, 230]])
- def __init__(self, **kwargs) -> None:
+ def __init__(self,
+ img_suffix='.png',
+ seg_map_suffix='.ah.png',
+ reduce_zero_label=False,
+ **kwargs) -> None:
super().__init__(
- img_suffix='.png',
- seg_map_suffix='.ah.png',
- reduce_zero_label=False,
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
+ reduce_zero_label=reduce_zero_label,
**kwargs)
assert self.file_client.exists(self.data_prefix['img_path'])
diff --git a/mmseg/datasets/voc.py b/mmseg/datasets/voc.py
index 1defcbf6c..66f223078 100644
--- a/mmseg/datasets/voc.py
+++ b/mmseg/datasets/voc.py
@@ -24,10 +24,14 @@ class PascalVOCDataset(BaseSegDataset):
[0, 64, 0], [128, 64, 0], [0, 192, 0], [128, 192, 0],
[0, 64, 128]])
- def __init__(self, ann_file, **kwargs) -> None:
+ def __init__(self,
+ ann_file,
+ img_suffix='.jpg',
+ seg_map_suffix='.png',
+ **kwargs) -> None:
super().__init__(
- img_suffix='.jpg',
- seg_map_suffix='.png',
+ img_suffix=img_suffix,
+ seg_map_suffix=seg_map_suffix,
ann_file=ann_file,
**kwargs)
assert self.file_client.exists(