Skip to content

Commit

Permalink
[Fix]Add input argument for datasets (#2379)
Browse files Browse the repository at this point in the history
  • Loading branch information
MeowZheng committed Dec 5, 2022
1 parent 163277b commit f3db8d7
Show file tree
Hide file tree
Showing 15 changed files with 116 additions and 58 deletions.
12 changes: 8 additions & 4 deletions mmseg/datasets/ade.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 8 additions & 4 deletions mmseg/datasets/chase_db1.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
7 changes: 5 additions & 2 deletions mmseg/datasets/coco_stuff.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
9 changes: 5 additions & 4 deletions mmseg/datasets/dark_zurich.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
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)
12 changes: 8 additions & 4 deletions mmseg/datasets/drive.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
12 changes: 8 additions & 4 deletions mmseg/datasets/hrf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
12 changes: 8 additions & 4 deletions mmseg/datasets/isaid.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
12 changes: 8 additions & 4 deletions mmseg/datasets/isprs.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 6 additions & 2 deletions mmseg/datasets/lip.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 8 additions & 4 deletions mmseg/datasets/loveda.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
9 changes: 5 additions & 4 deletions mmseg/datasets/night_driving.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@
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)
23 changes: 16 additions & 7 deletions mmseg/datasets/pascal_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
12 changes: 8 additions & 4 deletions mmseg/datasets/potsdam.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
12 changes: 8 additions & 4 deletions mmseg/datasets/stare.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
10 changes: 7 additions & 3 deletions mmseg/datasets/voc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit f3db8d7

Please sign in to comment.