Merge everything from ssl to master

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

+#!/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
+import torch
+
+#### 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
+train = BinSegDataset(bobdb, split='train', transform=transforms)
+test = BinSegDataset(bobdb, split='test', transform=transforms)
+
+dataset = torch.utils.data.ConcatDataset([train,test])
\ No newline at end of file

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

+#!/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
+import torch
+
+#### 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
+train = BinSegDataset(bobdb, split='train', transform=transforms)
+test = BinSegDataset(bobdb, split='test', transform=transforms)
+
+dataset = torch.utils.data.ConcatDataset([train,test])
\ No newline at end of file

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

@@ -8,11 +8,19 @@ from bob.ip.binseg.data.binsegdataset import BinSegDataset
 #### Config ####
 
 transforms = Compose([  
+<<<<<<< HEAD:bob/ip/binseg/configs/datasets/chasedb1544.py
                         RandomRotation()
                         ,Resize(544)
                         ,Crop(0,12,544,544)
                         ,RandomHFlip()
                         ,RandomVFlip()
+=======
+                        Resize(544)
+                        ,Crop(0,12,544,544)
+                        ,RandomHFlip()
+                        ,RandomVFlip()
+                        ,RandomRotation()
+>>>>>>> ssl:bob/ip/binseg/configs/datasets/chasedb1544.py
                         ,ColorJitter()
                         ,ToTensor()
                     ])

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

+#!/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()
+                        ,CenterCrop((829,960))                    
+                        ,Resize(608)
+                        ,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

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

+#!/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
+import torch
+
+#### Config ####
+
+transforms = Compose([  
+                        RandomRotation()
+                        ,CenterCrop((540,540))
+                        ,Resize(1024)
+                        ,RandomHFlip()
+                        ,RandomVFlip()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+bobdb = DRIVE(protocol = 'default')
+
+# PyTorch dataset
+train = BinSegDataset(bobdb, split='train', transform=transforms)
+test = BinSegDataset(bobdb, split='test', transform=transforms)
+
+dataset = torch.utils.data.ConcatDataset([train,test])
\ No newline at end of file

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

+#!/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
+import torch
+
+#### Config ####
+
+transforms = Compose([  
+                        RandomRotation()
+                        ,Crop(75,10,416,544)
+                        ,Pad((21,0,22,0))
+                        ,Resize(1168)
+                        ,RandomHFlip()
+                        ,RandomVFlip()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+bobdb = DRIVE(protocol = 'default')
+
+# PyTorch dataset
+train = BinSegDataset(bobdb, split='train', transform=transforms)
+test = BinSegDataset(bobdb, split='test', transform=transforms)
+
+dataset = torch.utils.data.ConcatDataset([train,test])
\ No newline at end of file

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

+#!/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
+import torch
+#### Config ####
+
+transforms = Compose([  
+                        RandomRotation()
+                        ,CenterCrop((544,544))
+                        ,Resize(960)
+                        ,RandomHFlip()
+                        ,RandomVFlip()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+bobdb = DRIVE(protocol = 'default')
+
+# PyTorch dataset
+train = BinSegDataset(bobdb, split='train', transform=transforms)
+test = BinSegDataset(bobdb, split='test', transform=transforms)
+
+dataset = torch.utils.data.ConcatDataset([train,test])
\ No newline at end of file

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

+from bob.ip.binseg.configs.datasets.drive608 import dataset as drive
+from bob.ip.binseg.configs.datasets.chasedb1608 import dataset as chase
+from bob.ip.binseg.configs.datasets.iostarvessel608 import dataset as iostar
+from bob.ip.binseg.configs.datasets.hrf608 import dataset as hrf
+import torch
+
+#### Config ####
+
+# PyTorch dataset
+dataset = torch.utils.data.ConcatDataset([drive,chase,iostar,hrf])
\ No newline at end of file

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

+from bob.ip.binseg.configs.datasets.drive608 import dataset as drive
+from bob.ip.binseg.configs.datasets.chasedb1608 import dataset as chase
+from bob.ip.binseg.configs.datasets.iostarvessel608 import dataset as iostar
+from bob.ip.binseg.configs.datasets.hrf608 import dataset as hrf
+from bob.db.stare import Database as STARE
+from bob.ip.binseg.data.transforms import *
+import torch
+from bob.ip.binseg.data.binsegdataset import BinSegDataset, SSLBinSegDataset, UnLabeledBinSegDataset
+
+
+#### Config ####
+
+# PyTorch dataset
+labeled_dataset = torch.utils.data.ConcatDataset([drive,chase,iostar,hrf])
+
+#### Unlabeled STARE TRAIN ####
+unlabeled_transforms = Compose([  
+                        Pad((2,1,2,2))
+                        ,RandomHFlip()
+                        ,RandomVFlip()
+                        ,RandomRotation()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+starebobdb = STARE(protocol = 'default')
+
+# PyTorch dataset
+unlabeled_dataset = UnLabeledBinSegDataset(starebobdb, split='train', transform=unlabeled_transforms)
+
+# SSL Dataset
+
+dataset = SSLBinSegDataset(labeled_dataset, unlabeled_dataset)
\ No newline at end of file

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

+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
+import torch
+
+#### Config ####
+
+# PyTorch dataset
+dataset = torch.utils.data.ConcatDataset([drive,stare,chase])
\ No newline at end of file

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

@@ -7,4 +7,8 @@ import torch
 #### Config ####
 
 # PyTorch dataset
-dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,chase])
\ No newline at end of file
+<<<<<<< HEAD
+dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,chase])
+=======
+dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,chase])
+>>>>>>> ssl

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

+from bob.ip.binseg.configs.datasets.drive1024 import dataset as drive
+from bob.ip.binseg.configs.datasets.stare1024 import dataset as stare
+from bob.ip.binseg.configs.datasets.hrf1024 import dataset as hrf
+from bob.ip.binseg.configs.datasets.chasedb11024 import dataset as chasedb
+from bob.db.iostar import Database as IOSTAR
+from bob.ip.binseg.data.transforms import *
+import torch
+from bob.ip.binseg.data.binsegdataset import BinSegDataset, SSLBinSegDataset, UnLabeledBinSegDataset
+
+
+#### Config ####
+
+# PyTorch dataset
+labeled_dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,chasedb])
+
+#### Unlabeled IOSTAR Train ####
+unlabeled_transforms = Compose([  
+                        RandomHFlip()
+                        ,RandomVFlip()
+                        ,RandomRotation()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+iostarbobdb = IOSTAR(protocol='default_vessel')
+
+# PyTorch dataset
+unlabeled_dataset = UnLabeledBinSegDataset(iostarbobdb, split='train', transform=unlabeled_transforms)
+
+# SSL Dataset
+
+dataset = SSLBinSegDataset(labeled_dataset, unlabeled_dataset)
\ No newline at end of file

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

+from bob.ip.binseg.configs.datasets.drive1024all import dataset as drive
+from bob.ip.binseg.configs.datasets.stare1024all import dataset as stare
+from bob.ip.binseg.configs.datasets.hrf1024all import dataset as hrf
+from bob.ip.binseg.configs.datasets.chasedb11024all import dataset as chasedb
+from bob.db.iostar import Database as IOSTAR
+from bob.ip.binseg.data.transforms import *
+import torch
+
+
+#### Config ####
+
+# PyTorch dataset
+dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,chasedb])
+

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

+from bob.ip.binseg.configs.datasets.drive1024all import dataset as drive
+from bob.ip.binseg.configs.datasets.stare1024all import dataset as stare
+from bob.ip.binseg.configs.datasets.hrf1024all import dataset as hrf
+from bob.ip.binseg.configs.datasets.chasedb11024all import dataset as chasedb
+from bob.db.iostar import Database as IOSTAR
+from bob.ip.binseg.data.transforms import *
+import torch
+from bob.ip.binseg.data.binsegdataset import BinSegDataset, SSLBinSegDataset, UnLabeledBinSegDataset
+
+
+#### Config ####
+
+# PyTorch dataset
+labeled_dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,chasedb])
+
+#### Unlabeled IOSTAR Train ####
+unlabeled_transforms = Compose([  
+                        RandomHFlip()
+                        ,RandomVFlip()
+                        ,RandomRotation()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+iostarbobdb = IOSTAR(protocol='default_vessel')
+
+# PyTorch dataset
+unlabeled_dataset = UnLabeledBinSegDataset(iostarbobdb, split='train', transform=unlabeled_transforms)
+
+# SSL Dataset
+
+dataset = SSLBinSegDataset(labeled_dataset, unlabeled_dataset)
\ No newline at end of file

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

+from bob.ip.binseg.configs.datasets.drive1168all import dataset as drive
+from bob.ip.binseg.configs.datasets.stare1168all import dataset as stare
+from bob.ip.binseg.configs.datasets.chasedb11168all import dataset as chasedb
+from bob.ip.binseg.configs.datasets.iostarvessel1168all import dataset as iostar
+from bob.db.hrf import Database as HRF
+from bob.ip.binseg.data.transforms import *
+import torch
+
+
+#### Config ####
+
+# PyTorch dataset
+dataset = torch.utils.data.ConcatDataset([drive,stare,iostar,chasedb])
\ No newline at end of file

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

+from bob.ip.binseg.configs.datasets.drive1168all import dataset as drive
+from bob.ip.binseg.configs.datasets.stare1168all import dataset as stare
+from bob.ip.binseg.configs.datasets.chasedb11168all import dataset as chasedb
+from bob.ip.binseg.configs.datasets.iostarvessel1168all import dataset as iostar
+from bob.db.hrf import Database as HRF
+from bob.ip.binseg.data.transforms import *
+import torch
+from bob.ip.binseg.data.binsegdataset import BinSegDataset, SSLBinSegDataset, UnLabeledBinSegDataset
+
+
+#### Config ####
+
+# PyTorch dataset
+labeled_dataset = torch.utils.data.ConcatDataset([drive,stare,iostar,chasedb])
+
+#### Unlabeled HRF TRAIN ####
+unlabeled_transforms = Compose([  
+                        RandomRotation()
+                        ,Crop(0,108,2336,3296)
+                        ,Resize((1168))
+                        ,RandomHFlip()
+                        ,RandomVFlip()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+hrfbobdb = HRF(protocol='default')
+
+# PyTorch dataset
+unlabeled_dataset = UnLabeledBinSegDataset(hrfbobdb, split='train', transform=unlabeled_transforms)
+
+# SSL Dataset
+
+dataset = SSLBinSegDataset(labeled_dataset, unlabeled_dataset)
\ No newline at end of file

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

+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 chasedb
+from bob.ip.binseg.configs.datasets.iostarvessel1168 import dataset as iostar
+from bob.db.hrf import Database as HRF
+from bob.ip.binseg.data.transforms import *
+import torch
+from bob.ip.binseg.data.binsegdataset import BinSegDataset, SSLBinSegDataset, UnLabeledBinSegDataset
+
+
+#### Config ####
+
+# PyTorch dataset
+labeled_dataset = torch.utils.data.ConcatDataset([drive,stare,iostar,chasedb])
+
+#### Unlabeled HRF TRAIN ####
+unlabeled_transforms = Compose([  
+                        RandomRotation()
+                        ,Crop(0,108,2336,3296)
+                        ,Resize((1168))
+                        ,RandomHFlip()
+                        ,RandomVFlip()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+hrfbobdb = HRF(protocol='default')
+
+# PyTorch dataset
+unlabeled_dataset = UnLabeledBinSegDataset(hrfbobdb, split='train', transform=unlabeled_transforms)
+
+# SSL Dataset
+
+dataset = SSLBinSegDataset(labeled_dataset, unlabeled_dataset)
\ No newline at end of file

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

@@ -7,4 +7,8 @@ import torch
 #### Config ####
 
 # PyTorch dataset
-dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,iostar])
\ No newline at end of file
+<<<<<<< HEAD
+dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,iostar])
+=======
+dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,iostar])
+>>>>>>> ssl

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

+from bob.ip.binseg.configs.datasets.drive960all import dataset as drive
+from bob.ip.binseg.configs.datasets.stare960all import dataset as stare
+from bob.ip.binseg.configs.datasets.hrf960all import dataset as hrf
+from bob.ip.binseg.configs.datasets.iostarvessel960all import dataset as iostar
+from bob.db.chasedb1 import Database as CHASE
+from bob.db.hrf import Database as HRF
+from bob.ip.binseg.data.transforms import *
+import torch
+
+
+#### Config ####
+
+# PyTorch dataset
+dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,iostar])
\ No newline at end of file

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

+from bob.ip.binseg.configs.datasets.drive960all import dataset as drive
+from bob.ip.binseg.configs.datasets.stare960all import dataset as stare
+from bob.ip.binseg.configs.datasets.hrf960all import dataset as hrf
+from bob.ip.binseg.configs.datasets.iostarvessel960all import dataset as iostar
+from bob.db.chasedb1 import Database as CHASE
+from bob.db.hrf import Database as HRF
+from bob.ip.binseg.data.transforms import *
+import torch
+from bob.ip.binseg.data.binsegdataset import BinSegDataset, SSLBinSegDataset, UnLabeledBinSegDataset
+
+
+#### Config ####
+
+# PyTorch dataset
+labeled_dataset = torch.utils.data.ConcatDataset([drive,stare,hrf,iostar])
+
+#### Unlabeled CHASE TRAIN ####
+unlabeled_transforms = Compose([  
+                        Crop(0,18,960,960)
+                        ,RandomHFlip()
+                        ,RandomVFlip()
+                        ,RandomRotation()
+                        ,ColorJitter()
+                        ,ToTensor()
+                    ])
+
+# bob.db.dataset init
+chasebobdb = CHASE(protocol = 'default')
+
+# PyTorch dataset
+unlabeled_dataset = UnLabeledBinSegDataset(chasebobdb, split='train', transform=unlabeled_transforms)
+
+# SSL Dataset
+
+dataset = SSLBinSegDataset(labeled_dataset, unlabeled_dataset)
\ No newline at end of file