Removed obsolete flags and files

Author: Confusezius

Revisit_Runs.sh Sample_Runs/ICML2020_RevisitDML_SampleRuns.sh

@@ -1,3 +1,6 @@
+python main.py --kernels 6 --source /home/karsten_dl/Dropbox/Projects/Datasets --n_epochs 150 --seed 0 --gpu 1 --bs 112 --samples_per_class 2 --loss npair --batch_mining npair --arch resnet50_frozen
+
+
 """============= Baseline Runs --- CUB200-2011 ===================="""
 python main.py --kernels 6 --source $datapath --n_epochs 150 --log_online --project RevisitDML --group CUB_Npair --seed 0 --gpu 0 --bs 112 --samples_per_class 2 --loss npair --batch_mining npair --arch resnet50_frozen
 python main.py --kernels 6 --source $datapath --n_epochs 150 --log_online --project RevisitDML --group CUB_Npair --seed 1 --gpu 0 --bs 112 --samples_per_class 2 --loss npair --batch_mining npair --arch resnet50_frozen

architectures/__init__.py

@@ -1,14 +1,8 @@
 import architectures.resnet50
 import architectures.googlenet
 import architectures.bninception
-import architectures.multifeature_resnet50
-import architectures.multifeature_bninception
 
 def select(arch, opt):
-    if  'multifeature_resnet50' in arch:
-        return multifeature_resnet50.Network(opt)
-    if  'multifeature_bninception' in arch:
-        return multifeature_bninception.Network(opt)
     if 'resnet50' in arch:
         return resnet50.Network(opt)
     if 'googlenet' in arch:

architectures/multifeature_bninception.py

@@ -1,4 +1,4 @@
-from batchminer import random_distance, diva_shared_distance_apn, diva_shared_distance_an, intra_random
+from batchminer import random_distance, intra_random
 from batchminer import lifted, rho_distance, softhard, npair, parametric, random, semihard, distance
 
 BATCHMINING_METHODS = {'random':random,
@@ -10,9 +10,7 @@
                        'parametric':parametric,
                        'lifted':lifted,
                        'random_distance': random_distance,
-                       'intra_random': intra_random,
-                       'shared_full_distance': diva_shared_distance_apn,
-                       'shared_neg_distance':  diva_shared_distance_an}
+                       'intra_random': intra_random}
 
 
 def select(batchminername, opt):

architectures/multifeature_resnet50.py

@@ -4,7 +4,7 @@
 from criteria import angular, snr, histogram, arcface
 from criteria import softtriplet, multisimilarity, quadruplet
 ### Non-Standard Criteria
-from criteria import moco, adversarial_separation, fast_moco, invariant_spread, dc, imrot
+from criteria import adversarial_separation
 ### Basic Libs
 import copy
 
@@ -26,12 +26,7 @@ def select(loss, opt, to_optim, batchminer=None):
               'softtriplet':softtriplet,
               'arcface':arcface,
               'quadruplet':quadruplet,
-              'adversarial_separation':adversarial_separation,
-              'moco': moco,
-              'dc':dc,
-              'imrot':imrot,
-              'fast_moco':fast_moco,
-              'invariantspread':invariant_spread}
+              'adversarial_separation':adversarial_separation}
 
 
     if loss not in losses: raise NotImplementedError('Loss {} not implemented!'.format(loss))