diff --git a/bob/bio/base/pipelines/vanilla_biometrics/__init__.py b/bob/bio/base/pipelines/vanilla_biometrics/__init__.py index 40b552d2711475e928595fdd8876b41179a6fee6..5f6a882001b489ec6708465963389bf0d2e32380 100644 --- a/bob/bio/base/pipelines/vanilla_biometrics/__init__.py +++ b/bob/bio/base/pipelines/vanilla_biometrics/__init__.py @@ -1,11 +1,6 @@ -# see https://docs.python.org/3/library/pkgutil.html -from pkgutil import extend_path - from .pipelines import VanillaBiometricsPipeline from .biometric_algorithms import Distance from .score_writers import FourColumnsScoreWriter, CSVScoreWriter from .wrappers import BioAlgorithmCheckpointWrapper, BioAlgorithmDaskWrapper, dask_vanilla_biometrics -from .legacy import BioAlgorithmLegacy, DatabaseConnector - -__path__ = extend_path(__path__, __name__) +from .legacy import BioAlgorithmLegacy, DatabaseConnector \ No newline at end of file diff --git a/bob/bio/base/test/test_transformers.py b/bob/bio/base/test/test_transformers.py index 658f448ba840c1fdc1a75b635d3797f18cd18728..ed8575b8b68682c9ba4b73189b09e59dcff4026a 100644 --- a/bob/bio/base/test/test_transformers.py +++ b/bob/bio/base/test/test_transformers.py @@ -19,7 +19,7 @@ from bob.bio.base.wrappers import ( wrap_preprocessor, wrap_extractor, wrap_algorithm, - wrap_transform_bob, + wrap_bob_legacy, ) from sklearn.pipeline import make_pipeline @@ -263,13 +263,13 @@ def test_wrap_bob_pipeline(): with tempfile.TemporaryDirectory() as dir_name: pipeline = make_pipeline( - wrap_transform_bob( + wrap_bob_legacy( FakePreprocesor(), dir_name, transform_extra_arguments=(("annotations", "annotations"),), ), - wrap_transform_bob(FakeExtractor(), dir_name,), - wrap_transform_bob(FakeAlgorithm(), dir_name), + wrap_bob_legacy(FakeExtractor(), dir_name,), + wrap_bob_legacy(FakeAlgorithm(), dir_name), ) oracle = [7.0, 7.0, 7.0, 7.0] training_samples = generate_samples(n_subjects=2, n_samples_per_subject=2) diff --git a/bob/bio/base/test/test_vanilla_biometrics.py b/bob/bio/base/test/test_vanilla_biometrics.py index d36ae1659e0d06202edcf09a1018c6066601a055..2a85d33442826288b461b8b2a6f521c510d5846d 100644 --- a/bob/bio/base/test/test_vanilla_biometrics.py +++ b/bob/bio/base/test/test_vanilla_biometrics.py @@ -7,7 +7,7 @@ import os import numpy as np import tempfile from sklearn.pipeline import make_pipeline -from bob.bio.base.wrappers import wrap_transform_bob +from bob.bio.base.wrappers import wrap_bob_legacy from bob.bio.base.test.test_transformers import FakePreprocesor, FakeExtractor, FakeAlgorithm from bob.bio.base.pipelines.vanilla_biometrics import ( Distance, @@ -96,25 +96,25 @@ class DummyDatabase: def _make_transformer(dir_name): pipeline = make_pipeline( - wrap_transform_bob( + wrap_bob_legacy( FakePreprocesor(), dir_name, transform_extra_arguments=(("annotations", "annotations"),), ), - wrap_transform_bob(FakeExtractor(), dir_name,) + wrap_bob_legacy(FakeExtractor(), dir_name,) ) return pipeline def _make_transformer_with_algorithm(dir_name): pipeline = make_pipeline( - wrap_transform_bob( + wrap_bob_legacy( FakePreprocesor(), dir_name, transform_extra_arguments=(("annotations", "annotations"),), ), - wrap_transform_bob(FakeExtractor(), dir_name), - wrap_transform_bob(FakeAlgorithm(), dir_name) + wrap_bob_legacy(FakeExtractor(), dir_name), + wrap_bob_legacy(FakeAlgorithm(), dir_name) ) return pipeline diff --git a/bob/bio/base/wrappers.py b/bob/bio/base/wrappers.py index cee892007d424f08f46519bd41b5a36b929f46cf..dc2ef7d82176b28fd98c60f02a44e80adb4a3d6a 100644 --- a/bob/bio/base/wrappers.py +++ b/bob/bio/base/wrappers.py @@ -13,7 +13,7 @@ import bob.pipelines as mario import os -def wrap_transform_bob( +def wrap_bob_legacy( bob_object, dir_name, fit_extra_arguments=(("y", "subject"),),