Major module renaming (for consistency); DRY when possible

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

@@ -24,18 +24,15 @@ bright strip running down the centre known as the central vessel reflex.
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         Crop(0, 18, 960, 960),  #(upper, left, height, width)
         RandomHFlip(),
         RandomVFlip(),
         RandomRotation(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-from bob.ip.binseg.data.utils import DelayedSample2TorchDataset
+from bob.ip.binseg.data.utils import SampleList2TorchDataset
 from bob.ip.binseg.data.chasedb1 import dataset as chasedb1
-dataset = DelayedSample2TorchDataset(chasedb1.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(chasedb1.subsets("default")["train"],
+        transforms=_transforms)

bob/ip/binseg/configs/datasets/chasedb11024.py

 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         RandomRotation(),
         Crop(0, 18, 960, 960),
         Resize(1024),
         RandomHFlip(),
         RandomVFlip(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-from bob.ip.binseg.data.utils import DelayedSample2TorchDataset
+from bob.ip.binseg.data.utils import SampleList2TorchDataset
 from bob.ip.binseg.data.chasedb1 import dataset as chasedb1
-dataset = DelayedSample2TorchDataset(chasedb1.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(chasedb1.subsets("default")["train"],
+        transforms=_transforms)

bob/ip/binseg/configs/datasets/chasedb11168.py

 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         RandomRotation(),
         Crop(140, 18, 680, 960),
         Resize(1168),
         RandomHFlip(),
         RandomVFlip(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-from bob.ip.binseg.data.utils import DelayedSample2TorchDataset
+from bob.ip.binseg.data.utils import SampleList2TorchDataset
 from bob.ip.binseg.data.chasedb1 import dataset as chasedb1
-dataset = DelayedSample2TorchDataset(chasedb1.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(chasedb1.subsets("default")["train"],
+        transforms=_transforms)

bob/ip/binseg/configs/datasets/chasedb1544.py

 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         Resize(544),
         Crop(0, 12, 544, 544),
         RandomHFlip(),
         RandomVFlip(),
         RandomRotation(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-from bob.ip.binseg.data.utils import DelayedSample2TorchDataset
+from bob.ip.binseg.data.utils import SampleList2TorchDataset
 from bob.ip.binseg.data.chasedb1 import dataset as chasedb1
-dataset = DelayedSample2TorchDataset(chasedb1.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(chasedb1.subsets("default")["train"],
+        transforms=_transforms)

bob/ip/binseg/configs/datasets/chasedb1608.py

 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         RandomRotation(),
         CenterCrop((829, 960)),
         Resize(608),
         RandomHFlip(),
         RandomVFlip(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-from bob.ip.binseg.data.utils import DelayedSample2TorchDataset
+from bob.ip.binseg.data.utils import SampleList2TorchDataset
 from bob.ip.binseg.data.chasedb1 import dataset as chasedb1
-dataset = DelayedSample2TorchDataset(chasedb1.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(chasedb1.subsets("default")["train"],
+        transforms=_transforms)

bob/ip/binseg/configs/datasets/chasedb1test.py → bob/ip/binseg/configs/datasets/chasedb1_test.py

@@ -23,15 +23,10 @@ bright strip running down the centre known as the central vessel reflex.
 * Split reference: [CHASEDB1-2012]_
 """
 
-from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
-        Crop(0, 18, 960, 960),  #(upper, left, height, width)
-        ToTensor(),
-    ]
-)
+from bob.ip.binseg.data.transforms import Crop
+_transforms = [Crop(0, 18, 960, 960)]  #(upper, left, height, width)
 
-from bob.ip.binseg.data.utils import DelayedSample2TorchDataset
+from bob.ip.binseg.data.utils import SampleList2TorchDataset
 from bob.ip.binseg.data.chasedb1 import dataset as chasedb1
-dataset = DelayedSample2TorchDataset(chasedb1.subsets("default")["test"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(chasedb1.subsets("default")["test"],
+        transforms=_transforms)

bob/ip/binseg/configs/datasets/drivestareiostarhrf960sslchase.py → bob/ip/binseg/configs/datasets/covd_chasedb1_ssl.py

@@ -9,7 +9,7 @@ The dataset available in this file is composed of STARE, CHASE-DB1, IOSTAR
 vessel and HRF (with annotated samples) and CHASE-DB1 without labels.
 """
 
-from bob.ip.binseg.configs.datasets.drivestareiostarhrf960 import dataset as _labelled
+from bob.ip.binseg.configs.datasets.covd_chasedb1 import dataset as _labelled
 from bob.ip.binseg.configs.datasets.chasedb1 import dataset as _unlabelled
 from bob.ip.binseg.data.utils import SSLDataset
 dataset = SSLDataset(_labelled, _unlabelled)

bob/ip/binseg/configs/datasets/starechasedb1iostarhrf544ssldrive.py → bob/ip/binseg/configs/datasets/covd_drive_ssl.py

@@ -9,7 +9,7 @@ The dataset available in this file is composed of STARE, CHASE-DB1, IOSTAR
 vessel and HRF (with annotated samples) and DRIVE without labels.
 """
 
-from bob.ip.binseg.configs.datasets.starechasedb1iostarhrf544 import dataset as _labelled
+from bob.ip.binseg.configs.datasets.covd_drive import dataset as _labelled
 from bob.ip.binseg.configs.datasets.drive import dataset as _unlabelled
 from bob.ip.binseg.data.utils import SSLDataset
 dataset = SSLDataset(_labelled, _unlabelled)

bob/ip/binseg/configs/datasets/drivestarechasedb1iostar1168sslhrf.py → bob/ip/binseg/configs/datasets/covd_hrf_ssl.py

@@ -9,7 +9,7 @@ The dataset available in this file is composed of STARE, CHASE-DB1, IOSTAR
 vessel and CHASE-DB1 (with annotated samples) and HRF without labels.
 """
 
-from bob.ip.binseg.configs.datasets.drivestarechasedb1iostar1168 import dataset as _labelled
-from bob.ip.binseg.configs.datasets.hrf1168 import dataset as _unlabelled
+from bob.ip.binseg.configs.datasets.covd_hrf import dataset as _labelled
+from bob.ip.binseg.configs.datasets.hrf_1168 import dataset as _unlabelled
 from bob.ip.binseg.data.utils import SSLDataset
 dataset = SSLDataset(_labelled, _unlabelled)

bob/ip/binseg/configs/datasets/drivestarechasedb1hrf1024ssliostar.py → bob/ip/binseg/configs/datasets/covd_iostar_vessel_ssl.py

@@ -9,7 +9,7 @@ The dataset available in this file is composed of DRIVE, STARE, CHASE-DB1, and
 HRF (with annotated samples) and IOSTAR without labels.
 """
 
-from bob.ip.binseg.configs.datasets.drivestarechasedb1hrf1024 import dataset as _labelled
-from bob.ip.binseg.configs.datasets.iostarvessel import dataset as _unlabelled
+from bob.ip.binseg.configs.datasets.covd_iostar_vessel import dataset as _labelled
+from bob.ip.binseg.configs.datasets.iostar_vessel import dataset as _unlabelled
 from bob.ip.binseg.data.utils import SSLDataset
 dataset = SSLDataset(_labelled, _unlabelled)

bob/ip/binseg/configs/datasets/drivechasedb1iostarhrf608sslstare.py → bob/ip/binseg/configs/datasets/covd_stare_ssl.py

@@ -9,7 +9,7 @@ The dataset available in this file is composed of DRIVE, CHASE-DB1, IOSTAR
 vessel and HRF (with annotated samples) and STARE without labels.
 """
 
-from bob.ip.binseg.configs.datasets.drivechasedb1iostarhrf608 import dataset as _labelled
+from bob.ip.binseg.configs.datasets.covd_stare import dataset as _labelled
 from bob.ip.binseg.configs.datasets.stare import dataset as _unlabelled
 from bob.ip.binseg.data.utils import SSLDataset
 dataset = SSLDataset(_labelled, _unlabelled)

bob/ip/binseg/configs/datasets/csv.py

@@ -66,20 +66,15 @@ See:
 
 """
 
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.csvdataset import CSVDataset
-
 # add your transforms below - these are just examples
-# keep the ``ToTensor()`` transform at the end
-transforms = Compose(
-    [
+from bob.ip.binseg.data.transforms import *
+_transforms = [
         #CenterCrop((544, 544)),
         #RandomHFlip(),
         #RandomVFlip(),
         #RandomRotation(),
         #ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-#dataset = CSVDataset("<path.csv>", check_available=False, transform=transforms)
+from bob.ip.binseg.data.csvdataset import CSVDataset
+#dataset = CSVDataset("<path.csv>", check_available=False, transforms=_transforms)

bob/ip/binseg/configs/datasets/drionsdb.py

@@ -25,19 +25,16 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
 
 #### Config ####
 
-transforms = Compose(
-    [
+_transforms = [
         Pad((4, 8, 4, 8)),  #(left, top, right, bottom)
         RandomHFlip(),
         RandomVFlip(),
         RandomRotation(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
 # bob.db.dataset init
 bobdb = DRIONS(protocol="default")
 
 # PyTorch dataset
-dataset = BinSegDataset(bobdb, split="train", transform=transforms)
+dataset = BinSegDataset(bobdb, split="train", transforms=_transforms)

bob/ip/binseg/configs/datasets/drionsdbtest.py → bob/ip/binseg/configs/datasets/drionsdb_test.py

@@ -24,10 +24,10 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
 
 #### Config ####
 
-transforms = Compose([Pad((4, 8, 4, 8)), ToTensor()])
+_transforms = [Pad((4, 8, 4, 8))]
 
 # bob.db.dataset init
 bobdb = DRIONS(protocol="default")
 
 # PyTorch dataset
-dataset = BinSegDataset(bobdb, split="test", transform=transforms)
+dataset = BinSegDataset(bobdb, split="test", transforms=_transforms)

bob/ip/binseg/configs/datasets/dristhigs1cup.py → bob/ip/binseg/configs/datasets/dristhigs1_cup.py

@@ -27,19 +27,16 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
 
 #### Config ####
 
-transforms = Compose(
-    [
+_transforms = [
         CenterCrop((1760, 2048)),
         RandomHFlip(),
         RandomVFlip(),
         RandomRotation(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
 # bob.db.dataset init
 bobdb = DRISHTI(protocol="default_cup")
 
 # PyTorch dataset
-dataset = BinSegDataset(bobdb, split="train", transform=transforms)
+dataset = BinSegDataset(bobdb, split="train", transforms=_transforms)