Tidy up and add upscale configs

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

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",
     }
 

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',
           ]
     },