Fixed scripts to work with the --parallel option as well.

bob/bio/gmm/__init__.py

 from . import algorithm
 from . import tools
 from . import test
+from . import script
 
 
 def get_config():

bob/bio/gmm/script/__init__.py

+from . import train_gmm
+from . import verify_gmm
+from . import train_isv
+from . import verify_isv
+from . import train_ivector
+from . import verify_ivector

bob/bio/gmm/script/verify_gmm.py

@@ -23,9 +23,6 @@ def parse_arguments(command_line_parameters, exclude_resources_from = []):
   tools.add_parallel_gmm_options(parsers)
 
   # override some parameters
-  parsers['config'].add_argument('-g', '--grid', metavar = 'x', nargs = '+', required=True,
-    help = 'Configuration for the grid setup; required for the parallel execution script.')
-
   parsers['config'].add_argument('-a', '--algorithm', metavar = 'x', nargs = '+', default = ['gmm'],
       help = 'Face recognition; only GMM-related algorithms are allowed')
 
@@ -49,6 +46,9 @@ def parse_arguments(command_line_parameters, exclude_resources_from = []):
       skips = ['preprocessing', 'extractor-training', 'extraction', 'normalization', 'kmeans', 'gmm', 'projection', 'enroller-training', 'enrollment', 'score-computation', 'concatenation', 'calibration']
   )
 
+  if args.grid is None and args.parallel is None:
+    raise ValueError("To be able to run the parallelized ISV script, either the --grid or the --parallel option need to be specified!")
+
   args.skip_projector_training = True
 
   # and add the GMM-related parameters

bob/bio/gmm/script/verify_isv.py

@@ -23,9 +23,6 @@ def parse_arguments(command_line_parameters, exclude_resources_from = []):
   tools.add_parallel_gmm_options(parsers, sub_module = 'isv')
 
   # override some parameters
-  parsers['config'].add_argument('-g', '--grid', metavar = 'x', nargs = '+', required=True,
-    help = 'Configuration for the grid setup; required for the parallel execution script.')
-
   parsers['config'].add_argument('-a', '--algorithm', metavar = 'x', nargs = '+', default = ['isv'],
       help = 'Face recognition; only GMM-related algorithms are allowed')
 
@@ -49,6 +46,9 @@ def parse_arguments(command_line_parameters, exclude_resources_from = []):
       skips = ['preprocessing', 'extractor-training', 'extraction', 'normalization', 'kmeans', 'gmm', 'isv', 'projection', 'enroller-training', 'enrollment', 'score-computation', 'concatenation', 'calibration']
   )
 
+  if args.grid is None and args.parallel is None:
+    raise ValueError("To be able to run the parallelized ISV script, either the --grid or the --parallel option need to be specified!")
+
   args.skip_projector_training = True
 
   # and add the GMM-related parameters

bob/bio/gmm/script/verify_ivector.py

@@ -23,9 +23,6 @@ def parse_arguments(command_line_parameters, exclude_resources_from = []):
   tools.add_parallel_gmm_options(parsers, sub_module = 'ivector')
 
   # override some parameters
-  parsers['config'].add_argument('-g', '--grid', metavar = 'x', nargs = '+', required=True,
-    help = 'Configuration for the grid setup; required for the parallel execution script.')
-
   parsers['config'].add_argument('-a', '--algorithm', metavar = 'x', nargs = '+', default = ['ivector'],
       help = 'Face recognition; only GMM-related algorithms are allowed')
 
@@ -49,6 +46,9 @@ def parse_arguments(command_line_parameters, exclude_resources_from = []):
       skips = ['preprocessing', 'extractor-training', 'extraction', 'normalization', 'kmeans', 'gmm', 'ivector-training', 'ivector-projection', 'train-whitener', 'whitening-projection', 'train-lda', 'lda-projection', 'train-wccn', 'wccn-projection',  'projection', 'train-plda', 'enroller-training', 'enrollment', 'score-computation', 'concatenation', 'calibration']
   )
 
+  if args.grid is None and args.parallel is None:
+    raise ValueError("To be able to run the parallelized ISV script, either the --grid or the --parallel option need to be specified!")
+
   args.skip_projector_training = True
 
   # and add the GMM-related parameters
@@ -175,7 +175,7 @@ def add_ivector_jobs(args, job_ids, deps, submitter):
             dependencies = deps,
             **args.grid.training_queue)
     deps.append(job_ids['plda-training'])
- 
+
    # train PLDA
   job_ids['save-projector'] = submitter.submit(
           '--sub-task save-projector',
@@ -183,7 +183,7 @@ def add_ivector_jobs(args, job_ids, deps, submitter):
           dependencies = deps,
           **args.grid.training_queue)
   deps.append(job_ids['save-projector'])
-         
+
   return job_ids, deps
 
 
@@ -200,7 +200,7 @@ def execute(args):
 
   # now, check what we can do
   algorithm = tools.base(args.algorithm)
-  
+
   # the file selector object
   fs = tools.FileSelector.instance()
 
@@ -275,7 +275,7 @@ def execute(args):
       tools.train_plda(
           algorithm,
           force = args.force)
-        
+
   elif args.sub_task == 'save-projector':
     tools.save_projector(
         algorithm,