[configs.datasets] Add second-annotator marks for datasets that have them (drive, stare, chase-db1)

bob/ip/binseg/configs/datasets/chasedb1/covd.py

@@ -19,18 +19,20 @@ For details on those datasets, consult:
 from torch.utils.data import ConcatDataset
 from bob.ip.binseg.configs.datasets import augment_subset as _augment
 from bob.ip.binseg.configs.datasets.chasedb1.mtest import dataset as _mtest
-from bob.ip.binseg.configs.datasets.chasedb1.first_annotator import dataset as _baseline
+from bob.ip.binseg.configs.datasets.chasedb1.first_annotator import (
+    dataset as _baseline,
+    second_annotator,
+)
 
 dataset = dict(**_baseline)
-dataset["__train__"] = ConcatDataset([
-    _augment(_mtest["drive"], rotation_before=True),
-    _augment(_mtest["stare"], rotation_before=True),
-    _augment(_mtest["hrf"], rotation_before=False),
-    _augment(_mtest["iostar"], rotation_before=False),
-    ])
-dataset["train"] = ConcatDataset([
-    _mtest["drive"],
-    _mtest["stare"],
-    _mtest["hrf"],
-    _mtest["iostar"],
-    ])
+dataset["__train__"] = ConcatDataset(
+    [
+        _augment(_mtest["drive"], rotation_before=True),
+        _augment(_mtest["stare"], rotation_before=True),
+        _augment(_mtest["hrf"], rotation_before=False),
+        _augment(_mtest["iostar"], rotation_before=False),
+    ]
+)
+dataset["train"] = ConcatDataset(
+    [_mtest["drive"], _mtest["stare"], _mtest["hrf"], _mtest["iostar"],]
+)

bob/ip/binseg/configs/datasets/chasedb1/mtest.py

@@ -7,7 +7,10 @@
 """
 
 from bob.ip.binseg.data.transforms import CenterCrop, Pad, Resize
-from bob.ip.binseg.configs.datasets.chasedb1.xtest import dataset as _xt
+from bob.ip.binseg.configs.datasets.chasedb1.xtest import (
+    dataset as _xt,
+    second_annotator,
+)
 
 dataset = {
     "train": _xt["train"],

bob/ip/binseg/configs/datasets/chasedb1/xtest.py

@@ -8,6 +8,7 @@ from bob.ip.binseg.configs.datasets.drive.default import dataset as _drive
 from bob.ip.binseg.configs.datasets.stare.ah import dataset as _stare
 from bob.ip.binseg.configs.datasets.chasedb1.first_annotator import (
     dataset as _chase,
+    second_annotator,
 )
 from bob.ip.binseg.configs.datasets.hrf.default import dataset as _hrf
 from bob.ip.binseg.configs.datasets.iostar.vessel import dataset as _iostar

bob/ip/binseg/configs/datasets/drive/covd.py

@@ -16,22 +16,23 @@ For details on those datasets, consult:
 * See :py:mod:`bob.ip.binseg.data.hrf`
 """
 
-
 from torch.utils.data import ConcatDataset
 from bob.ip.binseg.configs.datasets import augment_subset as _augment
 from bob.ip.binseg.configs.datasets.drive.mtest import dataset as _mtest
-from bob.ip.binseg.configs.datasets.drive.default import dataset as _baseline
+from bob.ip.binseg.configs.datasets.drive.default import (
+    dataset as _baseline,
+    second_annotator,
+)
 
 dataset = dict(**_baseline)
-dataset["__train__"] = ConcatDataset([
-    _augment(_mtest["stare"], rotation_before=True),
-    _augment(_mtest["chasedb1"], rotation_before=False),
-    _augment(_mtest["hrf"], rotation_before=False),
-    _augment(_mtest["iostar"], rotation_before=False),
-    ])
-dataset["train"] = ConcatDataset([
-    _mtest["stare"],
-    _mtest["chasedb1"],
-    _mtest["hrf"],
-    _mtest["iostar"],
-    ])
+dataset["__train__"] = ConcatDataset(
+    [
+        _augment(_mtest["stare"], rotation_before=True),
+        _augment(_mtest["chasedb1"], rotation_before=False),
+        _augment(_mtest["hrf"], rotation_before=False),
+        _augment(_mtest["iostar"], rotation_before=False),
+    ]
+)
+dataset["train"] = ConcatDataset(
+    [_mtest["stare"], _mtest["chasedb1"], _mtest["hrf"], _mtest["iostar"],]
+)

bob/ip/binseg/configs/datasets/drive/mtest.py

@@ -7,13 +7,16 @@
 """
 
 from bob.ip.binseg.data.transforms import Resize, Pad, Crop
-from bob.ip.binseg.configs.datasets.drive.xtest import dataset as _xt
+from bob.ip.binseg.configs.datasets.drive.xtest import (
+    dataset as _xt,
+    second_annotator,
+)
 
 dataset = {
-        "train": _xt["train"],
-        "test": _xt["test"],
-        "stare": _xt["stare"].copy([Resize(471), Pad((0, 37, 0, 36))]),
-        "chasedb1": _xt["chasedb1"].copy([Resize(544), Crop(0, 12, 544, 544)]),
-        "hrf": _xt["hrf"].copy([Resize((363)), Pad((0, 90, 0, 91))]),
-        "iostar": _xt["iostar"].copy([Resize(544)]),
-        }
+    "train": _xt["train"],
+    "test": _xt["test"],
+    "stare": _xt["stare"].copy([Resize(471), Pad((0, 37, 0, 36))]),
+    "chasedb1": _xt["chasedb1"].copy([Resize(544), Crop(0, 12, 544, 544)]),
+    "hrf": _xt["hrf"].copy([Resize((363)), Pad((0, 90, 0, 91))]),
+    "iostar": _xt["iostar"].copy([Resize(544)]),
+}

bob/ip/binseg/configs/datasets/drive/xtest.py

@@ -4,7 +4,10 @@
 """DRIVE cross-evaluation dataset
 """
 
-from bob.ip.binseg.configs.datasets.drive.default import dataset as _drive
+from bob.ip.binseg.configs.datasets.drive.default import (
+    dataset as _drive,
+    second_annotator,
+)
 from bob.ip.binseg.configs.datasets.stare.ah import dataset as _stare
 from bob.ip.binseg.configs.datasets.chasedb1.first_annotator import (
     dataset as _chase,
@@ -13,10 +16,10 @@ from bob.ip.binseg.configs.datasets.hrf.default import dataset as _hrf
 from bob.ip.binseg.configs.datasets.iostar.vessel import dataset as _iostar
 
 dataset = {
-        "train": _drive["train"],
-        "test": _drive["test"],
-        "stare": _stare["test"],
-        "chasedb1": _chase["test"],
-        "hrf": _hrf["test"],
-        "iostar": _iostar["test"],
-        }
+    "train": _drive["train"],
+    "test": _drive["test"],
+    "stare": _stare["test"],
+    "chasedb1": _chase["test"],
+    "hrf": _hrf["test"],
+    "iostar": _iostar["test"],
+}

bob/ip/binseg/configs/datasets/stare/covd.py

@@ -19,18 +19,20 @@ For details on those datasets, consult:
 from torch.utils.data import ConcatDataset
 from bob.ip.binseg.configs.datasets import augment_subset as _augment
 from bob.ip.binseg.configs.datasets.stare.mtest import dataset as _mtest
-from bob.ip.binseg.configs.datasets.stare.ah import dataset as _baseline
+from bob.ip.binseg.configs.datasets.stare.ah import (
+    dataset as _baseline,
+    second_annotator,
+)
 
 dataset = dict(**_baseline)
-dataset["__train__"] = ConcatDataset([
-    _augment(_mtest["drive"], rotation_before=True),
-    _augment(_mtest["chasedb1"], rotation_before=True),
-    _augment(_mtest["hrf"], rotation_before=False),
-    _augment(_mtest["iostar"], rotation_before=False),
-    ])
-dataset["train"] = ConcatDataset([
-    _mtest["drive"],
-    _mtest["chasedb1"],
-    _mtest["hrf"],
-    _mtest["iostar"],
-    ])
+dataset["__train__"] = ConcatDataset(
+    [
+        _augment(_mtest["drive"], rotation_before=True),
+        _augment(_mtest["chasedb1"], rotation_before=True),
+        _augment(_mtest["hrf"], rotation_before=False),
+        _augment(_mtest["iostar"], rotation_before=False),
+    ]
+)
+dataset["train"] = ConcatDataset(
+    [_mtest["drive"], _mtest["chasedb1"], _mtest["hrf"], _mtest["iostar"],]
+)

bob/ip/binseg/configs/datasets/stare/mtest.py

@@ -7,7 +7,10 @@
 """
 
 from bob.ip.binseg.data.transforms import CenterCrop, Pad, Resize
-from bob.ip.binseg.configs.datasets.stare.xtest import dataset as _xt
+from bob.ip.binseg.configs.datasets.stare.xtest import (
+    dataset as _xt,
+    second_annotator,
+)
 
 dataset = {
     "train": _xt["train"],

bob/ip/binseg/configs/datasets/stare/xtest.py

@@ -5,7 +5,10 @@
 """
 
 from bob.ip.binseg.configs.datasets.drive.default import dataset as _drive
-from bob.ip.binseg.configs.datasets.stare.ah import dataset as _stare
+from bob.ip.binseg.configs.datasets.stare.ah import (
+    dataset as _stare,
+    second_annotator,
+)
 from bob.ip.binseg.configs.datasets.chasedb1.first_annotator import (
     dataset as _chase,
 )
@@ -13,10 +16,10 @@ from bob.ip.binseg.configs.datasets.hrf.default import dataset as _hrf
 from bob.ip.binseg.configs.datasets.iostar.vessel import dataset as _iostar
 
 dataset = {
-        "train": _stare["train"],
-        "test": _stare["test"],
-        "drive": _drive["test"],
-        "chasedb1": _chase["test"],
-        "hrf": _hrf["test"],
-        "iostar": _iostar["test"],
-        }
+    "train": _stare["train"],
+    "test": _stare["test"],
+    "drive": _drive["test"],
+    "chasedb1": _chase["test"],
+    "hrf": _hrf["test"],
+    "iostar": _iostar["test"],
+}