diff --git a/bob/pad/face/extractor/LBPHistogram.py b/bob/pad/face/extractor/LBPHistogram.py index 75d9b9719ed78ce6791110ac438bf970ec3216e1..0ade56de3cb23aa58f939bfc271b9436f67fad54 100644 --- a/bob/pad/face/extractor/LBPHistogram.py +++ b/bob/pad/face/extractor/LBPHistogram.py @@ -1,4 +1,3 @@ -from bob.ip.base import LBP, histogram import numpy as np from sklearn.base import BaseEstimator from sklearn.base import TransformerMixin diff --git a/bob/pad/face/test/dummy/database.py b/bob/pad/face/test/dummy/database.py index e8ef084437e3a79de1bda01fd7378bca7e2a0ba6..dc687aed30abf15ab55b7ff3cdbf9be979140218 100644 --- a/bob/pad/face/test/dummy/database.py +++ b/bob/pad/face/test/dummy/database.py @@ -1,10 +1,10 @@ -from bob.bio.base.test.utils import atnt_database_directory import bob.io.base import os from bob.pipelines import DelayedSample from bob.pad.base.pipelines.vanilla_pad.abstract_classes import Database from bob.db.base.utils import check_parameters_for_validity, convert_names_to_lowlevel from bob.bio.video import VideoLikeContainer +from bob.bio.base.database import AtntBioDatabase def DummyPadSample( @@ -35,13 +35,11 @@ class DummyDatabase(Database): def __init__(self, none_annotations=False): # call base class constructor with useful parameters super(DummyDatabase, self).__init__() - self.original_directory = atnt_database_directory() - import bob.db.atnt - - self._db = bob.db.atnt.Database() - self.low_level_names = ("world", "dev") - self.high_level_names = ("train", "dev") + self._db = AtntBioDatabase() + self.original_directory = self._db.original_directory self.none_annotations = none_annotations + self.high_level_names = ["train", "dev", "eval"] + self.low_level_names = ["world", "dev", "eval"] def _make_bio(self, files): files = [ diff --git a/bob/pad/face/test/test_transformers.py b/bob/pad/face/test/test_transformers.py index b527de156af9f6cea655727ce24193c9b3e45d0c..6bdc4cc6dcef531b59972fd0a0ca78888e1437cd 100644 --- a/bob/pad/face/test/test_transformers.py +++ b/bob/pad/face/test/test_transformers.py @@ -10,11 +10,9 @@ from bob.io.base.test_utils import datafile from bob.io.base import load -import bob.io.image # for image loading functionality - import bob.bio.video -from bob.ip.color import rgb_to_gray +from bob.bio.face.color import rgb_to_gray from bob.pad.face.extractor import LBPHistogram, ImageQualityMeasure diff --git a/bob/pad/face/utils/load_utils.py b/bob/pad/face/utils/load_utils.py index 088385ca85c76be32714a04674d5e7e14bec6f49..08a4be0eaf998bb042b9fadfb0158827567361b6 100644 --- a/bob/pad/face/utils/load_utils.py +++ b/bob/pad/face/utils/load_utils.py @@ -6,8 +6,7 @@ import bob.io.image import numpy from bob.bio.face.annotator import bounding_box_from_annotation, min_face_size_validator from bob.bio.video.annotator import normalize_annotations -from bob.ip.base import block, block_generator, block_output_shape, scale -from bob.ip.color import rgb_to_hsv, rgb_to_yuv +from bob.bio.face.color import rgb_to_hsv, rgb_to_yuv from imageio import get_reader diff --git a/conda/meta.yaml b/conda/meta.yaml index ff4a4f429617722123baeff8ecb931dd4c0c2e96..dc509333cc14b524665839c1e926ced104cb79e1 100644 --- a/conda/meta.yaml +++ b/conda/meta.yaml @@ -24,7 +24,6 @@ requirements: - pip {{ pip }} - bob.extension - bob.io.base - - bob.io.image - bob.ip.base - bob.ip.color - bob.ip.qualitymeasure diff --git a/requirements.txt b/requirements.txt index c0e85a1e8a73e312c6a7a13bef3f77d51518cef5..cca96a183570028ec2aa59287a585e0c98e45c1d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,6 @@ bob.ip.base bob.pad.base bob.bio.face bob.bio.video -bob.io.image bob.ip.color bob.ip.qualitymeasure scikit-learn