diff --git a/bob/bio/face/annotator/__init__.py b/bob/bio/face/annotator/__init__.py index 9804d7d43d4db4d14c6f041cb141a85ece730dc5..600daa739fc6ccb8e34cdc3c2f4e23516d6e2093 100644 --- a/bob/bio/face/annotator/__init__.py +++ b/bob/bio/face/annotator/__init__.py @@ -57,7 +57,6 @@ def min_face_size_validator(annotations, min_face_size=(32, 32)): from .Base import Base from .bobipfacedetect import BobIpFacedetect from .bobipflandmark import BobIpFlandmark -from .bobipdlib import BobIpDlib from .bobipmtcnn import BobIpMTCNN @@ -84,7 +83,6 @@ __appropriate__( Base, BobIpFacedetect, BobIpFlandmark, - BobIpDlib, BobIpMTCNN, ) diff --git a/bob/bio/face/annotator/bobipdlib.py b/bob/bio/face/annotator/bobipdlib.py deleted file mode 100644 index 5b9aac8c1a3b709dc27b5a1ef658f4413de2ce29..0000000000000000000000000000000000000000 --- a/bob/bio/face/annotator/bobipdlib.py +++ /dev/null @@ -1,35 +0,0 @@ -from . import Base, bounding_box_to_annotations -import bob.ip.facedetect - - -class BobIpDlib(Base): - """Annotator using bob.ip.dlib""" - - def __init__(self, **kwargs): - super(BobIpDlib, self).__init__(**kwargs) - from bob.ip.dlib import DlibLandmarkExtraction - self.detector = DlibLandmarkExtraction(bob_landmark_format=True) - - def annotate(self, image, **kwargs): - """Annotates an image using bob.ip.dlib - - Parameters - ---------- - image : numpy.array - An RGB image in Bob format. - **kwargs - Ignored. - - Returns - ------- - dict - Annotations contain: (topleft, bottomright, leye, reye, nose, - mouthleft, mouthright). - """ - landmarks = self.detector(image) - if not landmarks: - return None - bounding_box = bob.ip.facedetect.bounding_box_from_annotation( - source='eyes', **landmarks) - landmarks.update(bounding_box_to_annotations(bounding_box)) - return landmarks diff --git a/bob/bio/face/config/annotator/dlib.py b/bob/bio/face/config/annotator/dlib.py deleted file mode 100644 index 5475604c9bc580fe416efda6ddabbbca91989df2..0000000000000000000000000000000000000000 --- a/bob/bio/face/config/annotator/dlib.py +++ /dev/null @@ -1,3 +0,0 @@ -from bob.bio.face.annotator import BobIpDlib - -annotator = BobIpDlib() diff --git a/doc/implemented.rst b/doc/implemented.rst index 5db52a00cba27b61fae93b6465afba704e4091d4..442fe76fa651341338da2af12fd6984dca4ba304 100644 --- a/doc/implemented.rst +++ b/doc/implemented.rst @@ -35,7 +35,6 @@ Face Image Annotators bob.bio.face.annotator.Base bob.bio.face.annotator.BobIpFacedetect bob.bio.face.annotator.BobIpFlandmark - bob.bio.face.annotator.BobIpDlib bob.bio.face.annotator.BobIpMTCNN diff --git a/setup.py b/setup.py index 1d257edc2ee2292f1c0c4cd3efd89f3e5bdf906d..a1ea40f72720edd134ffc2f0c7e4cf4566b26874 100644 --- a/setup.py +++ b/setup.py @@ -117,7 +117,7 @@ setup( 'gbu = bob.bio.face.config.database.gbu:database', 'ijba = bob.bio.face.config.database.ijba:database', 'ijbb = bob.bio.face.config.database.ijbb:database', - + 'ijbc-11 = bob.bio.face.config.database.ijbc:ijbc_11', 'ijbc-covariates = bob.bio.face.config.database.ijbc:ijbc_covariates', @@ -142,7 +142,6 @@ setup( 'facedetect = bob.bio.face.config.annotator.facedetect:annotator', 'facedetect-eye-estimate = bob.bio.face.config.annotator.facedetect_eye_estimate:annotator', 'flandmark = bob.bio.face.config.annotator.flandmark:annotator', - 'dlib = bob.bio.face.config.annotator.dlib:annotator', 'mtcnn = bob.bio.face.config.annotator.mtcnn:annotator', ],