From 9059450fb0bfc13e47d04ea29710dafe86e7b656 Mon Sep 17 00:00:00 2001
From: Manuel Gunther <siebenkopf@googlemail.com>
Date: Thu, 28 Jan 2016 14:15:59 -0700
Subject: [PATCH] Using --parallel option from base script in grid_search
---
bob/bio/base/script/__init__.py | 1 +
bob/bio/base/script/grid_search.py | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/bob/bio/base/script/__init__.py b/bob/bio/base/script/__init__.py
index f2d91fd1..58dc7690 100644
--- a/bob/bio/base/script/__init__.py
+++ b/bob/bio/base/script/__init__.py
@@ -1 +1,2 @@
from . import verify
+from . import grid_search
diff --git a/bob/bio/base/script/grid_search.py b/bob/bio/base/script/grid_search.py
index 3ccea817..8294d0f0 100755
--- a/bob/bio/base/script/grid_search.py
+++ b/bob/bio/base/script/grid_search.py
@@ -75,7 +75,7 @@ def command_line_options(command_line_parameters):
help = 'Split the gridtk databases after the following level -1 - never split; 0 - preprocess; 1 - extract; 2 -- project; 3 -- enroll; 4 -- score;')
parser.add_argument('-x', '--executable', metavar='X',
- help = '(optional) The executable to be executed instead of bob/bio/base/verify.py (taken *always* from bob.bio.base, not from the bin directory)')
+ help = '(optional) The executable to be executed instead of bob/bio/base/verify.py (which is taken *always* from bob.bio.base, not from the bin directory)')
parser.add_argument('-R', '--result-directory', metavar='DIR',
help = 'The directory where to write the resulting score files to.')
@@ -282,7 +282,7 @@ def execute_dependent_task(command_line, directories, dependency_level):
if args.grid:
command_line += ['--grid', args.grid, '--stop-on-failure']
if args.parallel:
- command_line += ['--grid', 'bob.bio.base.grid.Grid("local", number_of_parallel_processes=%d)' % args.parallel, '--run-local-scheduler', '--stop-on-failure']
+ command_line += ['--parallel', str(args.parallel)]
if args.verbose:
command_line += ['-' + 'v'*args.verbose]
--
GitLab