From daa824f4337eaf1c5bc92bc53ef97751ec5ff8d9 Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Wed, 3 Jun 2015 11:12:30 +0200
Subject: [PATCH] Added demanding grid config
---
bob/bio/base/config/grid/demanding.py | 16 ++++++++++++++++
bob/bio/base/test/__init__.py | 1 -
bob/bio/base/test/test_utils.py | 2 ++
setup.py | 8 +++++---
4 files changed, 23 insertions(+), 4 deletions(-)
create mode 100644 bob/bio/base/config/grid/demanding.py
diff --git a/bob/bio/base/config/grid/demanding.py b/bob/bio/base/config/grid/demanding.py
new file mode 100644
index 00000000..ef5e627d
--- /dev/null
+++ b/bob/bio/base/config/grid/demanding.py
@@ -0,0 +1,16 @@
+import bob.bio.base
+
+# define a queue with demanding parameters
+grid = bob.bio.base.grid.Grid(
+ training_queue = '32G',
+ # preprocessing
+ preprocessing_queue = '4G',
+ # feature extraction
+ extraction_queue = '8G',
+ # feature projection
+ projection_queue = '8G',
+ # model enrollment
+ enrollment_queue = '8G',
+ # scoring
+ scoring_queue = '8G'
+)
diff --git a/bob/bio/base/test/__init__.py b/bob/bio/base/test/__init__.py
index 77d1ede4..e69de29b 100644
--- a/bob/bio/base/test/__init__.py
+++ b/bob/bio/base/test/__init__.py
@@ -1 +0,0 @@
-from . import dummy
diff --git a/bob/bio/base/test/test_utils.py b/bob/bio/base/test/test_utils.py
index 224e8bd1..b1067308 100644
--- a/bob/bio/base/test/test_utils.py
+++ b/bob/bio/base/test/test_utils.py
@@ -26,6 +26,8 @@ def test_grid():
# try to load the grid configurations
g = bob.bio.base.load_resource("grid", "grid")
assert not g.is_local()
+ g = bob.bio.base.load_resource("demanding", "grid")
+ assert not g.is_local()
g = bob.bio.base.load_resource("local-p4", "grid")
assert g.is_local()
diff --git a/setup.py b/setup.py
index 6b85a5b3..b133a069 100644
--- a/setup.py
+++ b/setup.py
@@ -33,10 +33,10 @@
# allows you to test your package with new python dependencies w/o requiring
# administrative interventions.
-from setuptools import setup, find_packages, dist
+from setuptools import setup, dist
dist.Distribution(dict(setup_requires=['bob.extension']))
-from bob.extension.utils import load_requirements
+from bob.extension.utils import load_requirements, find_packages
install_requires = load_requirements()
# The only thing we do in this file is to call the setup() function with all
@@ -105,6 +105,7 @@ setup(
'console_scripts' : [
'verify.py = bob.bio.base.script.verify:main',
'resources.py = bob.bio.base.script.resources:main',
+ 'evaluate.py = bob.bio.base.script.evaluate:main',
],
'bob.bio.database': [
@@ -134,7 +135,8 @@ setup(
'local-p4 = bob.bio.base.config.grid.local:grid',
'local-p8 = bob.bio.base.config.grid.local:grid_p8',
'local-p16 = bob.bio.base.config.grid.local:grid_p16',
- 'grid = bob.bio.base.config.grid.grid:grid'
+ 'grid = bob.bio.base.config.grid.grid:grid',
+ 'demanding = bob.bio.base.config.grid.demanding:grid',
],
},
--
GitLab