diff --git a/bob/bio/face/config/baseline/helpers.py b/bob/bio/face/config/baseline/helpers.py index ffeb149681712008274aac8b054202e3a80ff9f2..764ae274e6ecf5cf3fd7926d6fe595e002a77bdb 100644 --- a/bob/bio/face/config/baseline/helpers.py +++ b/bob/bio/face/config/baseline/helpers.py @@ -176,6 +176,7 @@ def embedding_transformer( color_channel=color_channel, cropped_positions=cropped_positions, fixed_positions=fixed_positions, + dtype="float64", ) transform_extra_arguments = ( diff --git a/bob/bio/face/config/database/lfw_restricted.py b/bob/bio/face/config/database/lfw_restricted.py index 95b8bce3514ff9fb51e2dc6821a3d7eb2e6b4887..0684999626b9c46327fcd9edbc8b445a56623621 100644 --- a/bob/bio/face/config/database/lfw_restricted.py +++ b/bob/bio/face/config/database/lfw_restricted.py @@ -24,5 +24,6 @@ database = DatabaseConnector( enroller_training_options={ "world_type": "restricted" }, # 'subworld' : 'twofolds' - ) + ), + allow_scoring_with_all_biometric_references=False, ) diff --git a/bob/bio/face/config/database/lfw_unrestricted.py b/bob/bio/face/config/database/lfw_unrestricted.py index 1a14b41d662391369381a2ce8ed647dbf6490cf1..39ebafb4ee14cbfb47f226ba4f0e07a9c95fc09f 100644 --- a/bob/bio/face/config/database/lfw_unrestricted.py +++ b/bob/bio/face/config/database/lfw_unrestricted.py @@ -24,5 +24,6 @@ database = DatabaseConnector( enroller_training_options={ "world_type": "unrestricted" }, # 'subworld' : 'twofolds' - ) + ), + allow_scoring_with_all_biometric_references=False, ) diff --git a/bob/bio/face/database/meds.py b/bob/bio/face/database/meds.py index 650450c08ba3086e01a47e905878deca72948eab..2181f82bcf844ee429cdd990c5b6c1fa6e1bfda6 100644 --- a/bob/bio/face/database/meds.py +++ b/bob/bio/face/database/meds.py @@ -10,7 +10,7 @@ from bob.bio.base.database import ( CSVDataset, CSVDatasetZTNorm, ) -from bob.pipelines.datasets import CSVToSampleLoader +from bob.bio.base.database import CSVToSampleLoaderBiometrics from bob.bio.face.database.sample_loaders import EyesAnnotations from bob.extension import rc from bob.extension.download import get_file @@ -108,7 +108,7 @@ class MEDSDatabase(CSVDatasetZTNorm): filename, protocol, csv_to_sample_loader=make_pipeline( - CSVToSampleLoader( + CSVToSampleLoaderBiometrics( data_loader=bob.io.base.load, dataset_original_directory=rc["bob.db.meds.directory"] if rc["bob.db.meds.directory"] diff --git a/bob/bio/face/database/mobio.py b/bob/bio/face/database/mobio.py index 363b66903de4bf62be35252775dee52ba1011961..7a06b2a6b4384e6bc57d50c58f50dcaaafd6ba13 100644 --- a/bob/bio/face/database/mobio.py +++ b/bob/bio/face/database/mobio.py @@ -10,7 +10,7 @@ from bob.bio.base.database import ( CSVDataset, CSVDatasetZTNorm, ) -from bob.pipelines.datasets import CSVToSampleLoader +from bob.bio.base.database import CSVToSampleLoaderBiometrics from bob.bio.face.database.sample_loaders import EyesAnnotations from bob.extension import rc from bob.extension.download import get_file @@ -63,7 +63,7 @@ class MobioDatabase(CSVDatasetZTNorm): filename, protocol, csv_to_sample_loader=make_pipeline( - CSVToSampleLoader( + CSVToSampleLoaderBiometrics( data_loader=bob.io.base.load, dataset_original_directory=rc["bob.db.mobio.directory"] if rc["bob.db.mobio.directory"] diff --git a/bob/bio/face/database/morph.py b/bob/bio/face/database/morph.py index 11e8d98bed2818a188349106a6387561e0228c87..a1e37074a455d7b0c7ea679608d2432f0362382d 100644 --- a/bob/bio/face/database/morph.py +++ b/bob/bio/face/database/morph.py @@ -10,7 +10,7 @@ from bob.bio.base.database import ( CSVDataset, CSVDatasetZTNorm, ) -from bob.pipelines.datasets import CSVToSampleLoader +from bob.bio.base.database import CSVToSampleLoaderBiometrics from bob.bio.face.database.sample_loaders import EyesAnnotations from bob.extension import rc from bob.extension.download import get_file @@ -72,7 +72,7 @@ class MorphDatabase(CSVDatasetZTNorm): filename, protocol, csv_to_sample_loader=make_pipeline( - CSVToSampleLoader( + CSVToSampleLoaderBiometrics( data_loader=bob.io.base.load, dataset_original_directory=rc["bob.db.morph.directory"] if rc["bob.db.morph.directory"] diff --git a/bob/bio/face/database/multipie.py b/bob/bio/face/database/multipie.py index 52283dd30d63769f52e44f1a9967941313c86b21..6e1dabb3cee1ea9976cb1a4091583fa8b8f9bef6 100644 --- a/bob/bio/face/database/multipie.py +++ b/bob/bio/face/database/multipie.py @@ -7,7 +7,7 @@ """ from bob.bio.base.database import CSVDataset -from bob.pipelines.datasets import CSVToSampleLoader +from bob.bio.base.database import CSVToSampleLoaderBiometrics from bob.bio.face.database.sample_loaders import MultiposeAnnotations from bob.extension import rc from bob.extension.download import get_file @@ -35,7 +35,7 @@ class MultipieDatabase(CSVDataset): filename, protocol, csv_to_sample_loader=make_pipeline( - CSVToSampleLoader( + CSVToSampleLoaderBiometrics( data_loader=bob.io.base.load, dataset_original_directory=rc["bob.db.multipie.directory"] if rc["bob.db.multipie.directory"]