diff --git a/bob/ip/binseg/configs/datasets/chasedb1.py b/bob/ip/binseg/configs/datasets/chasedb1.py index cdf8915e54a2e8533971b11a6f400011208a523a..553b9c2fcec8ef2796b53c5fb47678b1458f2b2d 100644 --- a/bob/ip/binseg/configs/datasets/chasedb1.py +++ b/bob/ip/binseg/configs/datasets/chasedb1.py @@ -23,14 +23,9 @@ bright strip running down the centre known as the central vessel reflex. * Split reference: [CHASEDB1-2012]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Crop(0, 18, 960, 960), #(upper, left, height, width) - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Crop +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Crop(0, 18, 960, 960)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.chasedb1 import dataset as chasedb1 diff --git a/bob/ip/binseg/configs/datasets/chasedb1544.py b/bob/ip/binseg/configs/datasets/chasedb1544.py index d6c389e234952eff4ac2814fcbba5a397a02da96..30d882580d02398cfde11355c00bf4d0f3d4d80d 100644 --- a/bob/ip/binseg/configs/datasets/chasedb1544.py +++ b/bob/ip/binseg/configs/datasets/chasedb1544.py @@ -1,12 +1,6 @@ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Resize(544), - Crop(0, 12, 544, 544), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Resize, Crop +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Resize(544), Crop(0, 12, 544, 544)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.chasedb1 import dataset as chasedb1 diff --git a/bob/ip/binseg/configs/datasets/csv.py b/bob/ip/binseg/configs/datasets/csv.py index f6aec54871b291bc7e99b1d99353702528ff8ab9..9da9bd1d2140c9061f6b9db820cad2578b0e4762 100644 --- a/bob/ip/binseg/configs/datasets/csv.py +++ b/bob/ip/binseg/configs/datasets/csv.py @@ -67,14 +67,11 @@ See: """ # add your transforms below - these are just examples -from bob.ip.binseg.data.transforms import * +from bob.ip.binseg.data.transforms import CenterCrop +#from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA _transforms = [ - #CenterCrop((544, 544)), - #RandomHFlip(), - #RandomVFlip(), - #RandomRotation(), - #ColorJitter(), - ] + CenterCrop((544, 544)), + ] # + _DA from bob.ip.binseg.data.csvdataset import CSVDataset #dataset = CSVDataset("<path.csv>", check_available=False, transforms=_transforms) diff --git a/bob/ip/binseg/configs/datasets/drionsdb.py b/bob/ip/binseg/configs/datasets/drionsdb.py index fdbbac7782d448c7aa02f7336987afadbda8df2b..2afb6df753625c9d9adea12945d4c32ce0518b7a 100644 --- a/bob/ip/binseg/configs/datasets/drionsdb.py +++ b/bob/ip/binseg/configs/datasets/drionsdb.py @@ -18,23 +18,12 @@ baseline. * Split reference: [MANINIS-2016]_ """ +from bob.ip.binseg.data.transforms import Pad +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Pad((4, 8, 4, 8))] + _DA from bob.db.drionsdb import Database as DRIONS -from bob.ip.binseg.data.transforms import * -from bob.ip.binseg.data.binsegdataset import BinSegDataset - -#### Config #### - -_transforms = [ - Pad((4, 8, 4, 8)), #(left, top, right, bottom) - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] - -# bob.db.dataset init bobdb = DRIONS(protocol="default") -# PyTorch dataset +from bob.ip.binseg.data.binsegdataset import BinSegDataset dataset = BinSegDataset(bobdb, split="train", transforms=_transforms) diff --git a/bob/ip/binseg/configs/datasets/drionsdb_test.py b/bob/ip/binseg/configs/datasets/drionsdb_test.py index 01cfccd76eddfbbf04a4e49440af91dcd163fd06..c57182cf4d28977d75739881c29208e0c13eb560 100644 --- a/bob/ip/binseg/configs/datasets/drionsdb_test.py +++ b/bob/ip/binseg/configs/datasets/drionsdb_test.py @@ -18,16 +18,11 @@ baseline. * Split reference: [MANINIS-2016]_ """ -from bob.db.drionsdb import Database as DRIONS -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((4, 8, 4, 8))] -# bob.db.dataset init +from bob.db.drionsdb import Database as DRIONS bobdb = DRIONS(protocol="default") -# PyTorch dataset +from bob.ip.binseg.data.binsegdataset import BinSegDataset dataset = BinSegDataset(bobdb, split="test", transforms=_transforms) diff --git a/bob/ip/binseg/configs/datasets/dristhigs1_cup.py b/bob/ip/binseg/configs/datasets/dristhigs1_cup.py index 4780d6f0daff6d193107b24fae3caa58f4a06eb9..6af20605018cd8cb19b484b6cd800b1aba6ebc63 100644 --- a/bob/ip/binseg/configs/datasets/dristhigs1_cup.py +++ b/bob/ip/binseg/configs/datasets/dristhigs1_cup.py @@ -21,22 +21,12 @@ and notching information. * Split reference: [DRISHTIGS1-2014]_ """ -from bob.db.drishtigs1 import Database as DRISHTI -from bob.ip.binseg.data.transforms import * -from bob.ip.binseg.data.binsegdataset import BinSegDataset - -#### Config #### +from bob.ip.binseg.data.transforms import CenterCrop +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [CenterCrop((1760, 2048))] + _DA -_transforms = [ - CenterCrop((1760, 2048)), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] - -# bob.db.dataset init +from bob.db.drishtigs1 import Database as DRISHTI bobdb = DRISHTI(protocol="default_cup") -# PyTorch dataset +from bob.ip.binseg.data.binsegdataset import BinSegDataset dataset = BinSegDataset(bobdb, split="train", transforms=_transforms) diff --git a/bob/ip/binseg/configs/datasets/dristhigs1_cup_test.py b/bob/ip/binseg/configs/datasets/dristhigs1_cup_test.py index e88c988a81998c2895f567a74d1101ef39651452..9e34102911bdf7255feb5b7f93f2ae1d67f3c4a4 100644 --- a/bob/ip/binseg/configs/datasets/dristhigs1_cup_test.py +++ b/bob/ip/binseg/configs/datasets/dristhigs1_cup_test.py @@ -21,16 +21,11 @@ and notching information. * Split reference: [DRISHTIGS1-2014]_ """ -from bob.db.drishtigs1 import Database as DRISHTI from bob.ip.binseg.data.transforms import CenterCrop -from bob.ip.binseg.data.binsegdataset import BinSegDataset - -#### Config #### - _transforms = [CenterCrop((1760, 2048))] -# bob.db.dataset init +from bob.db.drishtigs1 import Database as DRISHTI bobdb = DRISHTI(protocol="default_cup") -# PyTorch dataset +from bob.ip.binseg.data.binsegdataset import BinSegDataset dataset = BinSegDataset(bobdb, split="test", transforms=_transforms) diff --git a/bob/ip/binseg/configs/datasets/dristhigs1_od.py b/bob/ip/binseg/configs/datasets/dristhigs1_od.py index 025454180895418c38dfaef12b5310c22a6688d9..0a218f84556e232c0e9a40a978dd0b994afdde63 100644 --- a/bob/ip/binseg/configs/datasets/dristhigs1_od.py +++ b/bob/ip/binseg/configs/datasets/dristhigs1_od.py @@ -21,22 +21,12 @@ and notching information. * Split reference: [DRISHTIGS1-2014]_ """ -from bob.db.drishtigs1 import Database as DRISHTI -from bob.ip.binseg.data.transforms import * -from bob.ip.binseg.data.binsegdataset import BinSegDataset - -#### Config #### +from bob.ip.binseg.data.transforms import CenterCrop +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [CenterCrop((1760, 2048))] + _DA -_transforms = [ - CenterCrop((1760, 2048)), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] - -# bob.db.dataset init +from bob.db.drishtigs1 import Database as DRISHTI bobdb = DRISHTI(protocol="default_od") -# PyTorch dataset +from bob.ip.binseg.data.binsegdataset import BinSegDataset dataset = BinSegDataset(bobdb, split="train", transforms=_transforms) diff --git a/bob/ip/binseg/configs/datasets/dristhigs1_od_test.py b/bob/ip/binseg/configs/datasets/dristhigs1_od_test.py index 0e05f2fbce4412f85377248def3bc321598b2931..84ebd56c499db6d40571ca8a6ccd00de15ae99df 100644 --- a/bob/ip/binseg/configs/datasets/dristhigs1_od_test.py +++ b/bob/ip/binseg/configs/datasets/dristhigs1_od_test.py @@ -21,16 +21,11 @@ and notching information. * Split reference: [DRISHTIGS1-2014]_ """ -from bob.db.drishtigs1 import Database as DRISHTI from bob.ip.binseg.data.transforms import CenterCrop -from bob.ip.binseg.data.binsegdataset import BinSegDataset - -#### Config #### - _transforms = [CenterCrop((1760, 2048))] -# bob.db.dataset init +from bob.db.drishtigs1 import Database as DRISHTI bobdb = DRISHTI(protocol="default_od") -# PyTorch dataset +from bob.ip.binseg.data.binsegdataset import BinSegDataset dataset = BinSegDataset(bobdb, split="test", transforms=_transforms) diff --git a/bob/ip/binseg/configs/datasets/drive.py b/bob/ip/binseg/configs/datasets/drive.py index 2690b671d61848997735e5ff711137367d5869e6..1d3d9a3ea94a0f939ab47e4d88122b6e879ce4d6 100644 --- a/bob/ip/binseg/configs/datasets/drive.py +++ b/bob/ip/binseg/configs/datasets/drive.py @@ -13,14 +13,9 @@ segmentation of blood vessels in retinal images. * Split reference: [DRIVE-2004]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - CenterCrop((544, 544)), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import CenterCrop +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [CenterCrop((544, 544))] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.drive import dataset as drive diff --git a/bob/ip/binseg/configs/datasets/folder.py b/bob/ip/binseg/configs/datasets/folder.py index 06e1e65a6335f7feb0a75a192cc13d903e6d56de..da52a931b3ac2bdc8de851e3241baf3efe50e691 100644 --- a/bob/ip/binseg/configs/datasets/folder.py +++ b/bob/ip/binseg/configs/datasets/folder.py @@ -37,7 +37,7 @@ possible. """ # add your transforms below - these are just examples -from bob.ip.binseg.data.transforms import * +from bob.ip.binseg.data.transforms import CenterCrop _transforms = [ #CenterCrop((544, 544)), ] diff --git a/bob/ip/binseg/configs/datasets/hrf.py b/bob/ip/binseg/configs/datasets/hrf.py index fb7316121129d7bfdf5ed5a8b0f52bc717498a9f..1c9c34262cd841540e37c4470c8357eb9bcab1d8 100644 --- a/bob/ip/binseg/configs/datasets/hrf.py +++ b/bob/ip/binseg/configs/datasets/hrf.py @@ -14,14 +14,9 @@ x 2336. One set of ground-truth vessel annotations is available. * Split reference: [ORLANDO-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Crop(0, 108, 2336, 3296), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Crop +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Crop(0, 108, 2336, 3296)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.hrf import dataset as hrf diff --git a/bob/ip/binseg/configs/datasets/hrf1024.py b/bob/ip/binseg/configs/datasets/hrf1024.py index 00f79b2901c0765dd418d85aa62c9c2d50eee152..7a612db8c801f2971760c7f490c069b20a1bc0ad 100644 --- a/bob/ip/binseg/configs/datasets/hrf1024.py +++ b/bob/ip/binseg/configs/datasets/hrf1024.py @@ -14,15 +14,9 @@ x 2336. One set of ground-truth vessel annotations is available. * Split reference: [ORLANDO-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Pad((0, 584, 0, 584)), - Resize(1024), - RandomRotation(), - RandomHFlip(), - RandomVFlip(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Pad, Resize +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Pad((0, 584, 0, 584)), Resize(1024)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.hrf import dataset as hrf diff --git a/bob/ip/binseg/configs/datasets/hrf544.py b/bob/ip/binseg/configs/datasets/hrf544.py index a1adf81b70ac2eea2ccb30d8e70e1af0ad5cd73f..044f28125213c40a4e56d37075d000bc53bd08ee 100644 --- a/bob/ip/binseg/configs/datasets/hrf544.py +++ b/bob/ip/binseg/configs/datasets/hrf544.py @@ -14,15 +14,9 @@ x 2336. One set of ground-truth vessel annotations is available. * Split reference: [ORLANDO-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Resize((363)), - Pad((0, 90, 0, 91)), - RandomRotation(), - RandomHFlip(), - RandomVFlip(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Resize, Pad +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Resize((363)), Pad((0, 90, 0, 91))] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.hrf import dataset as hrf diff --git a/bob/ip/binseg/configs/datasets/hrf608.py b/bob/ip/binseg/configs/datasets/hrf608.py index 5404a51484e9669c4acbb42811919cd5899ca449..8f31fdaad9483ee2e43357fec8d49daad323d1bd 100644 --- a/bob/ip/binseg/configs/datasets/hrf608.py +++ b/bob/ip/binseg/configs/datasets/hrf608.py @@ -14,15 +14,9 @@ x 2336. One set of ground-truth vessel annotations is available. * Split reference: [ORLANDO-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Pad((0, 345, 0, 345)), - Resize(608), - RandomRotation(), - RandomHFlip(), - RandomVFlip(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Pad, Resize +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Pad((0, 345, 0, 345)), Resize(608)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.hrf import dataset as hrf diff --git a/bob/ip/binseg/configs/datasets/hrf960.py b/bob/ip/binseg/configs/datasets/hrf960.py index d7c9245687b4573a1b758e2fc1634d1956b6fb8f..05a7491696dec5d27d980e8325bb5276201ad01f 100644 --- a/bob/ip/binseg/configs/datasets/hrf960.py +++ b/bob/ip/binseg/configs/datasets/hrf960.py @@ -14,15 +14,9 @@ x 2336. One set of ground-truth vessel annotations is available. * Split reference: [ORLANDO-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Pad((0, 584, 0, 584)), - Resize(960), - RandomRotation(), - RandomHFlip(), - RandomVFlip(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Pad, Resize +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Pad((0, 584, 0, 584)), Resize(960)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.hrf import dataset as hrf diff --git a/bob/ip/binseg/configs/datasets/hrf_1168.py b/bob/ip/binseg/configs/datasets/hrf_1168.py index 0d17fa202268f6353ba2323359fd65a2a6bfca64..cd2bcea84b45b8f0b0cd175bedae9ed987006aaf 100644 --- a/bob/ip/binseg/configs/datasets/hrf_1168.py +++ b/bob/ip/binseg/configs/datasets/hrf_1168.py @@ -14,15 +14,9 @@ x 2336. One set of ground-truth vessel annotations is available. * Split reference: [ORLANDO-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Crop(0, 108, 2336, 3296), #(upper, left, height, width) - Resize(1168), # applies to the smaller edge - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Crop, Resize +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Crop(0, 108, 2336, 3296), Resize(1168)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.hrf import dataset as hrf diff --git a/bob/ip/binseg/configs/datasets/iostar_od.py b/bob/ip/binseg/configs/datasets/iostar_od.py index dc4ad5d95c701797e4f06974f893632e52c912d5..55b0db4a631450ddba5699a4777238f68957ce1f 100644 --- a/bob/ip/binseg/configs/datasets/iostar_od.py +++ b/bob/ip/binseg/configs/datasets/iostar_od.py @@ -16,14 +16,8 @@ dataset includes annotations for the optic disc and the artery/vein ratio. """ from bob.ip.binseg.data.transforms import * -_transforms = [ - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] - +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.iostar import dataset as iostar dataset = SampleList2TorchDataset(iostar.subsets("optic-disc")["train"], - transforms=_transforms) + transforms=_DA) diff --git a/bob/ip/binseg/configs/datasets/iostar_vessel.py b/bob/ip/binseg/configs/datasets/iostar_vessel.py index e6cd47b343cce1d2bdc091b688474d436f0ba5eb..ae749759e32f737dcd146a8cc356376966b3cdb1 100644 --- a/bob/ip/binseg/configs/datasets/iostar_vessel.py +++ b/bob/ip/binseg/configs/datasets/iostar_vessel.py @@ -16,14 +16,8 @@ dataset includes annotations for the optic disc and the artery/vein ratio. """ from bob.ip.binseg.data.transforms import * -_transforms = [ - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] - +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.iostar import dataset as iostar dataset = SampleList2TorchDataset(iostar.subsets("vessel")["train"], - transforms=_transforms) + transforms=_DA) diff --git a/bob/ip/binseg/configs/datasets/iostarvessel544.py b/bob/ip/binseg/configs/datasets/iostarvessel544.py index d2e588e85a0d4b60e015da606ca8b7a4f2cab201..1889c957f5a0cd31a87bdafee07ca1f8e3fc84af 100644 --- a/bob/ip/binseg/configs/datasets/iostarvessel544.py +++ b/bob/ip/binseg/configs/datasets/iostarvessel544.py @@ -15,14 +15,9 @@ dataset includes annotations for the optic disc and the artery/vein ratio. * Split reference: [MEYER-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Resize(544), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Resize +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Resize(544)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.iostar import dataset as iostar diff --git a/bob/ip/binseg/configs/datasets/iostarvessel608.py b/bob/ip/binseg/configs/datasets/iostarvessel608.py index 6b3ae8fafd92b19500c1fd33e59c7bf058d5f1c1..4fd7ba3f713c5a2bf8346035dc0c94f4c48e4d4b 100644 --- a/bob/ip/binseg/configs/datasets/iostarvessel608.py +++ b/bob/ip/binseg/configs/datasets/iostarvessel608.py @@ -15,15 +15,9 @@ dataset includes annotations for the optic disc and the artery/vein ratio. * Split reference: [MEYER-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Pad((81, 0, 81, 0)), - Resize(608), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Pad, Resize +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Pad((81, 0, 81, 0)), Resize(608)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.iostar import dataset as iostar diff --git a/bob/ip/binseg/configs/datasets/iostarvessel960.py b/bob/ip/binseg/configs/datasets/iostarvessel960.py index 95ca89051c2644c44ddd399fc29097b764f939c3..6b5f67f30757b0a929e3728ef4d089d438c7acd4 100644 --- a/bob/ip/binseg/configs/datasets/iostarvessel960.py +++ b/bob/ip/binseg/configs/datasets/iostarvessel960.py @@ -15,14 +15,9 @@ dataset includes annotations for the optic disc and the artery/vein ratio. * Split reference: [MEYER-2017]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Resize(960), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Resize +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Resize(960)] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.iostar import dataset as iostar diff --git a/bob/ip/binseg/configs/datasets/refuge_cup.py b/bob/ip/binseg/configs/datasets/refuge_cup.py index 2d26cc6d8f2eb9406eb6c1865d658a194e7a5aa2..029e7898a82f1f62febd232f5056c34dd6b6aed0 100644 --- a/bob/ip/binseg/configs/datasets/refuge_cup.py +++ b/bob/ip/binseg/configs/datasets/refuge_cup.py @@ -21,23 +21,12 @@ 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 Resize, Pad +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Resize(1539), Pad((21, 46, 22, 47))] + _DA -_transforms = [ - Resize(1539), - Pad((21, 46, 22, 47)), #(left, top, right, bottom) - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] - -# bob.db.dataset init +from bob.db.refuge import Database as REFUGE bobdb = REFUGE(protocol="default_cup") -# PyTorch dataset +from bob.ip.binseg.data.binsegdataset import BinSegDataset dataset = BinSegDataset(bobdb, split="train", transforms=_transforms) diff --git a/bob/ip/binseg/configs/datasets/refuge_od.py b/bob/ip/binseg/configs/datasets/refuge_od.py index d61add28c08f25e6deb0c1c7265c37216ba0905c..8959b1eb6c4added59637b68c9649356a9ff7d85 100644 --- a/bob/ip/binseg/configs/datasets/refuge_od.py +++ b/bob/ip/binseg/configs/datasets/refuge_od.py @@ -21,15 +21,9 @@ dataset of retinal fundus images. """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Resize((1539)), - Pad((21, 46, 22, 47)), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Resize, Pad +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Resize((1539)), Pad((21, 46, 22, 47))] + _DA from bob.db.refuge import Database as REFUGE bobdb = REFUGE(protocol="default_od") diff --git a/bob/ip/binseg/configs/datasets/rimoner3_cup.py b/bob/ip/binseg/configs/datasets/rimoner3_cup.py index 080a32f94f56a63d123f31ed3929e9a8934a880e..e5bb214d03ad9fd5baa5c8b115f288ca678fb58e 100644 --- a/bob/ip/binseg/configs/datasets/rimoner3_cup.py +++ b/bob/ip/binseg/configs/datasets/rimoner3_cup.py @@ -16,14 +16,9 @@ baseline. * Split reference: [MANINIS-2016]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Pad((8, 8, 8, 8)), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Pad +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Pad((8, 8, 8, 8))] + _DA from bob.db.rimoner3 import Database as RIMONER3 bobdb = RIMONER3(protocol="default_cup") diff --git a/bob/ip/binseg/configs/datasets/rimoner3_cup_test.py b/bob/ip/binseg/configs/datasets/rimoner3_cup_test.py index 6ae6c809f0c1f2967b5d153309ec85d5a65174de..6ed91adc8e7df3cd8f447bc450bcd73648e997f1 100644 --- a/bob/ip/binseg/configs/datasets/rimoner3_cup_test.py +++ b/bob/ip/binseg/configs/datasets/rimoner3_cup_test.py @@ -16,7 +16,6 @@ baseline. * Split reference: [MANINIS-2016]_ """ - from bob.ip.binseg.data.transforms import Pad _transforms = [Pad((8, 8, 8, 8))] diff --git a/bob/ip/binseg/configs/datasets/rimoner3_od.py b/bob/ip/binseg/configs/datasets/rimoner3_od.py index e1dd0a9449d28e758cd49441a115ec0271d2c29d..3757e2f04bd3db850306a5e75851a9bd0e1d8d2c 100644 --- a/bob/ip/binseg/configs/datasets/rimoner3_od.py +++ b/bob/ip/binseg/configs/datasets/rimoner3_od.py @@ -16,14 +16,9 @@ baseline. * Split reference: [MANINIS-2016]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Pad((8, 8, 8, 8)), - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Pad +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Pad((8, 8, 8, 8))] + _DA from bob.db.rimoner3 import Database as RIMONER3 bobdb = RIMONER3(protocol="default_od") diff --git a/bob/ip/binseg/configs/datasets/stare.py b/bob/ip/binseg/configs/datasets/stare.py index d173f846e47dd919b702904f03923f5d2e40cf80..4ef2d51c928810f92872d9afa660d6cdc8b6f6f3 100644 --- a/bob/ip/binseg/configs/datasets/stare.py +++ b/bob/ip/binseg/configs/datasets/stare.py @@ -16,14 +16,9 @@ for training and testing. The second set by Valentina Kouznetsova acts as a * Split reference: [MANINIS-2016]_ """ -from bob.ip.binseg.data.transforms import * -_transforms = [ - Pad((2, 1, 2, 2)), #(left, top, right, bottom) - RandomHFlip(), - RandomVFlip(), - RandomRotation(), - ColorJitter(), - ] +from bob.ip.binseg.data.transforms import Pad +from bob.ip.binseg.configs.datasets.utils import DATA_AUGMENTATION as _DA +_transforms = [Pad((2, 1, 2, 2))] + _DA from bob.ip.binseg.data.utils import SampleList2TorchDataset from bob.ip.binseg.data.stare import dataset as stare diff --git a/bob/ip/binseg/configs/datasets/utils.py b/bob/ip/binseg/configs/datasets/utils.py new file mode 100644 index 0000000000000000000000000000000000000000..35850c10f5b8666224790684251921f66b08fbcc --- /dev/null +++ b/bob/ip/binseg/configs/datasets/utils.py @@ -0,0 +1,19 @@ +#!/usr/bin/env python +# coding=utf-8 + +"""Dataset configuration utilities""" + +from ...data.transforms import ( + RandomHFlip, + RandomVFlip, + RandomRotation, + ColorJitter, +) + +DATA_AUGMENTATION = [ + RandomHFlip(), + RandomVFlip(), + RandomRotation(), + ColorJitter(), + ] +"""Shared data augmentation transforms""" diff --git a/doc/api.rst b/doc/api.rst index 020371c8730516a5f20de790ec021fdd9adc3ef4..0036375949015087c16898f58d9a08350ab2037d 100644 --- a/doc/api.rst +++ b/doc/api.rst @@ -131,6 +131,7 @@ Datasets bob.ip.binseg.configs.datasets.csv bob.ip.binseg.configs.datasets.folder + bob.ip.binseg.configs.datasets.utils bob.ip.binseg.configs.datasets.chasedb1 bob.ip.binseg.configs.datasets.chasedb1_test