From ef664d0635742d278d03f14d181a8a44ee8c5140 Mon Sep 17 00:00:00 2001
From: Manuel Gunther <siebenkopf@googlemail.com>
Date: Fri, 30 Oct 2015 16:23:49 -0600
Subject: [PATCH] Fixed documented step keywords in grid_search; added check
for steps
---
bob/bio/base/script/grid_search.py | 3 +++
doc/more.rst | 2 +-
requirements.txt | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/bob/bio/base/script/grid_search.py b/bob/bio/base/script/grid_search.py
index 372f78fa..12ead1f6 100755
--- a/bob/bio/base/script/grid_search.py
+++ b/bob/bio/base/script/grid_search.py
@@ -264,6 +264,9 @@ def check_requirements(replacements):
global configuration
values = {}
for key in configuration.replace:
+ # check that the key is one of the known steps
+ if key not in steps:
+ raise ValueError("The step '%s' defined in the configuration file is unknown; choose one of %s" % (key, steps))
values.update(extract_values(configuration.replace[key], replacements))
for requirement in configuration.requirements:
test = replace(requirement, values)
diff --git a/doc/more.rst b/doc/more.rst
index 4141d38a..37c4489f 100644
--- a/doc/more.rst
+++ b/doc/more.rst
@@ -74,7 +74,7 @@ The variables 1. to 3. can also be overridden by the command line options ``--pr
The ``replace`` variable has to be set as a dictionary.
In it, you can define with which values your place holder key should be filled, and in which step of the tool chain execution this should happen.
-The steps are ``'preprocessing'``, ``'extraction'``, ``'projection'``, ``'enrollment'`` and ``'scoring'``.
+The steps are ``'preprocess'``, ``'extract'``, ``'project'``, ``'enroll'`` and ``'score'``.
For each of the steps, it can be defined, which placeholder should be replaced by which values.
To be able to differentiate the results later on, each of the replacement values is bound to a directory name.
The final structure looks somewhat like that:
diff --git a/requirements.txt b/requirements.txt
index 5dd5955e..a9e9258f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ bob.core
bob.io.base
bob.learn.activation
bob.math
-bob.learn.linear==2.0.6
+bob.learn.linear
bob.sp
bob.learn.em
bob.measure
--
GitLab