From b4465fefb4ac3bc1841edea2b3960ad6332efd2f Mon Sep 17 00:00:00 2001
From: Tim Laibacher <tim.laibacher@idiap.ch>
Date: Wed, 19 Jun 2019 10:39:11 +0200
Subject: [PATCH] Tidy up and add upscale configs
---
.../binseg/configs/datasets/allvessel544.py | 90 -------------------
.../configs/datasets/allvessel544test.py | 86 ------------------
bob/ip/binseg/configs/datasets/amdrive.py | 78 ----------------
bob/ip/binseg/configs/datasets/amdrivetest.py | 73 ---------------
.../binseg/configs/datasets/chasedb11024.py | 24 +++++
.../binseg/configs/datasets/chasedb11168.py | 24 +++++
.../{chasedb1544test.py => chasedb1544.py} | 10 ++-
bob/ip/binseg/configs/datasets/drive1024.py | 4 +-
.../binseg/configs/datasets/drive1024test.py | 20 -----
.../datasets/{drive2336.py => drive1168.py} | 6 +-
.../binseg/configs/datasets/drive2336test.py | 21 -----
bob/ip/binseg/configs/datasets/drive608.py | 4 +-
.../binseg/configs/datasets/drive608test.py | 21 -----
bob/ip/binseg/configs/datasets/drive960.py | 4 +-
.../binseg/configs/datasets/drive960test.py | 20 -----
.../datasets/drivestarechasedb1iostar1168.py | 10 +++
.../datasets/{hrf544test.py => hrf1168.py} | 10 ++-
.../configs/datasets/iostarvessel1168.py | 25 ++++++
...tarvessel544test.py => iostarvessel960.py} | 8 +-
bob/ip/binseg/configs/datasets/stare1024.py | 25 ++++++
bob/ip/binseg/configs/datasets/stare1168.py | 25 ++++++
.../datasets/{stare544test.py => stare544.py} | 10 ++-
bob/ip/binseg/configs/datasets/stare960.py | 25 ++++++
bob/ip/binseg/engine/trainer.py | 2 +-
bob/ip/binseg/utils/model_zoo.py | 1 -
setup.py | 19 ++--
26 files changed, 207 insertions(+), 438 deletions(-)
delete mode 100644 bob/ip/binseg/configs/datasets/allvessel544.py
delete mode 100644 bob/ip/binseg/configs/datasets/allvessel544test.py
delete mode 100644 bob/ip/binseg/configs/datasets/amdrive.py
delete mode 100644 bob/ip/binseg/configs/datasets/amdrivetest.py
create mode 100644 bob/ip/binseg/configs/datasets/chasedb11024.py
create mode 100644 bob/ip/binseg/configs/datasets/chasedb11168.py
rename bob/ip/binseg/configs/datasets/{chasedb1544test.py => chasedb1544.py} (58%)
delete mode 100644 bob/ip/binseg/configs/datasets/drive1024test.py
rename bob/ip/binseg/configs/datasets/{drive2336.py => drive1168.py} (82%)
delete mode 100644 bob/ip/binseg/configs/datasets/drive2336test.py
delete mode 100644 bob/ip/binseg/configs/datasets/drive608test.py
delete mode 100644 bob/ip/binseg/configs/datasets/drive960test.py
create mode 100644 bob/ip/binseg/configs/datasets/drivestarechasedb1iostar1168.py
rename bob/ip/binseg/configs/datasets/{hrf544test.py => hrf1168.py} (54%)
create mode 100644 bob/ip/binseg/configs/datasets/iostarvessel1168.py
rename bob/ip/binseg/configs/datasets/{iostarvessel544test.py => iostarvessel960.py} (59%)
create mode 100644 bob/ip/binseg/configs/datasets/stare1024.py
create mode 100644 bob/ip/binseg/configs/datasets/stare1168.py
rename bob/ip/binseg/configs/datasets/{stare544test.py => stare544.py} (56%)
create mode 100644 bob/ip/binseg/configs/datasets/stare960.py
diff --git a/bob/ip/binseg/configs/datasets/allvessel544.py b/bob/ip/binseg/configs/datasets/allvessel544.py
deleted file mode 100644
index 9044cebc..00000000
--- 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 55994e9e..00000000
--- 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 6f7cc310..00000000
--- 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 026ac236..00000000
--- 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 00000000..028f10fb
--- /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 00000000..d221ea48
--- /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 aa5d00a5..9d94cd3c 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 d5f08ff8..dae199f5 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 9e9cb3e9..00000000
--- 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 30ec9af8..3f0f0537 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 9ce3b649..00000000
--- 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 64037a07..65bc5e65 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 7c597136..00000000
--- 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 f0d06b78..ab3ac5a9 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 041fa775..00000000
--- 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 00000000..62e2972d
--- /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 86da428b..4d0c4d9e 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 00000000..5da5ed1e
--- /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 e3ccd854..32feec85 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 00000000..8f6df507
--- /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 00000000..77e934bf
--- /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 09b26873..08c2ad4f 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 00000000..0d1ed788
--- /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 a260ab0d..f06fb8d8 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 8bc7c931..dbeeecf5 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 8b82e9b2..1f45161c 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',
]
},
--
GitLab