Remove unused resources

.gitlab-ci.yml

@@ -12,5 +12,6 @@ py27-conda-idiap:
     - ./bin/bob_dbmanage.py vera download
     - ./bin/nosetests -sv bob.bio.vein
     - ./bin/sphinx-build doc html
+    - ./bin/resources.py -d
   tags:
     - lidiap2015

bob/bio/vein/configurations/grid/demanding.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-import bob.bio.base.grid import Grid
+from bob.bio.base.grid import Grid
 
 
 grid = Grid(
     training_queue='32G',
 
-    number_of_preprocessings_per_job=200,
+    number_of_preprocessing_jobs=200,
     preprocessing_queue='4G',
 
     number_of_extraction_jobs=200,

bob/bio/vein/configurations/grid/gbu.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-import bob.bio.base.grid import Grid
-
-
-grid = Grid(
-    training_queue = '32G',
-
-    number_of_preprocessing_jobs = 1000,
-    preprocessing_queue = '8G',
-
-    number_of_extraction_jobs = 100,
-    extraction_queue = '8G',
-
-    number_of_projection_jobs = 100,
-    projection_queue = '8G',
-
-    number_of_enrollment_jobs = 100,
-    enrollment_queue = '8G',
-
-    number_of_scoring_jobs = 10,
-    scoring_queue = '8G'
-    )

bob/bio/vein/configurations/grid/grid.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-import bob.bio.base.grid import Grid
-
-
-grid = Grid()

bob/bio/vein/configurations/grid/local.py

 #!/usr/bin/env python
 # vim: set fileencoding=utf-8 :
 
-import bob.bio.base.grid import Grid
-
+from bob.bio.base.grid import Grid
 
 grid = Grid(
-  grid = 'local',
-  number_of_parallel_processes = 4
-)
-
-grid_p16 = Grid(
-  number_of_preprocessing_jobs = 50,
-  number_of_extraction_jobs = 50,
-  number_of_projection_jobs = 50,
-  number_of_enrollment_jobs = 10,
-  number_of_scoring_jobs = 10,
-  grid = 'local',
+  grid_type = 'local',
   number_of_parallel_processes = 4
 )

bob/bio/vein/configurations/grid/very_demanding.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-import bob.bio.base.grid import Grid
-
-
-grid = Grid(
-    training_queue = '64G',
-
-    number_of_preprocessing_jobs = 100,
-    preprocessing_queue = '4G',
-
-    number_of_extraction_jobs = 100,
-    extraction_queue = '8G-io-big',
-
-    number_of_projection_jobs = 20,
-    projection_queue = '8G-io-big',
-
-    number_of_enrollment_jobs = 2,
-    enrollment_queue = '8G-io-big',
-
-    number_of_scoring_jobs = 1,
-    scoring_queue = '8G-io-big'
-    )

bob/bio/vein/configurations/preprocessors.py

+#!/usr/bin/env python
+# vim: set fileencoding=utf-8 :
+
+from ..preprocessors import FingerCrop
+nonorm = FingerCrop()
+he = FingerCrop(postprocessing='HE')
+hfe = FingerCrop(postprocessing='HFE')
+circgabor = FingerCrop(postprocessing='CircGabor')

bob/bio/vein/configurations/preprocessors/finger_crop_None_CircGabor.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-from ...preprocessors import FingerCrop
-preprocessor = FingerCrop(postprocessing='CircGabor')

bob/bio/vein/configurations/preprocessors/finger_crop_None_HE.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-from ...preprocessors import FingerCrop
-preprocessor = FingerCrop(postprocessing='HFE')

bob/bio/vein/configurations/preprocessors/finger_crop_None_HFE.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-from ...preprocessors import FingerCrop
-preprocessor = FingerCrop(postprocessing='HFE')

bob/bio/vein/configurations/preprocessors/finger_crop_None_None.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-from ...preprocessors import FingerCrop
-preprocessor = FingerCrop()

setup.py

@@ -39,11 +39,10 @@ setup(
 
       # registered preprocessors
       'bob.bio.preprocessor': [
-        'none = bob.bio.vein.configurations.preprocessors.finger_crop_None_None:preprocessor',
-        'histeq = bob.bio.vein.configurations.preprocessors.finger_crop_None_HE:preprocessor',
-        'highfreq = bob.bio.vein.configurations.preprocessors.finger_crop_None_HFE:preprocessor',
-        'circGabor = bob.bio.vein.configurations.preprocessors.finger_crop_None_CircGabor:preprocessor',
-
+        'nonorm = bob.bio.vein.configurations.preprocessors:nonorm',
+        'histeq = bob.bio.vein.configurations.preprocessors:he',
+        'highfreq = bob.bio.vein.configurations.preprocessors:hfe',
+        'circgabor = bob.bio.vein.configurations.preprocessors:circgabor',
       ],
 
       # registered feature extractors
@@ -64,14 +63,9 @@ setup(
        ],
 
       # registered SGE grid configuration files
-      'facereclib.grid': [
-        'gpu = bob.bio.vein.configurations.grid.gpu:grid',
-        'gpu2 = bob.bio.vein.configurations.grid.gpu2:grid',
-        'gpu3 = bob.bio.vein.configurations.grid.gpu3:grid',
-        'grid = bob.bio.vein.configurations.grid.grid:grid',
+      'bob.bio.grid': [
+        'local = bob.bio.vein.configurations.grid.local:grid',
         'demanding = bob.bio.vein.configurations.grid.demanding:grid',
-        'very-demanding = bob.bio.vein.configurations.grid.very_demanding:grid',
-        'gbu = bob.bio.vein.configurations.grid.gbu:grid',
       ],
 
       },