From e20dafb4a4ef30f0533ef3ac77cfe68f371b0b30 Mon Sep 17 00:00:00 2001
From: Manuel Guenther <manuel.guenther@idiap.ch>
Date: Wed, 17 Jun 2015 15:43:51 +0200
Subject: [PATCH] Modified dummy extractor to not disturb the one from
bob.bio.base
---
bob/bio/gmm/test/dummy/extractor.py | 2 +-
bob/bio/gmm/test/test_scripts.py | 12 ++++++------
setup.py | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/bob/bio/gmm/test/dummy/extractor.py b/bob/bio/gmm/test/dummy/extractor.py
index 2c58557..76e8b51 100644
--- a/bob/bio/gmm/test/dummy/extractor.py
+++ b/bob/bio/gmm/test/dummy/extractor.py
@@ -3,7 +3,7 @@ import bob.io.base
from bob.bio.base.extractor import Extractor
-_data = [0., 1., 2., 3., 4.]
+_data = [10., 11., 12., 13., 14.]
class DummyExtractor (Extractor):
def __init__(self):
diff --git a/bob/bio/gmm/test/test_scripts.py b/bob/bio/gmm/test/test_scripts.py
index 34adb9c..d2c27af 100644
--- a/bob/bio/gmm/test/test_scripts.py
+++ b/bob/bio/gmm/test/test_scripts.py
@@ -64,7 +64,7 @@ def test_gmm_sequential():
parameters = [
'-d', 'dummy',
'-p', 'dummy',
- '-e', 'dummy',
+ '-e', 'dummy2d',
'-a', 'bob.bio.gmm.algorithm.GMM(2, 2, 2)',
'--zt-norm',
'-s', 'test_gmm_sequential',
@@ -85,7 +85,7 @@ def test_gmm_parallel():
parameters = [
'-d', 'dummy',
'-p', 'dummy',
- '-e', 'dummy',
+ '-e', 'dummy2d',
'-a', 'bob.bio.gmm.algorithm.GMM(2, 2, 2)', '--import', 'bob.bio.gmm', 'bob.io.image',
'-g', 'bob.bio.base.grid.Grid(grid = "local", number_of_parallel_processes = 2, scheduler_sleep_time = 0.1)', '-G', test_database, '--run-local-scheduler', '--stop-on-failure',
'--clean-intermediate',
@@ -106,7 +106,7 @@ def test_isv_sequential():
parameters = [
'-d', 'dummy',
'-p', 'dummy',
- '-e', 'dummy',
+ '-e', 'dummy2d',
'-a', 'bob.bio.gmm.algorithm.ISV(10, number_of_gaussians=2, kmeans_training_iterations=2, gmm_training_iterations=2, isv_training_iterations=2)',
'--zt-norm',
'-s', 'test_isv_sequential',
@@ -127,7 +127,7 @@ def test_isv_parallel():
parameters = [
'-d', 'dummy',
'-p', 'dummy',
- '-e', 'dummy',
+ '-e', 'dummy2d',
'-a', 'bob.bio.gmm.algorithm.ISV(10, number_of_gaussians=2, kmeans_training_iterations=2, gmm_training_iterations=2, isv_training_iterations=2)', '--import', 'bob.bio.gmm', 'bob.io.image',
'-g', 'bob.bio.base.grid.Grid(grid = "local", number_of_parallel_processes = 2, scheduler_sleep_time = 0.1)', '-G', test_database, '--run-local-scheduler', '--stop-on-failure',
'--clean-intermediate',
@@ -148,7 +148,7 @@ def test_ivector_sequential():
parameters = [
'-d', 'dummy',
'-p', 'dummy',
- '-e', 'dummy',
+ '-e', 'dummy2d',
'-a', 'bob.bio.gmm.algorithm.IVector(10, number_of_gaussians=2, kmeans_training_iterations=2, gmm_training_iterations=2, tv_training_iterations=2)',
'--zt-norm',
'-s', 'test_ivector_sequential',
@@ -169,7 +169,7 @@ def test_ivector_parallel():
parameters = [
'-d', 'dummy',
'-p', 'dummy',
- '-e', 'dummy',
+ '-e', 'dummy2d',
'-a', 'bob.bio.gmm.algorithm.IVector(10, number_of_gaussians=2, kmeans_training_iterations=2, gmm_training_iterations=2, tv_training_iterations=2)', '--import', 'bob.bio.gmm', 'bob.io.image',
'-g', 'bob.bio.base.grid.Grid(grid = "local", number_of_parallel_processes = 2, scheduler_sleep_time = 0.1)', '-G', test_database, '--run-local-scheduler', '--stop-on-failure',
'--clean-intermediate',
diff --git a/setup.py b/setup.py
index b56fe93..c03d3d5 100644
--- a/setup.py
+++ b/setup.py
@@ -115,7 +115,7 @@ setup(
],
'bob.bio.extractor': [
- 'dummy = bob.bio.gmm.test.dummy.extractor:extractor', # for test purposes only
+ 'dummy2d = bob.bio.gmm.test.dummy.extractor:extractor', # for test purposes only
],
'bob.bio.algorithm': [
--
GitLab