diff --git a/bob/ip/binseg/configs/datasets/allvessel544.py b/bob/ip/binseg/configs/datasets/allvessel544.py
deleted file mode 100644
index 9044cebccd11a8ffd1873fa58d19123d7baefe43..0000000000000000000000000000000000000000
--- a/bob/ip/binseg/configs/datasets/allvessel544.py
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from bob.db.drive import Database as DRIVE
-from bob.db.stare import Database as STARE
-from bob.db.chasedb1 import Database as CHASEDB1
-from bob.db.iostar import Database as IOSTAR
-from bob.db.hrf import Database as HRF
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-import torch
-
-# Target size: 544x544 (DRIVE)
-
-defaulttransforms = [RandomHFlip()
- ,RandomVFlip()
- ,RandomRotation()
- ,ColorJitter()
- ,ToTensor()]
-
-
-# DRIVE
-transforms_drive = Compose([
- CenterCrop((544,544))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_drive = DRIVE(protocol = 'default')
-
-# PyTorch dataset
-torch_drive = BinSegDataset(bobdb_drive, split='train', transform=transforms_drive)
-
-
-# CHASE_DB1
-transforms_chase = Compose([
- Resize(544)
- ,Crop(0,12,544,544)
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_chase = CHASEDB1(protocol = 'default')
-
-# PyTorch dataset
-torch_chase = BinSegDataset(bobdb_chase, split='train', transform=transforms_chase)
-
-
-# IOSTAR VESSEL
-transforms_iostar = Compose([
- Resize(544)
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_iostar = IOSTAR(protocol='default_vessel')
-
-# PyTorch dataset
-torch_iostar = BinSegDataset(bobdb_iostar, split='train', transform=transforms_iostar)
-
-# STARE
-transforms = Compose([
- Resize(471)
- ,Pad((0,37,0,36))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_stare = STARE(protocol = 'default')
-
-# PyTorch dataset
-torch_stare = BinSegDataset(bobdb_stare, split='train', transform=transforms)
-
-
-# HRF
-transforms_hrf = Compose([
- Resize((363))
- ,Pad((0,90,0,91))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_hrf = HRF(protocol = 'default')
-
-# PyTorch dataset
-torch_hrf = BinSegDataset(bobdb_hrf, split='train', transform=transforms_hrf)
-
-
-
-# Merge
-dataset = torch.utils.data.ConcatDataset([torch_drive,torch_stare, torch_chase, torch_iostar, torch_hrf])
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/allvessel544test.py b/bob/ip/binseg/configs/datasets/allvessel544test.py
deleted file mode 100644
index 55994e9e045311db031290d63c45f6326eb4436a..0000000000000000000000000000000000000000
--- a/bob/ip/binseg/configs/datasets/allvessel544test.py
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from bob.db.drive import Database as DRIVE
-from bob.db.stare import Database as STARE
-from bob.db.chasedb1 import Database as CHASEDB1
-from bob.db.iostar import Database as IOSTAR
-from bob.db.hrf import Database as HRF
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-import torch
-
-# Target size: 544x544 (DRIVE)
-
-defaulttransforms = [ToTensor()]
-
-
-# DRIVE
-transforms_drive = Compose([
- CenterCrop((544,544))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_drive = DRIVE(protocol = 'default')
-
-# PyTorch dataset
-torch_drive = BinSegDataset(bobdb_drive, split='test', transform=transforms_drive)
-
-
-# CHASE_DB1
-transforms_chase = Compose([
- Resize(544)
- ,Crop(0,12,544,544)
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_chase = CHASEDB1(protocol = 'default')
-
-# PyTorch dataset
-torch_chase = BinSegDataset(bobdb_chase, split='test', transform=transforms_chase)
-
-
-# IOSTAR VESSEL
-transforms_iostar = Compose([
- Resize(544)
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_iostar = IOSTAR(protocol='default_vessel')
-
-# PyTorch dataset
-torch_iostar = BinSegDataset(bobdb_iostar, split='test', transform=transforms_iostar)
-
-# STARE
-transforms = Compose([
- Resize(471)
- ,Pad((0,37,0,36))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_stare = STARE(protocol = 'default')
-
-# PyTorch dataset
-torch_stare = BinSegDataset(bobdb_stare, split='test', transform=transforms)
-
-
-# HRF
-transforms_hrf = Compose([
- Resize((363))
- ,Pad((0,90,0,91))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_hrf = HRF(protocol = 'default')
-
-# PyTorch dataset
-torch_hrf = BinSegDataset(bobdb_hrf, split='test', transform=transforms_hrf)
-
-
-
-# Merge
-dataset = torch.utils.data.ConcatDataset([torch_drive,torch_stare, torch_chase, torch_iostar, torch_hrf])
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/amdrive.py b/bob/ip/binseg/configs/datasets/amdrive.py
deleted file mode 100644
index 6f7cc3101d158f71c7ea47f32382ce369de0552b..0000000000000000000000000000000000000000
--- a/bob/ip/binseg/configs/datasets/amdrive.py
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from bob.db.drive import Database as DRIVE
-from bob.db.stare import Database as STARE
-from bob.db.chasedb1 import Database as CHASEDB1
-from bob.db.iostar import Database as IOSTAR
-from bob.db.hrf import Database as HRF
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-import torch
-
-# Target size: 544x544 (DRIVE)
-
-defaulttransforms = [RandomHFlip()
- ,RandomVFlip()
- ,RandomRotation()
- ,ColorJitter()
- ,ToTensor()]
-
-
-
-# CHASE_DB1
-transforms_chase = Compose([
- Resize(544)
- ,Crop(0,12,544,544)
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_chase = CHASEDB1(protocol = 'default')
-
-# PyTorch dataset
-torch_chase = BinSegDataset(bobdb_chase, split='train', transform=transforms_chase)
-
-
-# IOSTAR VESSEL
-transforms_iostar = Compose([
- Resize(544)
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_iostar = IOSTAR(protocol='default_vessel')
-
-# PyTorch dataset
-torch_iostar = BinSegDataset(bobdb_iostar, split='train', transform=transforms_iostar)
-
-# STARE
-transforms = Compose([
- Resize(471)
- ,Pad((0,37,0,36))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_stare = STARE(protocol = 'default')
-
-# PyTorch dataset
-torch_stare = BinSegDataset(bobdb_stare, split='train', transform=transforms)
-
-
-# HRF
-transforms_hrf = Compose([
- Resize((363))
- ,Pad((0,90,0,91))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_hrf = HRF(protocol = 'default')
-
-# PyTorch dataset
-torch_hrf = BinSegDataset(bobdb_hrf, split='train', transform=transforms_hrf)
-
-
-
-# Merge
-dataset = torch.utils.data.ConcatDataset([torch_stare, torch_chase, torch_iostar, torch_hrf])
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/amdrivetest.py b/bob/ip/binseg/configs/datasets/amdrivetest.py
deleted file mode 100644
index 026ac236e7e9f48f5f41b6685d01369606c47321..0000000000000000000000000000000000000000
--- a/bob/ip/binseg/configs/datasets/amdrivetest.py
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-from bob.db.drive import Database as DRIVE
-from bob.db.stare import Database as STARE
-from bob.db.chasedb1 import Database as CHASEDB1
-from bob.db.iostar import Database as IOSTAR
-from bob.db.hrf import Database as HRF
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-import torch
-
-# Target size: 544x544 (DRIVE)
-
-defaulttransforms = [ToTensor()]
-
-
-# CHASE_DB1
-transforms_chase = Compose([
- Resize(544)
- ,Crop(0,12,544,544)
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_chase = CHASEDB1(protocol = 'default')
-
-# PyTorch dataset
-torch_chase = BinSegDataset(bobdb_chase, split='test', transform=transforms_chase)
-
-
-# IOSTAR VESSEL
-transforms_iostar = Compose([
- Resize(544)
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_iostar = IOSTAR(protocol='default_vessel')
-
-# PyTorch dataset
-torch_iostar = BinSegDataset(bobdb_iostar, split='test', transform=transforms_iostar)
-
-# STARE
-transforms = Compose([
- Resize(471)
- ,Pad((0,37,0,36))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_stare = STARE(protocol = 'default')
-
-# PyTorch dataset
-torch_stare = BinSegDataset(bobdb_stare, split='test', transform=transforms)
-
-
-# HRF
-transforms_hrf = Compose([
- Resize((363))
- ,Pad((0,90,0,91))
- ,*defaulttransforms
- ])
-
-# bob.db.dataset init
-bobdb_hrf = HRF(protocol = 'default')
-
-# PyTorch dataset
-torch_hrf = BinSegDataset(bobdb_hrf, split='test', transform=transforms_hrf)
-
-
-
-# Merge
-dataset = torch.utils.data.ConcatDataset([torch_stare, torch_chase, torch_iostar, torch_hrf])
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/chasedb11024.py b/bob/ip/binseg/configs/datasets/chasedb11024.py
new file mode 100644
index 0000000000000000000000000000000000000000..028f10fb443cd4f1c9c728203f13641cc67b95ad
--- /dev/null
+++ b/bob/ip/binseg/configs/datasets/chasedb11024.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from bob.db.chasedb1 import Database as CHASEDB1
+from bob.ip.binseg.data.transforms import *
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+
+#### Config ####
+
+transforms = Compose([
+ RandomRotation()
+ ,Crop(0,18,960,960)
+ ,Resize(1024)
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,ColorJitter()
+ ,ToTensor()
+ ])
+
+# bob.db.dataset init
+bobdb = CHASEDB1(protocol = 'default')
+
+# PyTorch dataset
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/chasedb11168.py b/bob/ip/binseg/configs/datasets/chasedb11168.py
new file mode 100644
index 0000000000000000000000000000000000000000..d221ea4879c4e7378e0f9ad6bcce2cd5a77bf04c
--- /dev/null
+++ b/bob/ip/binseg/configs/datasets/chasedb11168.py
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from bob.db.chasedb1 import Database as CHASEDB1
+from bob.ip.binseg.data.transforms import *
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+
+#### Config ####
+
+transforms = Compose([
+ RandomRotation()
+ ,Crop(140,18,680,960)
+ ,Resize(1168)
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,ColorJitter()
+ ,ToTensor()
+ ])
+
+# bob.db.dataset init
+bobdb = CHASEDB1(protocol = 'default')
+
+# PyTorch dataset
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/chasedb1544test.py b/bob/ip/binseg/configs/datasets/chasedb1544.py
similarity index 58%
rename from bob/ip/binseg/configs/datasets/chasedb1544test.py
rename to bob/ip/binseg/configs/datasets/chasedb1544.py
index aa5d00a55e68bf8d025ba338cbeb59289ce3c70a..9d94cd3ca6e9e1504aaba5bbb78422f547e102c2 100644
--- a/bob/ip/binseg/configs/datasets/chasedb1544test.py
+++ b/bob/ip/binseg/configs/datasets/chasedb1544.py
@@ -7,9 +7,13 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
#### Config ####
-transforms = Compose([
- Resize(544)
+transforms = Compose([
+ RandomRotation()
+ ,Resize(544)
,Crop(0,12,544,544)
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,ColorJitter()
,ToTensor()
])
@@ -17,4 +21,4 @@ transforms = Compose([
bobdb = CHASEDB1(protocol = 'default')
# PyTorch dataset
-dataset = BinSegDataset(bobdb, split='test', transform=transforms)
\ No newline at end of file
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/drive1024.py b/bob/ip/binseg/configs/datasets/drive1024.py
index d5f08ff8742d49652de783183d44b8e3eec1b3a3..dae199f50dc59c194a5ada24ff8e99f9aa4fd642 100644
--- a/bob/ip/binseg/configs/datasets/drive1024.py
+++ b/bob/ip/binseg/configs/datasets/drive1024.py
@@ -8,11 +8,11 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
#### Config ####
transforms = Compose([
- CenterCrop((540,540))
+ RandomRotation()
+ ,CenterCrop((540,540))
,Resize(1024)
,RandomHFlip()
,RandomVFlip()
- ,RandomRotation()
,ColorJitter()
,ToTensor()
])
diff --git a/bob/ip/binseg/configs/datasets/drive1024test.py b/bob/ip/binseg/configs/datasets/drive1024test.py
deleted file mode 100644
index 9e9cb3e935a63ddb45bb0bba85c56c173de6912d..0000000000000000000000000000000000000000
--- a/bob/ip/binseg/configs/datasets/drive1024test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from bob.db.drive import Database as DRIVE
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
-
-transforms = Compose([
- CenterCrop((540,540))
- ,Resize(1024)
- ,ToTensor()
- ])
-
-# bob.db.dataset init
-bobdb = DRIVE(protocol = 'default')
-
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split='test', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/drive2336.py b/bob/ip/binseg/configs/datasets/drive1168.py
similarity index 82%
rename from bob/ip/binseg/configs/datasets/drive2336.py
rename to bob/ip/binseg/configs/datasets/drive1168.py
index 30ec9af8400daa56bece1318ca8a07a56254a8c4..3f0f0537e1ba67d7beb3d77af492ba8f9fc539a2 100644
--- a/bob/ip/binseg/configs/datasets/drive2336.py
+++ b/bob/ip/binseg/configs/datasets/drive1168.py
@@ -8,12 +8,12 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
#### Config ####
transforms = Compose([
- Crop(75,10,416,544)
+ RandomRotation()
+ ,Crop(75,10,416,544)
,Pad((21,0,22,0))
- ,Resize(2336)
+ ,Resize(1168)
,RandomHFlip()
,RandomVFlip()
- ,RandomRotation()
,ColorJitter()
,ToTensor()
])
diff --git a/bob/ip/binseg/configs/datasets/drive2336test.py b/bob/ip/binseg/configs/datasets/drive2336test.py
deleted file mode 100644
index 9ce3b6491c47379abe09886bd9d904afde1ccc00..0000000000000000000000000000000000000000
--- a/bob/ip/binseg/configs/datasets/drive2336test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from bob.db.drive import Database as DRIVE
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
-
-transforms = Compose([
- Crop(75,10,416,544)
- ,Pad((21,0,22,0))
- ,Resize(2336)
- ,ToTensor()
- ])
-
-# bob.db.dataset init
-bobdb = DRIVE(protocol = 'default')
-
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split='test', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/drive608.py b/bob/ip/binseg/configs/datasets/drive608.py
index 64037a07feeef8cff2c85b1a787eb0bafd1cd168..65bc5e6521dcdd3bbbf66ea77a741c6270dcdd58 100644
--- a/bob/ip/binseg/configs/datasets/drive608.py
+++ b/bob/ip/binseg/configs/datasets/drive608.py
@@ -8,12 +8,12 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
#### Config ####
transforms = Compose([
- CenterCrop((470,544))
+ RandomRotation()
+ ,CenterCrop((470,544))
,Pad((10,9,10,8))
,Resize(608)
,RandomHFlip()
,RandomVFlip()
- ,RandomRotation()
,ColorJitter()
,ToTensor()
])
diff --git a/bob/ip/binseg/configs/datasets/drive608test.py b/bob/ip/binseg/configs/datasets/drive608test.py
deleted file mode 100644
index 7c59713624bbfab1f95fd5f4b079951258e40a99..0000000000000000000000000000000000000000
--- a/bob/ip/binseg/configs/datasets/drive608test.py
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from bob.db.drive import Database as DRIVE
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
-
-transforms = Compose([
- CenterCrop((470,544))
- ,Pad((10,9,10,8))
- ,Resize(608)
- ,ToTensor()
- ])
-
-# bob.db.dataset init
-bobdb = DRIVE(protocol = 'default')
-
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split='test', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/drive960.py b/bob/ip/binseg/configs/datasets/drive960.py
index f0d06b781a7135f929ae28a53b9c83ea268c3f20..ab3ac5a9d03916dce4bbb162f51455a5bb05bcba 100644
--- a/bob/ip/binseg/configs/datasets/drive960.py
+++ b/bob/ip/binseg/configs/datasets/drive960.py
@@ -8,11 +8,11 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
#### Config ####
transforms = Compose([
- CenterCrop((544,544))
+ RandomRotation()
+ ,CenterCrop((544,544))
,Resize(960)
,RandomHFlip()
,RandomVFlip()
- ,RandomRotation()
,ColorJitter()
,ToTensor()
])
diff --git a/bob/ip/binseg/configs/datasets/drive960test.py b/bob/ip/binseg/configs/datasets/drive960test.py
deleted file mode 100644
index 041fa775f9ce6a47c6f8db145fed22d009e86cde..0000000000000000000000000000000000000000
--- a/bob/ip/binseg/configs/datasets/drive960test.py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-
-from bob.db.drive import Database as DRIVE
-from bob.ip.binseg.data.transforms import *
-from bob.ip.binseg.data.binsegdataset import BinSegDataset
-
-#### Config ####
-
-transforms = Compose([
- CenterCrop((544,544))
- ,Resize(960)
- ,ToTensor()
- ])
-
-# bob.db.dataset init
-bobdb = DRIVE(protocol = 'default')
-
-# PyTorch dataset
-dataset = BinSegDataset(bobdb, split='test', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/drivestarechasedb1iostar1168.py b/bob/ip/binseg/configs/datasets/drivestarechasedb1iostar1168.py
new file mode 100644
index 0000000000000000000000000000000000000000..62e2972d3526fd5ff138a5ea99f0855849beda12
--- /dev/null
+++ b/bob/ip/binseg/configs/datasets/drivestarechasedb1iostar1168.py
@@ -0,0 +1,10 @@
+from bob.ip.binseg.configs.datasets.drive1168 import dataset as drive
+from bob.ip.binseg.configs.datasets.stare1168 import dataset as stare
+from bob.ip.binseg.configs.datasets.chasedb11168 import dataset as chase
+from bob.ip.binseg.configs.datasets.iostarvessel1168 import dataset as iostar
+import torch
+
+#### Config ####
+
+# PyTorch dataset
+dataset = torch.utils.data.ConcatDataset([drive,stare,chase,iostar])
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/hrf544test.py b/bob/ip/binseg/configs/datasets/hrf1168.py
similarity index 54%
rename from bob/ip/binseg/configs/datasets/hrf544test.py
rename to bob/ip/binseg/configs/datasets/hrf1168.py
index 86da428b8f6bd0220d0b311b53ddcba098177a70..4d0c4d9eb3097a3c918a24bd2621bb3284f41215 100644
--- a/bob/ip/binseg/configs/datasets/hrf544test.py
+++ b/bob/ip/binseg/configs/datasets/hrf1168.py
@@ -8,8 +8,12 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
#### Config ####
transforms = Compose([
- Resize((363))
- ,Pad((0,90,0,91))
+ Crop(0,108,2336,3296)
+ ,Resize((1168))
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,RandomRotation()
+ ,ColorJitter()
,ToTensor()
])
@@ -17,4 +21,4 @@ transforms = Compose([
bobdb = HRF(protocol = 'default')
# PyTorch dataset
-dataset = BinSegDataset(bobdb, split='test', transform=transforms)
\ No newline at end of file
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/iostarvessel1168.py b/bob/ip/binseg/configs/datasets/iostarvessel1168.py
new file mode 100644
index 0000000000000000000000000000000000000000..5da5ed1e912065ca4ea2a81e4bd0f8b4e8d5475d
--- /dev/null
+++ b/bob/ip/binseg/configs/datasets/iostarvessel1168.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from bob.db.iostar import Database as IOSTAR
+from bob.ip.binseg.data.transforms import *
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+
+#### Config ####
+
+transforms = Compose([
+ RandomRotation()
+ ,Crop(144,0,768,1024)
+ ,Pad((30,0,30,0))
+ ,Resize(1168)
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,ColorJitter()
+ ,ToTensor()
+ ])
+
+# bob.db.dataset init
+bobdb = IOSTAR(protocol='default_vessel')
+
+# PyTorch dataset
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/iostarvessel544test.py b/bob/ip/binseg/configs/datasets/iostarvessel960.py
similarity index 59%
rename from bob/ip/binseg/configs/datasets/iostarvessel544test.py
rename to bob/ip/binseg/configs/datasets/iostarvessel960.py
index e3ccd854079e57c642669aa33f403d4ba28d4700..32feec853882cbdcadc9fea91de4a1d61e168cc0 100644
--- a/bob/ip/binseg/configs/datasets/iostarvessel544test.py
+++ b/bob/ip/binseg/configs/datasets/iostarvessel960.py
@@ -8,7 +8,11 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
#### Config ####
transforms = Compose([
- Resize(544)
+ Resize(960)
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,RandomRotation()
+ ,ColorJitter()
,ToTensor()
])
@@ -16,4 +20,4 @@ transforms = Compose([
bobdb = IOSTAR(protocol='default_vessel')
# PyTorch dataset
-dataset = BinSegDataset(bobdb, split='test', transform=transforms)
\ No newline at end of file
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/stare1024.py b/bob/ip/binseg/configs/datasets/stare1024.py
new file mode 100644
index 0000000000000000000000000000000000000000..8f6df507b16aeffb485bc448c57cf8b21f47bda1
--- /dev/null
+++ b/bob/ip/binseg/configs/datasets/stare1024.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from bob.db.stare import Database as STARE
+from bob.ip.binseg.data.transforms import *
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+
+#### Config ####
+
+transforms = Compose([
+ RandomRotation()
+ ,Pad((0,32,0,32))
+ ,Resize(1024)
+ ,CenterCrop(1024)
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,ColorJitter()
+ ,ToTensor()
+ ])
+
+# bob.db.dataset init
+bobdb = STARE(protocol = 'default')
+
+# PyTorch dataset
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/stare1168.py b/bob/ip/binseg/configs/datasets/stare1168.py
new file mode 100644
index 0000000000000000000000000000000000000000..77e934bf6b6f387105df08519932822bcb11cf09
--- /dev/null
+++ b/bob/ip/binseg/configs/datasets/stare1168.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from bob.db.stare import Database as STARE
+from bob.ip.binseg.data.transforms import *
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+
+#### Config ####
+
+transforms = Compose([
+ RandomRotation()
+ ,Crop(50,0,500,705)
+ ,Resize(1168)
+ ,Pad((1,0,1,0))
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,ColorJitter()
+ ,ToTensor()
+ ])
+
+# bob.db.dataset init
+bobdb = STARE(protocol = 'default')
+
+# PyTorch dataset
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/stare544test.py b/bob/ip/binseg/configs/datasets/stare544.py
similarity index 56%
rename from bob/ip/binseg/configs/datasets/stare544test.py
rename to bob/ip/binseg/configs/datasets/stare544.py
index 09b268737d08be21890ddde620769ec4e37bc874..08c2ad4fb8f4610d6213cb3357d0e4bd491a4f3f 100644
--- a/bob/ip/binseg/configs/datasets/stare544test.py
+++ b/bob/ip/binseg/configs/datasets/stare544.py
@@ -7,9 +7,13 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
#### Config ####
-transforms = Compose([
- Resize(471)
+transforms = Compose([ RandomRotation()
+ ,Resize(471)
,Pad((0,37,0,36))
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,ColorJitter()
+ ,ToTensor()
,ToTensor()
])
@@ -17,4 +21,4 @@ transforms = Compose([
bobdb = STARE(protocol = 'default')
# PyTorch dataset
-dataset = BinSegDataset(bobdb, split='test', transform=transforms)
\ No newline at end of file
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/configs/datasets/stare960.py b/bob/ip/binseg/configs/datasets/stare960.py
new file mode 100644
index 0000000000000000000000000000000000000000..0d1ed7883cb746f469534ad2a29f491501e7566e
--- /dev/null
+++ b/bob/ip/binseg/configs/datasets/stare960.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+from bob.db.stare import Database as STARE
+from bob.ip.binseg.data.transforms import *
+from bob.ip.binseg.data.binsegdataset import BinSegDataset
+
+#### Config ####
+
+transforms = Compose([
+ RandomRotation()
+ ,Pad((0,32,0,32))
+ ,Resize(960)
+ ,CenterCrop(960)
+ ,RandomHFlip()
+ ,RandomVFlip()
+ ,ColorJitter()
+ ,ToTensor()
+ ])
+
+# bob.db.dataset init
+bobdb = STARE(protocol = 'default')
+
+# PyTorch dataset
+dataset = BinSegDataset(bobdb, split='train', transform=transforms)
\ No newline at end of file
diff --git a/bob/ip/binseg/engine/trainer.py b/bob/ip/binseg/engine/trainer.py
index a260ab0de0a6444d8449c7338d776238ec4da8cd..f06fb8d8e9ed396d24c1b810c46e1ac362056e9c 100644
--- a/bob/ip/binseg/engine/trainer.py
+++ b/bob/ip/binseg/engine/trainer.py
@@ -55,7 +55,7 @@ def do_train(
max_epoch = arguments["max_epoch"]
# Logg to file
- with open (os.path.join(output_folder,"{}_trainlog.csv".format(model.name)), "a+") as outfile:
+ with open (os.path.join(output_folder,"{}_trainlog.csv".format(model.name)), "a+", 1) as outfile:
model.train().to(device)
# Total training timer
diff --git a/bob/ip/binseg/utils/model_zoo.py b/bob/ip/binseg/utils/model_zoo.py
index 8bc7c931e0e05d682e03cc52c22413c2f185965e..dbeeecf5d7697de18a4186cc798b4c57b5bdf038 100644
--- a/bob/ip/binseg/utils/model_zoo.py
+++ b/bob/ip/binseg/utils/model_zoo.py
@@ -33,7 +33,6 @@ modelurls = {
"resnet50": "https://download.pytorch.org/models/resnet50-19c8e357.pth",
"resnet101": "https://download.pytorch.org/models/resnet101-5d3b4d8f.pth",
"resnet152": "https://download.pytorch.org/models/resnet152-b121ed2d.pth",
- "resnet50_SIN_IN": "https://bitbucket.org/robert_geirhos/texture-vs-shape-pretrained-models/raw/60b770e128fffcbd8562a3ab3546c1a735432d03/resnet50_finetune_60_epochs_lr_decay_after_30_start_resnet50_train_45_epochs_combined_IN_SF-ca06340c.pth.tar",
"mobilenetv2": "https://dl.dropboxusercontent.com/s/4nie4ygivq04p8y/mobilenet_v2.pth.tar",
}
diff --git a/setup.py b/setup.py
index 8b82e9b20a4badd7c8af70a37dea541e41d9fb56..1f45161c763c3afc916cef87c12886ee0a7dfc53 100644
--- a/setup.py
+++ b/setup.py
@@ -63,12 +63,10 @@ setup(
'M2UNet = bob.ip.binseg.configs.models.m2unet',
'UNet = bob.ip.binseg.configs.models.unet',
'ResUNet = bob.ip.binseg.configs.models.resunet',
- 'ShapeResUNet = bob.ip.binseg.configs.models.shaperesunet',
- 'ALLVESSEL544 = bob.ip.binseg.configs.datasets.allvessel544',
- 'ALLVESSEL544TEST = bob.ip.binseg.configs.datasets.allvessel544test',
'CHASEDB1 = bob.ip.binseg.configs.datasets.chasedb1',
+ 'CHASEDB11024 = bob.ip.binseg.configs.datasets.chasedb11024',
+ 'CHASEDB11168 = bob.ip.binseg.configs.datasets.chasedb11168',
'CHASEDB1TEST = bob.ip.binseg.configs.datasets.chasedb1test',
- 'CHASEDB1544TEST = bob.ip.binseg.configs.datasets.chasedb1544test',
'DRIONSDB = bob.ip.binseg.configs.datasets.drionsdb',
'DRIONSDBTEST = bob.ip.binseg.configs.datasets.drionsdbtest',
'DRISHTIGS1OD = bob.ip.binseg.configs.datasets.dristhigs1od',
@@ -76,15 +74,20 @@ setup(
'DRISHTIGS1CUP = bob.ip.binseg.configs.datasets.dristhigs1cup',
'DRISHTIGS1CUPTEST = bob.ip.binseg.configs.datasets.dristhigs1cuptest',
'DRIVE = bob.ip.binseg.configs.datasets.drive',
+ 'DRIVE960 = bob.ip.binseg.configs.datasets.drive960',
+ 'DRIVE1024 = bob.ip.binseg.configs.datasets.drive1024',
+ 'DRIVE1168 = bob.ip.binseg.configs.datasets.drive1168',
'DRIVETEST = bob.ip.binseg.configs.datasets.drivetest',
+ 'DRIVESTARECHASEDB1IOSTAR1168 = bob.ip.binseg.configs.datasets.drivestarechasedb1iostar1168',
'HRF = bob.ip.binseg.configs.datasets.hrf',
+ 'HRF1168 = bob.ip.binseg.configs.datasets.hrf1168',
'HRFTEST = bob.ip.binseg.configs.datasets.hrftest',
- 'HRF544TEST = bob.ip.binseg.configs.datasets.hrf544test',
'IOSTAROD = bob.ip.binseg.configs.datasets.iostarod',
'IOSTARODTEST = bob.ip.binseg.configs.datasets.iostarodtest',
'IOSTARVESSEL = bob.ip.binseg.configs.datasets.iostarvessel',
+ 'IOSTARVESSEL960 = bob.ip.binseg.configs.datasets.iostarvessel960',
+ 'IOSTARVESSEL1168 = bob.ip.binseg.configs.datasets.iostarvessel1168',
'IOSTARVESSELTEST = bob.ip.binseg.configs.datasets.iostarvesseltest',
- 'IOSTARVESSEL544TEST = bob.ip.binseg.configs.datasets.iostarvessel544test',
'REFUGECUP = bob.ip.binseg.configs.datasets.refugecup',
'REFUGECUPTEST = bob.ip.binseg.configs.datasets.refugecuptest',
'REFUGEOD = bob.ip.binseg.configs.datasets.refugeod',
@@ -94,8 +97,10 @@ setup(
'RIMONER3OD = bob.ip.binseg.configs.datasets.rimoner3od',
'RIMONER3ODTEST = bob.ip.binseg.configs.datasets.rimoner3odtest',
'STARE = bob.ip.binseg.configs.datasets.stare',
+ 'STARE960 = bob.ip.binseg.configs.datasets.stare960',
+ 'STARE1024 = bob.ip.binseg.configs.datasets.stare1024',
+ 'STARE1168 = bob.ip.binseg.configs.datasets.stare1168',
'STARETEST = bob.ip.binseg.configs.datasets.staretest',
- 'STARE544TEST = bob.ip.binseg.configs.datasets.stare544test',
]
},