diff --git a/bob/bio/face/config/baseline/facenet_sanderberg.py b/bob/bio/face/config/baseline/facenet_sanderberg.py index 20b8c9ce80ef4db4a000db064c4ddd5ca562388e..fbf5b2a7fdda04d7b6a23532cda61dee9ff0df84 100644 --- a/bob/bio/face/config/baseline/facenet_sanderberg.py +++ b/bob/bio/face/config/baseline/facenet_sanderberg.py @@ -1,7 +1,9 @@ from bob.bio.face.embeddings import FaceNetSanderberg from bob.bio.face.config.baseline.helpers import embedding_transformer_160x160 -from bob.bio.base.pipelines.vanilla_biometrics import Distance, VanillaBiometricsPipeline - +from bob.bio.base.pipelines.vanilla_biometrics import ( + Distance, + VanillaBiometricsPipeline, +) if "database" in locals(): @@ -12,11 +14,10 @@ else: fixed_positions = None -transformer = embedding_transformer_160x160(FaceNetSanderberg(), annotation_type, fixed_positions) +transformer = embedding_transformer_160x160( + FaceNetSanderberg(), annotation_type, fixed_positions +) algorithm = Distance() -pipeline = VanillaBiometricsPipeline( - transformer, - algorithm -) +pipeline = VanillaBiometricsPipeline(transformer, algorithm) diff --git a/bob/bio/face/config/database/ijbc.py b/bob/bio/face/config/database/ijbc.py index 5c7e6615723aaa55a09035482255d3be5cd82d10..8c6179767c1655e4e85c3d6bbe4a2e3e0e5d3b93 100644 --- a/bob/bio/face/config/database/ijbc.py +++ b/bob/bio/face/config/database/ijbc.py @@ -7,12 +7,15 @@ from bob.extension import rc ijbc_directory = rc["bob.db.ijbc.directory"] -ijbc_11 = DatabaseConnector( - IJBCBioDatabase(original_directory=ijbc_directory, protocol="1:1") +database = DatabaseConnector( + IJBCBioDatabase(original_directory=ijbc_directory, protocol="1:1"), + annotation_type = "eyes-center", + fixed_positions = None, + allow_scoring_with_all_biometric_references = False ) -ijbc_covariates = DatabaseConnector( - IJBCBioDatabase( - original_directory=ijbc_directory, protocol="Covariates" - ) -) +#ijbc_covariates = DatabaseConnector( +# IJBCBioDatabase( +# original_directory=ijbc_directory, protocol="Covariates" +# ) +#) diff --git a/bob/bio/face/config/database/mobio_male.py b/bob/bio/face/config/database/mobio_male.py index ee41b24670f8e62e828c729d58b1d8b60fcc9401..b33f356031fc28d93ab79d76671f4d712ad379af 100644 --- a/bob/bio/face/config/database/mobio_male.py +++ b/bob/bio/face/config/database/mobio_male.py @@ -10,6 +10,8 @@ database = DatabaseConnector( annotation_directory=rc["bob.db.mobio.annotation_directory"], original_extension=".png", protocol="mobile0-male", - ) + ), + annotation_type = "eyes-center", + fixed_positions = None ) diff --git a/setup.py b/setup.py index a6b6e056c6c990ab70eefbda8ebae42c75e2a969..9066286989f37a2ca4b0920d719ef2853fb2fa3d 100644 --- a/setup.py +++ b/setup.py @@ -110,8 +110,7 @@ setup( 'atnt = bob.bio.face.config.database.atnt:database', 'gbu = bob.bio.face.config.database.gbu:database', - 'ijbc-11 = bob.bio.face.config.database.ijbc:ijbc_11', - 'ijbc-covariates = bob.bio.face.config.database.ijbc:ijbc_covariates', + 'ijbc-11 = bob.bio.face.config.database.ijbc:database', 'lfw-restricted = bob.bio.face.config.database.lfw_restricted:database', 'lfw-unrestricted = bob.bio.face.config.database.lfw_unrestricted:database',