diff --git a/bob/bio/face/config/baseline/facenet_sanderberg.py b/bob/bio/face/config/baseline/facenet_sanderberg.py index 3197d061a5491a1df905a3e9b4a9117f3660b76d..73c3d687239f972e10316eb256598eb2dd15ab8a 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 17a005c81dc0f0733328722b51c48a4a51f7d954..d08370b9d2742dda2901d792c21c81f1444628a7 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 6150ffdf39dc7ece9909bb6140663d1131343ac2..dc9b91483777509633001d510edf1cbc3147f2b3 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 0d88bbadf686293354508d967a88c9ac12c669b9..b3301dcdba87ed21ac8e8c571f28c97ce18cc6dc 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 766f1cf22bc70026d1f4e839f8f18e0e709c69fa..745b7bbdce2cfe9b0d361b0cf3bb239c682ac898 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 1f56b45152453fc430e97a261fa757e46788a66b..b1b066acf20519d34b98f6712cea9c4c6da1207f 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 2a4bd3d17b0cc2de989bdda04a5b1b97d7feb884..f3e083b7599884d7a44f60cfbf5835570fe912e0 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 a6ee3de82001ff937a50b9734bf467b5acdf299d..4fde671dc8d67a42caf95d1ff53a7dc1eb8fe8a7 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 2c7256f614dee0a0ed2ffcc3b3dcaf1d4d493d94..8a9100f5c4aee44edf33163ada8d943219f5756c 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 61b9db989b2cd5216b554592b4e93bc889fbfe2d..041484070595f1a32f231fe570b6c62e3df780c1 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 442247b5d4d1e2f619c2c47af89c2c21997dd444..b67e65e5df8dd76b1af067597407d4190d45a5bb 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 95a3a95bc5eb18b8bbb4f1f979f9eba3b294f4d2..1237cfefa9c6f55eaf538e9b294da6b99fb6e91a 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 87862c7ae08c94ad80f134c7c301c503b87c1e95..54b408bb62765bad8227c8e4934409595d59eefa 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):