diff --git a/bob/bio/vein/configurations/__init__.py b/bob/bio/vein/config/__init__.py similarity index 100% rename from bob/bio/vein/configurations/__init__.py rename to bob/bio/vein/config/__init__.py diff --git a/bob/bio/vein/config/database/__init__.py b/bob/bio/vein/config/database/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bob/bio/vein/configurations/fv3d.py b/bob/bio/vein/config/database/fv3d.py similarity index 75% rename from bob/bio/vein/configurations/fv3d.py rename to bob/bio/vein/config/database/fv3d.py index f103749ad0a3fb724c31bf9529f57fd04f4ffa2f..aae9818a6fdf4307f2c6eb24a59dbe2a4dab6ec5 100644 --- a/bob/bio/vein/configurations/fv3d.py +++ b/bob/bio/vein/config/database/fv3d.py @@ -12,15 +12,25 @@ the link. from bob.extension import rc -from ..database.fv3d import Database +from bob.bio.vein.database.fv3d import Database from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector +import logging +logger = logging.getLogger("bob.bio.vein") + +# Retrieve directory from config _fv3d_directory = rc["bob.db.fv3d.directory"] """Value in ``~/.bobrc`` for this dataset directory""" +# Set default protocol if not given via a config file +if 'protocol' not in locals(): + logger.info("protocol not specified, using default: 'central'") + protocol = 'central' + legacy_database = Database( original_directory = _fv3d_directory, original_extension = '.png', + protocol = protocol, ) """The :py:class:`bob.bio.base.database.BioDatabase` derivative with fv3d database settings @@ -45,5 +55,5 @@ must make sure to set this value with ``bob config set bob.db.fv3d.directory`` to the place where you actually installed the `3D Fingervein`_ dataset, as explained in the section :ref:`bob.bio.vein.baselines`. """ - -protocol = 'central' # TODO protocol implementation in bob pipelines? +print(f"protocol is '{protocol}'") +logger.debug(f"Loaded database fv3d config file, using protocol '{protocol}'.") diff --git a/bob/bio/vein/config/database/protocol/Nom.py b/bob/bio/vein/config/database/protocol/Nom.py new file mode 100644 index 0000000000000000000000000000000000000000..eb47987977266e108325238456fb34d33e7c607e --- /dev/null +++ b/bob/bio/vein/config/database/protocol/Nom.py @@ -0,0 +1,19 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 14:51:16 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# VeraFinger dataset, defined ar bob.db.verafinger. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> Nom verafinger +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> Nom verafinger + +# The protocol resource must be specified before the database resource. + +# This will be the default protocol if none is specified. + +protocol = 'Nom' diff --git a/bob/bio/vein/config/database/protocol/__init__.py b/bob/bio/vein/config/database/protocol/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/bob/bio/vein/config/database/protocol/b.py b/bob/bio/vein/config/database/protocol/b.py new file mode 100644 index 0000000000000000000000000000000000000000..d15cdd37b7ceb8214a7a2fc162f06756b0f11b1c --- /dev/null +++ b/bob/bio/vein/config/database/protocol/b.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 14:50:47 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# VeraFinger dataset, defined ar bob.db.verafinger. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> B verafinger +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> B verafinger + +# The protocol resource must be specified before the database resource. + +protocol = 'B' diff --git a/bob/bio/vein/config/database/protocol/central.py b/bob/bio/vein/config/database/protocol/central.py new file mode 100644 index 0000000000000000000000000000000000000000..4196fabdbac070eb3b89a746e7d59bb4c93e81eb --- /dev/null +++ b/bob/bio/vein/config/database/protocol/central.py @@ -0,0 +1,19 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 10:54:47 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# 3D Fingervein dataset, defined ar bob.db.fv3d. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> central fv3d +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> central fv3d + +# The protocol resource must be specified before the database resource. + +# This will be the default protocol if none is specified. + +protocol = 'central' diff --git a/bob/bio/vein/config/database/protocol/cropped_Nom.py b/bob/bio/vein/config/database/protocol/cropped_Nom.py new file mode 100644 index 0000000000000000000000000000000000000000..65ab993d33ea4acc4a3f17f02fbd65079d440118 --- /dev/null +++ b/bob/bio/vein/config/database/protocol/cropped_Nom.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 14:51:02 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# VeraFinger dataset, defined ar bob.db.verafinger. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> Cropped-Nom verafinger +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> Cropped-Nom verafinger + +# The protocol resource must be specified before the database resource. + +protocol = 'cropped-Nom' diff --git a/bob/bio/vein/config/database/protocol/cropped_b.py b/bob/bio/vein/config/database/protocol/cropped_b.py new file mode 100644 index 0000000000000000000000000000000000000000..c8ff2bdded3804128a770ffef6eb657938a6ed75 --- /dev/null +++ b/bob/bio/vein/config/database/protocol/cropped_b.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 14:50:51 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# VeraFinger dataset, defined ar bob.db.verafinger. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> Cropped-B verafinger +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> Cropped-B verafinger + +# The protocol resource must be specified before the database resource. + +protocol = 'Cropped-B' diff --git a/bob/bio/vein/config/database/protocol/cropped_fifty.py b/bob/bio/vein/config/database/protocol/cropped_fifty.py new file mode 100644 index 0000000000000000000000000000000000000000..7b8a4d14cefca87630fdf90ca3ebf9b583aeec7c --- /dev/null +++ b/bob/bio/vein/config/database/protocol/cropped_fifty.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 14:50:54 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# VeraFinger dataset, defined ar bob.db.verafinger. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> Cropped-Fifty verafinger +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> Cropped-Fifty verafinger + +# The protocol resource must be specified before the database resource. + +protocol = 'Cropped-Fifty' diff --git a/bob/bio/vein/config/database/protocol/cropped_full.py b/bob/bio/vein/config/database/protocol/cropped_full.py new file mode 100644 index 0000000000000000000000000000000000000000..71858b438057eab36b4f344120410cd8fc152f2f --- /dev/null +++ b/bob/bio/vein/config/database/protocol/cropped_full.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 14:50:58 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# VeraFinger dataset, defined ar bob.db.verafinger. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> Cropped-Full verafinger +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> Cropped-Full verafinger + +# The protocol resource must be specified before the database resource. + +protocol = 'Cropped-Fifty' diff --git a/bob/bio/vein/config/database/protocol/fifty.py b/bob/bio/vein/config/database/protocol/fifty.py new file mode 100644 index 0000000000000000000000000000000000000000..fda157af040b4099f87d8875fb7426e8882b37dc --- /dev/null +++ b/bob/bio/vein/config/database/protocol/fifty.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 14:51:06 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# VeraFinger dataset, defined ar bob.db.verafinger. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> Fifty verafinger +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> Fifty verafinger + +# The protocol resource must be specified before the database resource. + +protocol = 'Fifty' diff --git a/bob/bio/vein/config/database/protocol/full.py b/bob/bio/vein/config/database/protocol/full.py new file mode 100644 index 0000000000000000000000000000000000000000..f45f15e67c02e97c6f620dee34f0d811bdec9e98 --- /dev/null +++ b/bob/bio/vein/config/database/protocol/full.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 14:51:11 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# VeraFinger dataset, defined ar bob.db.verafinger. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> Full verafinger +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> Full verafinger + +# The protocol resource must be specified before the database resource. + +protocol = 'Full' diff --git a/bob/bio/vein/config/database/protocol/left.py b/bob/bio/vein/config/database/protocol/left.py new file mode 100644 index 0000000000000000000000000000000000000000..e34f0d54ad0e3d9295cfeb925583e5fc6dc03843 --- /dev/null +++ b/bob/bio/vein/config/database/protocol/left.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 12:14:05 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# 3D Fingervein dataset, defined ar bob.db.fv3d. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> left fv3d +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> left fv3d + +# The protocol resource must be specified before the database resource. + +protocol = 'left' diff --git a/bob/bio/vein/config/database/protocol/right.py b/bob/bio/vein/config/database/protocol/right.py new file mode 100644 index 0000000000000000000000000000000000000000..d26cb9c0a397cfd72ed651bf0b14c5a368de351b --- /dev/null +++ b/bob/bio/vein/config/database/protocol/right.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 12:14:56 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# 3D Fingervein dataset, defined ar bob.db.fv3d. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> right fv3d +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> right fv3d + +# The protocol resource must be specified before the database resource. + +protocol = 'right' diff --git a/bob/bio/vein/config/database/protocol/stitched.py b/bob/bio/vein/config/database/protocol/stitched.py new file mode 100644 index 0000000000000000000000000000000000000000..4a0814d431ab564efe881de51808fb229fb316b2 --- /dev/null +++ b/bob/bio/vein/config/database/protocol/stitched.py @@ -0,0 +1,17 @@ +# author: Yannick Dayer <yannick.dayer@idiap.ch> +# Fri 16 Oct 2020 12:15:16 UTC+02 + +# This is a config file for bob.bio.vein +# It defines the database protocol to use with the Database Interface for the +# 3D Fingervein dataset, defined ar bob.db.fv3d. + +# It is defined as a resource in the setup file of this package. + +# Usage: +# $ bob bio pipelines vanilla-biometrics <pipeline> stitched fv3d +# or: +# $ bob bio pipelines vanilla-biometrics -p <pipeline> stitched fv3d + +# The protocol resource must be specified before the database resource. + +protocol = 'stitched' diff --git a/bob/bio/vein/configurations/putvein.py b/bob/bio/vein/config/database/putvein.py similarity index 85% rename from bob/bio/vein/configurations/putvein.py rename to bob/bio/vein/config/database/putvein.py index 3d2132f52257cf07d5e82e3e2ee5cbfbe51c616c..2cbc01fe7c82a6d6b6bc70a6e674930e99aa98a2 100644 --- a/bob/bio/vein/configurations/putvein.py +++ b/bob/bio/vein/config/database/putvein.py @@ -17,15 +17,24 @@ the link. """ from bob.extension import rc -from ..database.putvein import PutveinBioDatabase +from bob.bio.vein.database.putvein import PutveinBioDatabase from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector +import logging +logger = logging.getLogger("bob.bio.vein") + _putvein_directory = rc["bob.db.putvein.directory"] """Value in ``~/.bobrc`` for this dataset directory""" +# Set default protocol if not given via a config file +if 'protocol' not in locals(): + logger.info("protocol not specified, using default: 'central'") + protocol = 'central' + legacy_database = PutveinBioDatabase( original_directory = _putvein_directory, original_extension = '.bmp', + protocol = protocol, ) """The :py:class:`bob.bio.base.database.BioDatabase` derivative with PUT Vein database settings @@ -61,9 +70,4 @@ command-line of ``verify.py`` or using the keyword ``protocol`` on a configuration file that is loaded **after** this configuration resource. """ - - - - - - +logger.debug(f"loaded database putvein config file, using protocol '{protocol}'.") diff --git a/bob/bio/vein/configurations/utfvp.py b/bob/bio/vein/config/database/utfvp.py similarity index 82% rename from bob/bio/vein/configurations/utfvp.py rename to bob/bio/vein/config/database/utfvp.py index 4285598e192d999e957507d635f640b23c0d57b5..96e1ffbcdf0828e5ac7cffd2f01bc83f0be4b66f 100644 --- a/bob/bio/vein/configurations/utfvp.py +++ b/bob/bio/vein/config/database/utfvp.py @@ -18,15 +18,24 @@ You can download the raw data of the `UTFVP`_ database by following the link. """ from bob.extension import rc -from ..database.utfvp import Database +from bob.bio.vein.database.utfvp import Database from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector +import logging +logger = logging.getLogger("bob.bio.vein") + _utfvp_directory = rc["bob.db.utfvp.directory"] """Value in ``~/.bobrc`` for this dataset directory""" +# Set default protocol if not given via a config file +if 'protocol' not in locals(): + logger.info("protocol not specified, using default: 'central'") + protocol = 'central' + legacy_database = Database( original_directory = _utfvp_directory, original_extension = '.png', + protocol = protocol, ) """The :py:class:`bob.bio.base.database.BioDatabase` derivative with UTFVP settings """ @@ -52,6 +61,4 @@ installed the `utfvp`_ dataset, as explained in the section :ref:`bob.bio.vein.baselines`. """ - - -protocol = 'nom' # TODO protocol implementation in bob pipelines? +logger.debug(f"Loaded database utfvp config file, using protocol '{protocol}'.") diff --git a/bob/bio/vein/configurations/verafinger.py b/bob/bio/vein/config/database/verafinger.py similarity index 77% rename from bob/bio/vein/configurations/verafinger.py rename to bob/bio/vein/config/database/verafinger.py index fe102b3d037b5080e3b0d632548521a6cb4704f4..37c88cc322cca8aee6ca573e967cf8aa4644fc1a 100644 --- a/bob/bio/vein/configurations/verafinger.py +++ b/bob/bio/vein/config/database/verafinger.py @@ -16,18 +16,17 @@ from bob.extension import rc from bob.bio.vein.database.verafinger import Database from bob.bio.base.pipelines.vanilla_biometrics import DatabaseConnector +import logging +logger = logging.getLogger("bob.bio.vein") + _verafinger_directory = rc["bob.db.verafinger.directory"] """Value in ``~/.bobrc`` for this dataset directory""" -protocol = 'Nom' # TODO protocol implementation in bob pipelines? -"""The default protocol to use for tests +# Set default protocol if not given via a config file +if 'protocol' not in locals(): + logger.info("protocol not specified, using default: 'central'") + protocol = 'central' -We accept any biometric recognition protocol implemented by bob.db.verafinger. -Variants of the biometric recognition protocol ending in ``-va`` can be used to -test for vulnerability analysis. For example, use the protocol ``Nom-va`` to -test the vulnerability of a biometric recognition pipeline using the ``Nom`` -protocol for enrollment and probe samples from presentation attacks. -""" """Updated with the wrapper for the pipelines package""" database = DatabaseConnector(Database( @@ -53,3 +52,6 @@ Notice that ``original_directory`` is set to installed the `vera fingervein`_ dataset, as explained in the section :ref:`bob.bio.vein.baselines`. """ + +print(f"VERAFINGER: protocol = '{protocol}'.") +logger.debug(f"Loaded database verafinger config file, using protocol '{protocol}'.") diff --git a/bob/bio/vein/configurations/gridio4g48.py b/bob/bio/vein/config/gridio4g48.py similarity index 100% rename from bob/bio/vein/configurations/gridio4g48.py rename to bob/bio/vein/config/gridio4g48.py diff --git a/bob/bio/vein/configurations/maximum_curvature.py b/bob/bio/vein/config/maximum_curvature.py similarity index 100% rename from bob/bio/vein/configurations/maximum_curvature.py rename to bob/bio/vein/config/maximum_curvature.py diff --git a/bob/bio/vein/configurations/parallel.py b/bob/bio/vein/config/parallel.py similarity index 100% rename from bob/bio/vein/configurations/parallel.py rename to bob/bio/vein/config/parallel.py diff --git a/bob/bio/vein/config/principal_curvature.py b/bob/bio/vein/config/principal_curvature.py new file mode 100644 index 0000000000000000000000000000000000000000..cd581e6165c71b935a4a464562f4f32ff5ea3540 --- /dev/null +++ b/bob/bio/vein/config/principal_curvature.py @@ -0,0 +1,88 @@ +#!/usr/bin/env python +# vim: set fileencoding=utf-8 : +# Tue 27 Sep 2016 16:48:16 CEST + +"""Huang's Principal Curvature extractor and Miura Matching baseline + +References: + +1. [HDLTL10]_ +2. [TV13]_ +3. [TVM14]_ + +""" + +from bob.bio.vein.preprocessor import ( + NoCrop, + TomesLeeMask, + HuangNormalization, + NoFilter, + Preprocessor, +) + +legacy_preprocessor = Preprocessor( + crop=NoCrop(), + mask=TomesLeeMask(), + normalize=HuangNormalization(), + filter=NoFilter(), +) +"""Preprocessing using gray-level based finger cropping and no post-processing +""" + + +from bob.bio.vein.extractor import PrincipalCurvature + +legacy_extractor = PrincipalCurvature() + + +from bob.bio.base.transformers import ( + PreprocessorTransformer, + ExtractorTransformer +) +from sklearn.pipeline import make_pipeline +from bob.pipelines import wrap + + +transformer = make_pipeline( + wrap(["sample"], PreprocessorTransformer(legacy_preprocessor)), + wrap(["sample"], ExtractorTransformer(legacy_extractor)) +) + + +from bob.bio.vein.algorithm import MiuraMatch + +# Notice the values of ch and cw are different than those from the +# repeated-line tracking **and** maximum curvature baselines. +legacy_algorithm = MiuraMatch(ch=18, cw=28) +"""Miura-matching algorithm with specific settings for search displacement + +Defaults taken from [TV13]_. +""" + +import os +from pathlib import Path +from tempfile import TemporaryDirectory + +sub_directory = "pc" + +user_temp = Path("/idiap/") / "temp" / os.environ["USER"] +if user_temp.exists(): + # use /idiap/temp/<USER>/bob_bio_vein_tmp/<SUBDIRECTORY>/ + legacy_temp_dir = user_temp / "bob_bio_vein_tmp" / sub_directory + print(f"Saving legacy temp in '{legacy_temp_dir}'") +else: + # if /idiap/temp/<USER> does not exist, use /tmp/tmpxxxxxxxx + legacy_temp_dir = TemporaryDirectory().name + + +from bob.bio.base.pipelines.vanilla_biometrics import ( + VanillaBiometricsPipeline, + BioAlgorithmLegacy, +) + +biometric_algorithm = BioAlgorithmLegacy( + legacy_algorithm, + base_dir=legacy_temp_dir, +) + +pipeline = VanillaBiometricsPipeline(transformer, biometric_algorithm) diff --git a/bob/bio/vein/configurations/repeated_line_tracking.py b/bob/bio/vein/config/repeated_line_tracking.py similarity index 100% rename from bob/bio/vein/configurations/repeated_line_tracking.py rename to bob/bio/vein/config/repeated_line_tracking.py diff --git a/bob/bio/vein/configurations/wide_line_detector.py b/bob/bio/vein/config/wide_line_detector.py similarity index 100% rename from bob/bio/vein/configurations/wide_line_detector.py rename to bob/bio/vein/config/wide_line_detector.py diff --git a/setup.py b/setup.py index 28ec2706a7af65dbf5882fac4dae407ca32b8111..38ae312b194a0306af94bfbb69e98b8d2b9dc7a8 100644 --- a/setup.py +++ b/setup.py @@ -32,11 +32,32 @@ setup( entry_points={ 'bob.bio.config': [ + # protocols TODO: add all protocols + # verafinger + 'Nom = bob.bio.vein.configurations.database.protocol.Nom', + 'Cropped-Nom = bob.bio.vein.configurations.database.protocol.cropped_Nom', + 'B = bob.bio.vein.configurations.database.protocol.b', + 'Cropped-B = bob.bio.vein.configurations.database.protocol.cropped_b', + 'Full = bob.bio.vein.configurations.database.protocol.full', + 'Cropped-Full = bob.bio.vein.configurations.database.protocol.cropped_full', + 'Fifty = bob.bio.vein.configurations.database.protocol.fifty', + 'Cropped-Fifty = bob.bio.vein.configurations.database.protocol.cropped_fifty', + # utfvp + # 'nom = bob.bio.vein.configurations.database.protocol.nom', + # fv3d + 'central = bob.bio.vein.configurations.database.protocol.central', + 'left = bob.bio.vein.configurations.database.protocol.left', + 'right = bob.bio.vein.configurations.database.protocol.right', + 'stitched = bob.bio.vein.configurations.database.protocol.stitched', + # putvein + # 'wrist-LR_1 = bob.bio.vein.configurations.database.protocol.wristLR_1', + # TODO That will be a LOT of protocols, for putvein... + # legacy databases - 'verafinger = bob.bio.vein.configurations.verafinger', - 'utfvp = bob.bio.vein.configurations.utfvp', - 'fv3d = bob.bio.vein.configurations.fv3d', - 'putvein = bob.bio.vein.configurations.putvein', + 'verafinger = bob.bio.vein.configurations.database.verafinger', + 'utfvp = bob.bio.vein.configurations.database.utfvp', + 'fv3d = bob.bio.vein.configurations.database.fv3d', + 'putvein = bob.bio.vein.configurations.database.putvein', # legacy baselines 'mc = bob.bio.vein.configurations.maximum_curvature', @@ -50,10 +71,10 @@ setup( ], 'bob.bio.database': [ - 'verafinger = bob.bio.vein.configurations.verafinger:database', - 'utfvp = bob.bio.vein.configurations.utfvp:database', - 'fv3d = bob.bio.vein.configurations.fv3d:database', - 'putvein = bob.bio.vein.configurations.putvein:database', + 'verafinger = bob.bio.vein.configurations.database.verafinger:database', + 'utfvp = bob.bio.vein.configurations.database.utfvp:database', + 'fv3d = bob.bio.vein.configurations.database.fv3d:database', + 'putvein = bob.bio.vein.configurations.database.putvein:database', ], 'bob.bio.pipeline': [