From 19d1f287d117ec85052503f687c6313ba9e67554 Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Thu, 25 Jun 2015 16:00:21 +0200
Subject: [PATCH] Fixed is_idiap().
---
bob/bio/base/script/grid_search.py | 6 +++---
bob/bio/base/test/utils.py | 4 ++--
bob/bio/base/tools/command_line.py | 13 +++++++------
doc/experiments.rst | 2 +-
4 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/bob/bio/base/script/grid_search.py b/bob/bio/base/script/grid_search.py
index 5a5131a9..2b3b6ef8 100755
--- a/bob/bio/base/script/grid_search.py
+++ b/bob/bio/base/script/grid_search.py
@@ -8,6 +8,7 @@ from . import verify
import argparse, os, sys
import copy # for deep copies of dictionaries
from .. import utils
+from ..tools import is_idiap
import bob.core
logger = bob.core.log.setup("bob.bio.base")
@@ -110,11 +111,10 @@ def command_line_options(command_line_parameters):
bob.core.log.set_verbosity_level(logger, args.verbose)
# set base directories
- is_idiap = os.path.isdir("/idiap")
if args.temp_directory is None:
- args.temp_directory = "/idiap/temp/%s/grid_search" % os.environ["USER"] if is_idiap else "temp/grid_search"
+ args.temp_directory = "/idiap/temp/%s/grid_search" % os.environ["USER"] if is_idiap() else "temp/grid_search"
if args.result_directory is None:
- args.result_directory = "/idiap/user/%s/grid_search" % os.environ["USER"] if is_idiap else "results/grid_search"
+ args.result_directory = "/idiap/user/%s/grid_search" % os.environ["USER"] if is_idiap() else "results/grid_search"
if args.executable:
diff --git a/bob/bio/base/test/utils.py b/bob/bio/base/test/utils.py
index bf4721b6..353078cf 100644
--- a/bob/bio/base/test/utils.py
+++ b/bob/bio/base/test/utils.py
@@ -54,8 +54,8 @@ def grid_available(test):
try:
import gridtk
return test(*args, **kwargs)
- except ImportError:
- raise SkipTest("Skipping test since gridtk is not available")
+ except ImportError as e:
+ raise SkipTest("Skipping test since gridtk is not available: %s" % e)
return wrapper
diff --git a/bob/bio/base/tools/command_line.py b/bob/bio/base/tools/command_line.py
index c43d251b..df62b19a 100644
--- a/bob/bio/base/tools/command_line.py
+++ b/bob/bio/base/tools/command_line.py
@@ -12,6 +12,9 @@ from .. import database
"""Execute biometric recognition algorithms on a certain biometric database.
"""
+def is_idiap():
+ return os.path.isdir("/idiap") and "USER" in os.environ
+
def command_line_parser(description=__doc__, exclude_resources_from=[]):
"""command_line_parser(description=__doc__, exclude_resources_from=[]) -> parsers
@@ -66,9 +69,8 @@ def command_line_parser(description=__doc__, exclude_resources_from=[]):
############## options to modify default directories or file names ####################
# directories differ between idiap and extern
- is_idiap = os.path.isdir("/idiap")
- temp = "/idiap/temp/%s/database-name/sub-directory" % os.environ["USER"] if is_idiap else "temp"
- results = "/idiap/user/%s/database-name/sub-directory" % os.environ["USER"] if is_idiap else "results"
+ temp = "/idiap/temp/%s/database-name/sub-directory" % os.environ["USER"] if is_idiap() else "temp"
+ results = "/idiap/user/%s/database-name/sub-directory" % os.environ["USER"] if is_idiap() else "results"
database_replacement = "%s/.bob_bio_databases.txt" % os.environ["HOME"]
dir_group = parser.add_argument_group('\nDirectories that can be changed according to your requirements')
@@ -205,11 +207,10 @@ def initialize(parsers, command_line_parameters = None, skips = []):
args.grid = utils.load_resource(' '.join(args.grid), 'grid', imports = args.imports)
# set base directories
- is_idiap = os.path.isdir("/idiap")
if args.temp_directory is None:
- args.temp_directory = "/idiap/temp/%s/%s" % (os.environ["USER"], args.database.name) if is_idiap else "temp"
+ args.temp_directory = "/idiap/temp/%s/%s" % (os.environ["USER"], args.database.name) if is_idiap() else "temp"
if args.result_directory is None:
- args.result_directory = "/idiap/user/%s/%s" % (os.environ["USER"], args.database.name) if is_idiap else "results"
+ args.result_directory = "/idiap/user/%s/%s" % (os.environ["USER"], args.database.name) if is_idiap() else "results"
args.temp_directory = os.path.join(args.temp_directory, args.sub_directory)
args.result_directory = os.path.join(args.result_directory, args.sub_directory)
diff --git a/doc/experiments.rst b/doc/experiments.rst
index bdafcf09..6f7e039a 100644
--- a/doc/experiments.rst
+++ b/doc/experiments.rst
@@ -2,7 +2,7 @@
.. author: Manuel Günther <manuel.guenther@idiap.ch>
.. date: Thu Sep 20 11:58:57 CEST 2012
-.. _experiments:
+.. _bob.bio.base.experiments:
=========================================
--
GitLab