Major module renaming (for consistency); DRY when possible

bob/ip/binseg/configs/datasets/iostarodtest.py → bob/ip/binseg/configs/datasets/iostar_od_test.py

@@ -15,10 +15,6 @@ dataset includes annotations for the optic disc and the artery/vein ratio.
 * Split reference: [MEYER-2017]_
 """
 
-from bob.ip.binseg.data.transforms import *
-_transforms = Compose([ToTensor()])
-
-from bob.ip.binseg.data.utils import DelayedSample2TorchDataset
+from bob.ip.binseg.data.utils import SampleList2TorchDataset
 from bob.ip.binseg.data.iostar import dataset as iostar
-dataset = DelayedSample2TorchDataset(iostar.subsets("optic-disc")["test"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(iostar.subsets("optic-disc")["test"])

bob/ip/binseg/configs/datasets/iostarvessel.py → bob/ip/binseg/configs/datasets/iostar_vessel.py

@@ -16,17 +16,14 @@ dataset includes annotations for the optic disc and the artery/vein ratio.
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         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.iostar import dataset as iostar
-dataset = DelayedSample2TorchDataset(iostar.subsets("vessel")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(iostar.subsets("vessel")["train"],
+        transforms=_transforms)

bob/ip/binseg/configs/datasets/iostarvesseltest.py → bob/ip/binseg/configs/datasets/iostar_vessel_test.py

@@ -15,10 +15,6 @@ dataset includes annotations for the optic disc and the artery/vein ratio.
 * Split reference: [MEYER-2017]_
 """
 
-from bob.ip.binseg.data.transforms import *
-_transforms = Compose([ToTensor()])
-
-from bob.ip.binseg.data.utils import DelayedSample2TorchDataset
+from bob.ip.binseg.data.utils import SampleList2TorchDataset
 from bob.ip.binseg.data.iostar import dataset as iostar
-dataset = DelayedSample2TorchDataset(iostar.subsets("vessel")["test"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(iostar.subsets("vessel")["test"])

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

@@ -16,8 +16,7 @@ dataset includes annotations for the optic disc and the artery/vein ratio.
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         RandomRotation(),
         Crop(144, 0, 768, 1024),
         Pad((30, 0, 30, 0)),
@@ -25,11 +24,9 @@ _transforms = Compose(
         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.iostar import dataset as iostar
-dataset = DelayedSample2TorchDataset(iostar.subsets("vessel")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(iostar.subsets("vessel")["train"],
+        transforms=_transforms)

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

@@ -16,18 +16,15 @@ dataset includes annotations for the optic disc and the artery/vein ratio.
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         Resize(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.iostar import dataset as iostar
-dataset = DelayedSample2TorchDataset(iostar.subsets("vessel")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(iostar.subsets("vessel")["train"],
+        transforms=_transforms)

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

@@ -16,19 +16,16 @@ dataset includes annotations for the optic disc and the artery/vein ratio.
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         Pad((81, 0, 81, 0)),
         Resize(608),
         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.iostar import dataset as iostar
-dataset = DelayedSample2TorchDataset(iostar.subsets("vessel")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(iostar.subsets("vessel")["train"],
+        transforms=_transforms)

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

@@ -16,18 +16,15 @@ dataset includes annotations for the optic disc and the artery/vein ratio.
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         Resize(960),
         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.iostar import dataset as iostar
-dataset = DelayedSample2TorchDataset(iostar.subsets("vessel")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(iostar.subsets("vessel")["train"],
+        transforms=_transforms)

bob/ip/binseg/configs/datasets/refugecup.py → bob/ip/binseg/configs/datasets/refuge_cup.py

@@ -27,20 +27,17 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
 
 #### Config ####
 
-transforms = Compose(
-    [
-        Resize((1539)),
+_transforms = [
+        Resize(1539),
         Pad((21, 46, 22, 47)),  #(left, top, right, bottom)
         RandomHFlip(),
         RandomVFlip(),
         RandomRotation(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
 # bob.db.dataset init
 bobdb = REFUGE(protocol="default_cup")
 
 # PyTorch dataset
-dataset = BinSegDataset(bobdb, split="train", transform=transforms)
+dataset = BinSegDataset(bobdb, split="train", transforms=_transforms)

bob/ip/binseg/configs/datasets/refugecuptest.py → bob/ip/binseg/configs/datasets/refuge_cup_test.py

@@ -26,16 +26,11 @@ dataset of retinal fundus images.
 
 """
 
-from bob.db.refuge import Database as REFUGE
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
+from bob.ip.binseg.data.transforms import CenterCrop
+_transforms = [CenterCrop(1632)]
 
-transforms = Compose([CenterCrop(1632), ToTensor()])
-
-# bob.db.dataset init
+from bob.db.refuge import Database as REFUGE
 bobdb = REFUGE(protocol="default_cup")
 
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split="test", transform=transforms)
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+dataset = BinSegDataset(bobdb, split="test", transforms=_transforms)

bob/ip/binseg/configs/datasets/refugeod.py → bob/ip/binseg/configs/datasets/refuge_od.py

@@ -21,26 +21,18 @@ dataset of retinal fundus images.
 
 """
 
-from bob.db.refuge import Database as REFUGE
 from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
-
-transforms = Compose(
-    [
+_transforms = [
         Resize((1539)),
         Pad((21, 46, 22, 47)),
         RandomHFlip(),
         RandomVFlip(),
         RandomRotation(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-# bob.db.dataset init
+from bob.db.refuge import Database as REFUGE
 bobdb = REFUGE(protocol="default_od")
 
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split="train", transform=transforms)
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+dataset = BinSegDataset(bobdb, split="train", transforms=_transforms)

bob/ip/binseg/configs/datasets/refugeodtest.py → bob/ip/binseg/configs/datasets/refuge_od_test.py

@@ -26,16 +26,11 @@ dataset of retinal fundus images.
 
 """
 
-from bob.db.refuge import Database as REFUGE
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
+from bob.ip.binseg.data.transforms import CenterCrop
+_transforms = [CenterCrop(1632)]
 
-transforms = Compose([CenterCrop(1632), ToTensor()])
-
-# bob.db.dataset init
+from bob.db.refuge import Database as REFUGE
 bobdb = REFUGE(protocol="default_od")
 
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split="test", transform=transforms)
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+dataset = BinSegDataset(bobdb, split="test", transforms=_transforms)

bob/ip/binseg/configs/datasets/rimoner3cup.py → bob/ip/binseg/configs/datasets/rimoner3_cup.py

@@ -16,25 +16,17 @@ baseline.
 * Split reference: [MANINIS-2016]_
 """
 
-from bob.db.rimoner3 import Database as RIMONER3
 from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
-
-transforms = Compose(
-    [
+_transforms = [
         Pad((8, 8, 8, 8)),
         RandomHFlip(),
         RandomVFlip(),
         RandomRotation(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-# bob.db.dataset init
+from bob.db.rimoner3 import Database as RIMONER3
 bobdb = RIMONER3(protocol="default_cup")
 
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split="train", transform=transforms)
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+dataset = BinSegDataset(bobdb, split="train", transforms=_transforms)

bob/ip/binseg/configs/datasets/rimoner3cuptest.py → bob/ip/binseg/configs/datasets/rimoner3_cup_test.py

@@ -16,16 +16,12 @@ baseline.
 * Split reference: [MANINIS-2016]_
 """
 
-from bob.db.rimoner3 import Database as RIMONER3
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
 
-transforms = Compose([Pad((8, 8, 8, 8)), ToTensor()])
+from bob.ip.binseg.data.transforms import Pad
+_transforms = [Pad((8, 8, 8, 8))]
 
-# bob.db.dataset init
+from bob.db.rimoner3 import Database as RIMONER3
 bobdb = RIMONER3(protocol="default_cup")
 
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split="test", transform=transforms)
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+dataset = BinSegDataset(bobdb, split="test", transforms=_transforms)

bob/ip/binseg/configs/datasets/rimoner3od.py → bob/ip/binseg/configs/datasets/rimoner3_od.py

@@ -16,25 +16,17 @@ baseline.
 * Split reference: [MANINIS-2016]_
 """
 
-from bob.db.rimoner3 import Database as RIMONER3
 from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
-
-transforms = Compose(
-    [
+_transforms = [
         Pad((8, 8, 8, 8)),
         RandomHFlip(),
         RandomVFlip(),
         RandomRotation(),
         ColorJitter(),
-        ToTensor(),
-    ]
-)
+        ]
 
-# bob.db.dataset init
+from bob.db.rimoner3 import Database as RIMONER3
 bobdb = RIMONER3(protocol="default_od")
 
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split="train", transform=transforms)
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+dataset = BinSegDataset(bobdb, split="train", transforms=_transforms)

bob/ip/binseg/configs/datasets/rimoner3odtest.py → bob/ip/binseg/configs/datasets/rimoner3_od_test.py

@@ -16,16 +16,11 @@ baseline.
 * Split reference: [MANINIS-2016]_
 """
 
-from bob.db.rimoner3 import Database as RIMONER3
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
+from bob.ip.binseg.data.transforms import Pad
+_transforms = [Pad((8, 8, 8, 8))]
 
-transforms = Compose([Pad((8, 8, 8, 8)), ToTensor()])
-
-# bob.db.dataset init
+from bob.db.rimoner3 import Database as RIMONER3
 bobdb = RIMONER3(protocol="default_od")
 
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split="test", transform=transforms)
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+dataset = BinSegDataset(bobdb, split="test", transforms=_transforms)

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

@@ -17,18 +17,15 @@ for training and testing. The second set by Valentina Kouznetsova acts as a
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         Pad((2, 1, 2, 2)),  #(left, top, right, bottom)
         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.stare import dataset as stare
-dataset = DelayedSample2TorchDataset(stare.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(stare.subsets("default")["train"],
+        transforms=_transforms)

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

@@ -17,8 +17,7 @@ for training and testing. The second set by Valentina Kouznetsova acts as a
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         RandomRotation(),
         Pad((0, 32, 0, 32)),
         Resize(1024),
@@ -26,11 +25,9 @@ _transforms = Compose(
         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.stare import dataset as stare
-dataset = DelayedSample2TorchDataset(stare.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(stare.subsets("default")["train"],
+        transforms=_transforms)

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

@@ -14,8 +14,7 @@ for training and testing. The second set by Valentina Kouznetsova acts as a
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         RandomRotation(),
         Crop(50, 0, 500, 705),
         Resize(1168),
@@ -23,11 +22,9 @@ _transforms = Compose(
         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.stare import dataset as stare
-dataset = DelayedSample2TorchDataset(stare.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(stare.subsets("default")["train"],
+        transforms=_transforms)

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

@@ -17,19 +17,16 @@ for training and testing. The second set by Valentina Kouznetsova acts as a
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         RandomRotation(),
         Resize(471),
         Pad((0, 37, 0, 36)),
         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.stare import dataset as stare
-dataset = DelayedSample2TorchDataset(stare.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(stare.subsets("default")["train"],
+        transforms=_transforms)

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

@@ -17,8 +17,7 @@ for training and testing. The second set by Valentina Kouznetsova acts as a
 """
 
 from bob.ip.binseg.data.transforms import *
-_transforms = Compose(
-    [
+_transforms = [
         RandomRotation(),
         Pad((0, 32, 0, 32)),
         Resize(960),
@@ -26,11 +25,9 @@ _transforms = Compose(
         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.stare import dataset as stare
-dataset = DelayedSample2TorchDataset(stare.subsets("default")["train"],
-        transform=_transforms)
+dataset = SampleList2TorchDataset(stare.subsets("default")["train"],
+        transforms=_transforms)