Commit 1993f551 authored by Tiago de Freitas Pereira's avatar Tiago de Freitas Pereira

Merge branch 'tf-arcface' into 'master'

Fix LFW database

See merge request !103
parents b2bb2358 9c561fe2
Pipeline #48373 passed with stage
in 44 minutes and 46 seconds
...@@ -176,6 +176,7 @@ def embedding_transformer( ...@@ -176,6 +176,7 @@ def embedding_transformer(
color_channel=color_channel, color_channel=color_channel,
cropped_positions=cropped_positions, cropped_positions=cropped_positions,
fixed_positions=fixed_positions, fixed_positions=fixed_positions,
dtype="float64",
) )
transform_extra_arguments = ( transform_extra_arguments = (
......
...@@ -24,5 +24,6 @@ database = DatabaseConnector( ...@@ -24,5 +24,6 @@ database = DatabaseConnector(
enroller_training_options={ enroller_training_options={
"world_type": "restricted" "world_type": "restricted"
}, # 'subworld' : 'twofolds' }, # 'subworld' : 'twofolds'
) ),
allow_scoring_with_all_biometric_references=False,
) )
...@@ -24,5 +24,6 @@ database = DatabaseConnector( ...@@ -24,5 +24,6 @@ database = DatabaseConnector(
enroller_training_options={ enroller_training_options={
"world_type": "unrestricted" "world_type": "unrestricted"
}, # 'subworld' : 'twofolds' }, # 'subworld' : 'twofolds'
) ),
allow_scoring_with_all_biometric_references=False,
) )
...@@ -10,7 +10,7 @@ from bob.bio.base.database import ( ...@@ -10,7 +10,7 @@ from bob.bio.base.database import (
CSVDataset, CSVDataset,
CSVDatasetZTNorm, 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.bio.face.database.sample_loaders import EyesAnnotations
from bob.extension import rc from bob.extension import rc
from bob.extension.download import get_file from bob.extension.download import get_file
...@@ -108,7 +108,7 @@ class MEDSDatabase(CSVDatasetZTNorm): ...@@ -108,7 +108,7 @@ class MEDSDatabase(CSVDatasetZTNorm):
filename, filename,
protocol, protocol,
csv_to_sample_loader=make_pipeline( csv_to_sample_loader=make_pipeline(
CSVToSampleLoader( CSVToSampleLoaderBiometrics(
data_loader=bob.io.base.load, data_loader=bob.io.base.load,
dataset_original_directory=rc["bob.db.meds.directory"] dataset_original_directory=rc["bob.db.meds.directory"]
if rc["bob.db.meds.directory"] if rc["bob.db.meds.directory"]
......
...@@ -10,7 +10,7 @@ from bob.bio.base.database import ( ...@@ -10,7 +10,7 @@ from bob.bio.base.database import (
CSVDataset, CSVDataset,
CSVDatasetZTNorm, 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.bio.face.database.sample_loaders import EyesAnnotations
from bob.extension import rc from bob.extension import rc
from bob.extension.download import get_file from bob.extension.download import get_file
...@@ -63,7 +63,7 @@ class MobioDatabase(CSVDatasetZTNorm): ...@@ -63,7 +63,7 @@ class MobioDatabase(CSVDatasetZTNorm):
filename, filename,
protocol, protocol,
csv_to_sample_loader=make_pipeline( csv_to_sample_loader=make_pipeline(
CSVToSampleLoader( CSVToSampleLoaderBiometrics(
data_loader=bob.io.base.load, data_loader=bob.io.base.load,
dataset_original_directory=rc["bob.db.mobio.directory"] dataset_original_directory=rc["bob.db.mobio.directory"]
if rc["bob.db.mobio.directory"] if rc["bob.db.mobio.directory"]
......
...@@ -10,7 +10,7 @@ from bob.bio.base.database import ( ...@@ -10,7 +10,7 @@ from bob.bio.base.database import (
CSVDataset, CSVDataset,
CSVDatasetZTNorm, 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.bio.face.database.sample_loaders import EyesAnnotations
from bob.extension import rc from bob.extension import rc
from bob.extension.download import get_file from bob.extension.download import get_file
...@@ -72,7 +72,7 @@ class MorphDatabase(CSVDatasetZTNorm): ...@@ -72,7 +72,7 @@ class MorphDatabase(CSVDatasetZTNorm):
filename, filename,
protocol, protocol,
csv_to_sample_loader=make_pipeline( csv_to_sample_loader=make_pipeline(
CSVToSampleLoader( CSVToSampleLoaderBiometrics(
data_loader=bob.io.base.load, data_loader=bob.io.base.load,
dataset_original_directory=rc["bob.db.morph.directory"] dataset_original_directory=rc["bob.db.morph.directory"]
if rc["bob.db.morph.directory"] if rc["bob.db.morph.directory"]
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
""" """
from bob.bio.base.database import CSVDataset 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.bio.face.database.sample_loaders import MultiposeAnnotations
from bob.extension import rc from bob.extension import rc
from bob.extension.download import get_file from bob.extension.download import get_file
...@@ -35,7 +35,7 @@ class MultipieDatabase(CSVDataset): ...@@ -35,7 +35,7 @@ class MultipieDatabase(CSVDataset):
filename, filename,
protocol, protocol,
csv_to_sample_loader=make_pipeline( csv_to_sample_loader=make_pipeline(
CSVToSampleLoader( CSVToSampleLoaderBiometrics(
data_loader=bob.io.base.load, data_loader=bob.io.base.load,
dataset_original_directory=rc["bob.db.multipie.directory"] dataset_original_directory=rc["bob.db.multipie.directory"]
if rc["bob.db.multipie.directory"] if rc["bob.db.multipie.directory"]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment