From 6e201f17dab3e7f04b8eca06857db0124caea7d7 Mon Sep 17 00:00:00 2001
From: Laurent COLBOIS <lcolbois@.idiap.ch>
Date: Sun, 16 May 2021 10:59:59 +0200
Subject: [PATCH] Fix lookup of database config (previous version did not work)

---
 bob/bio/face/config/baseline/facenet_sanderberg.py        | 4 +++-
 bob/bio/face/config/baseline/gabor_graph.py               | 4 +++-
 bob/bio/face/config/baseline/helpers.py                   | 4 ++--
 .../config/baseline/inception_resnetv1_casiawebface.py    | 4 +++-
 .../face/config/baseline/inception_resnetv1_msceleb.py    | 4 +++-
 .../config/baseline/inception_resnetv2_casiawebface.py    | 4 +++-
 .../face/config/baseline/inception_resnetv2_msceleb.py    | 4 +++-
 bob/bio/face/config/baseline/lda.py                       | 8 ++++----
 bob/bio/face/config/baseline/lgbphs.py                    | 4 +++-
 .../config/baseline/mobilenetv2_msceleb_arcface_2021.py   | 4 +++-
 .../face/config/baseline/resnet50_msceleb_arcface_2021.py | 4 +++-
 .../face/config/baseline/resnet50_vgg2_arcface_2021.py    | 4 +++-
 bob/bio/face/config/baseline/tf2_inception_resnet.py      | 4 +++-
 13 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/bob/bio/face/config/baseline/facenet_sanderberg.py b/bob/bio/face/config/baseline/facenet_sanderberg.py
index 3197d061..73c3d687 100644
--- a/bob/bio/face/config/baseline/facenet_sanderberg.py
+++ b/bob/bio/face/config/baseline/facenet_sanderberg.py
@@ -4,7 +4,9 @@ from bob.bio.face.embeddings.tf2_inception_resnet import (
 from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import facenet_baseline
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
diff --git a/bob/bio/face/config/baseline/gabor_graph.py b/bob/bio/face/config/baseline/gabor_graph.py
index 17a005c8..d08370b9 100644
--- a/bob/bio/face/config/baseline/gabor_graph.py
+++ b/bob/bio/face/config/baseline/gabor_graph.py
@@ -21,7 +21,9 @@ import logging
 logger = logging.getLogger(__name__)
 
 #### SOLVING IF THERE'S ANY DATABASE INFORMATION
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def get_pipeline(face_cropper, transform_extra_arguments):
diff --git a/bob/bio/face/config/baseline/helpers.py b/bob/bio/face/config/baseline/helpers.py
index 6150ffdf..dc9b9148 100644
--- a/bob/bio/face/config/baseline/helpers.py
+++ b/bob/bio/face/config/baseline/helpers.py
@@ -7,12 +7,12 @@ import logging
 logger = logging.getLogger(__name__)
 
 
-def lookup_config_from_database():
+def lookup_config_from_database(database):
     """
     Read configuration values that might be already defined in the database configuration
     file.
     """
-    if "database" in locals():
+    if database is not None:
         annotation_type = database.annotation_type
         fixed_positions = database.fixed_positions
         memory_demanding = (
diff --git a/bob/bio/face/config/baseline/inception_resnetv1_casiawebface.py b/bob/bio/face/config/baseline/inception_resnetv1_casiawebface.py
index 0d88bbad..b3301dcd 100644
--- a/bob/bio/face/config/baseline/inception_resnetv1_casiawebface.py
+++ b/bob/bio/face/config/baseline/inception_resnetv1_casiawebface.py
@@ -4,7 +4,9 @@ from bob.bio.face.embeddings.tf2_inception_resnet import (
 from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import facenet_baseline
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
diff --git a/bob/bio/face/config/baseline/inception_resnetv1_msceleb.py b/bob/bio/face/config/baseline/inception_resnetv1_msceleb.py
index 766f1cf2..745b7bbd 100644
--- a/bob/bio/face/config/baseline/inception_resnetv1_msceleb.py
+++ b/bob/bio/face/config/baseline/inception_resnetv1_msceleb.py
@@ -5,7 +5,9 @@ from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import facenet_baseline
 
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
diff --git a/bob/bio/face/config/baseline/inception_resnetv2_casiawebface.py b/bob/bio/face/config/baseline/inception_resnetv2_casiawebface.py
index 1f56b451..b1b066ac 100644
--- a/bob/bio/face/config/baseline/inception_resnetv2_casiawebface.py
+++ b/bob/bio/face/config/baseline/inception_resnetv2_casiawebface.py
@@ -5,7 +5,9 @@ from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import facenet_baseline
 
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
diff --git a/bob/bio/face/config/baseline/inception_resnetv2_msceleb.py b/bob/bio/face/config/baseline/inception_resnetv2_msceleb.py
index 2a4bd3d1..f3e083b7 100644
--- a/bob/bio/face/config/baseline/inception_resnetv2_msceleb.py
+++ b/bob/bio/face/config/baseline/inception_resnetv2_msceleb.py
@@ -4,7 +4,9 @@ from bob.bio.face.embeddings.tf2_inception_resnet import (
 from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import facenet_baseline
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
diff --git a/bob/bio/face/config/baseline/lda.py b/bob/bio/face/config/baseline/lda.py
index a6ee3de8..4fde671d 100644
--- a/bob/bio/face/config/baseline/lda.py
+++ b/bob/bio/face/config/baseline/lda.py
@@ -22,7 +22,9 @@ import logging
 logger = logging.getLogger(__name__)
 
 #### SOLVING IF THERE'S ANY DATABASE INFORMATION
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 ####### SOLVING THE FACE CROPPER TO BE USED ##########
@@ -70,9 +72,7 @@ def load(annotation_type, fixed_positions=None):
     ### BIOMETRIC ALGORITHM
 
     algorithm = BioAlgorithmLegacy(
-        lda,
-        base_dir=tempdir,
-        projector_file=os.path.join(tempdir, "Projector.hdf5"),
+        lda, base_dir=tempdir, projector_file=os.path.join(tempdir, "Projector.hdf5"),
     )
 
     return VanillaBiometricsPipeline(transformer, algorithm)
diff --git a/bob/bio/face/config/baseline/lgbphs.py b/bob/bio/face/config/baseline/lgbphs.py
index 2c7256f6..8a9100f5 100644
--- a/bob/bio/face/config/baseline/lgbphs.py
+++ b/bob/bio/face/config/baseline/lgbphs.py
@@ -17,7 +17,9 @@ import bob.math
 
 
 #### SOLVING IF THERE'S ANY DATABASE INFORMATION
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def get_pipeline(face_cropper, transform_extra_arguments):
diff --git a/bob/bio/face/config/baseline/mobilenetv2_msceleb_arcface_2021.py b/bob/bio/face/config/baseline/mobilenetv2_msceleb_arcface_2021.py
index 61b9db98..04148407 100644
--- a/bob/bio/face/config/baseline/mobilenetv2_msceleb_arcface_2021.py
+++ b/bob/bio/face/config/baseline/mobilenetv2_msceleb_arcface_2021.py
@@ -3,7 +3,9 @@ from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import arcface_baseline
 
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
diff --git a/bob/bio/face/config/baseline/resnet50_msceleb_arcface_2021.py b/bob/bio/face/config/baseline/resnet50_msceleb_arcface_2021.py
index 442247b5..b67e65e5 100644
--- a/bob/bio/face/config/baseline/resnet50_msceleb_arcface_2021.py
+++ b/bob/bio/face/config/baseline/resnet50_msceleb_arcface_2021.py
@@ -3,7 +3,9 @@ from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import arcface_baseline
 
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
diff --git a/bob/bio/face/config/baseline/resnet50_vgg2_arcface_2021.py b/bob/bio/face/config/baseline/resnet50_vgg2_arcface_2021.py
index 95a3a95b..1237cfef 100644
--- a/bob/bio/face/config/baseline/resnet50_vgg2_arcface_2021.py
+++ b/bob/bio/face/config/baseline/resnet50_vgg2_arcface_2021.py
@@ -3,7 +3,9 @@ from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import arcface_baseline
 
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
diff --git a/bob/bio/face/config/baseline/tf2_inception_resnet.py b/bob/bio/face/config/baseline/tf2_inception_resnet.py
index 87862c7a..54b408bb 100644
--- a/bob/bio/face/config/baseline/tf2_inception_resnet.py
+++ b/bob/bio/face/config/baseline/tf2_inception_resnet.py
@@ -3,7 +3,9 @@ from bob.bio.face.embeddings.tf2_inception_resnet import InceptionResnetv2
 from bob.bio.face.config.baseline.helpers import lookup_config_from_database
 from bob.bio.face.config.baseline.templates import facenet_baseline
 
-annotation_type, fixed_positions, memory_demanding = lookup_config_from_database()
+annotation_type, fixed_positions, memory_demanding = lookup_config_from_database(
+    locals().get("database")
+)
 
 
 def load(annotation_type, fixed_positions=None):
-- 
GitLab