From 09a697e24d4f024df20b1e82a303bbeeed7f0448 Mon Sep 17 00:00:00 2001
From: Tiago Freitas Pereira <tiagofrepereira@gmail.com>
Date: Fri, 18 May 2018 12:47:13 +0200
Subject: [PATCH] Organized entry points
---
bob/bio/face/config/database/ijbc.py | 7 ++++++-
bob/bio/face/test/test_databases.py | 2 +-
setup.py | 5 ++++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/bob/bio/face/config/database/ijbc.py b/bob/bio/face/config/database/ijbc.py
index 6f410fd4..bafb762b 100644
--- a/bob/bio/face/config/database/ijbc.py
+++ b/bob/bio/face/config/database/ijbc.py
@@ -4,7 +4,12 @@ from bob.bio.face.database import IJBCBioDatabase
ijbc_directory = "[YOUR_IJBC_DIRECTORY]"
-database = IJBCBioDatabase(
+ijbc_11 = IJBCBioDatabase(
original_directory=ijbc_directory,
protocol='1:1'
)
+
+ijbc_covariates = IJBCBioDatabase(
+ original_directory=ijbc_directory,
+ protocol='Covariates'
+)
diff --git a/bob/bio/face/test/test_databases.py b/bob/bio/face/test/test_databases.py
index d7f4381f..bc8b8b9b 100644
--- a/bob/bio/face/test/test_databases.py
+++ b/bob/bio/face/test/test_databases.py
@@ -378,7 +378,7 @@ def test_ijbb():
@db_available('ijbc')
def test_ijbc():
database = bob.bio.base.load_resource(
- 'ijbc', 'database', preferred_package='bob.bio.face')
+ 'ijbc-11', 'database', preferred_package='bob.bio.face')
try:
check_database(database, models_depend=True, training_depends=True)
except IOError as e:
diff --git a/setup.py b/setup.py
index 81e00307..1d257edc 100644
--- a/setup.py
+++ b/setup.py
@@ -117,7 +117,10 @@ setup(
'gbu = bob.bio.face.config.database.gbu:database',
'ijba = bob.bio.face.config.database.ijba:database',
'ijbb = bob.bio.face.config.database.ijbb:database',
- 'ijbc = bob.bio.face.config.database.ijbc:database',
+
+ 'ijbc-11 = bob.bio.face.config.database.ijbc:ijbc_11',
+ 'ijbc-covariates = bob.bio.face.config.database.ijbc:ijbc_covariates',
+
'lfw-restricted = bob.bio.face.config.database.lfw_restricted:database',
'lfw-unrestricted = bob.bio.face.config.database.lfw_unrestricted:database',
'mobio-image = bob.bio.face.config.database.mobio:mobio_image',
--
GitLab