diff --git a/bob/bio/face/annotator/__init__.py b/bob/bio/face/annotator/__init__.py index b058d897018835424f7b6c4d999c85d289df513a..1434c9b48b046726a65280502fa0336b5056526d 100644 --- a/bob/bio/face/annotator/__init__.py +++ b/bob/bio/face/annotator/__init__.py @@ -1,6 +1,5 @@ import bob.ip.facedetect - def bounding_box_to_annotations(bbx): """Converts :any:`bob.ip.facedetect.BoundingBox` to dictionary annotations. diff --git a/bob/bio/face/annotator/bobiptinyface.py b/bob/bio/face/annotator/bobiptinyface.py index a3702d20581da0f938cfa68757186a3637b0bdaa..d2790c826d61e4510cfa1e2a61d51166f9d1e270 100644 --- a/bob/bio/face/annotator/bobiptinyface.py +++ b/bob/bio/face/annotator/bobiptinyface.py @@ -33,4 +33,3 @@ class BobIpTinyface(Base): return {"topleft": (r[0], r[1]), "bottomright": (r[2], r[3])} else: return None - diff --git a/bob/bio/face/config/annotator/tinyface.py b/bob/bio/face/config/annotator/tinyface.py index 2274bfeff38e836c34e34cb1846915b58a6d769e..bf223ea9802174d27ca2b7c0a41c6da61fb56f2e 100644 --- a/bob/bio/face/config/annotator/tinyface.py +++ b/bob/bio/face/config/annotator/tinyface.py @@ -1,3 +1,3 @@ from bob.bio.face.annotator import BobIpTinyface -annotator = BobIpTinyface() +annotator = BobIpTinyface() \ No newline at end of file diff --git a/bob/bio/face/config/baseline/mxnet_pipe.py b/bob/bio/face/config/baseline/mxnet_pipe.py index 449d01e3f4fbbb02e3bdeeeb8bfefd37759ed7ba..eeb062004bc0e55b3db402dfa8e39be42d9ed3cf 100644 --- a/bob/bio/face/config/baseline/mxnet_pipe.py +++ b/bob/bio/face/config/baseline/mxnet_pipe.py @@ -61,4 +61,3 @@ transformer = make_pipeline( # Assemble the Vanilla Biometric pipeline and execute pipeline = VanillaBiometricsPipeline(transformer, algorithm) transformer = pipeline.transformer - diff --git a/bob/bio/face/config/baseline/opencv_pipe.py b/bob/bio/face/config/baseline/opencv_pipe.py index aac2d3f1c45559e35545fb66a5c02ca97aa76790..cff19b26f12f519e003343efb3387cb104fbf333 100644 --- a/bob/bio/face/config/baseline/opencv_pipe.py +++ b/bob/bio/face/config/baseline/opencv_pipe.py @@ -68,4 +68,4 @@ transformer = make_pipeline( # Assemble the Vanilla Biometric pipeline and execute pipeline = VanillaBiometricsPipeline(transformer, algorithm) -transformer = pipeline.transformer +transformer = pipeline.transformer \ No newline at end of file diff --git a/bob/bio/face/config/baseline/pytorch_pipe_v1.py b/bob/bio/face/config/baseline/pytorch_pipe_v1.py index 99e5dbada6a6c0d360dc5480d3ac3f79527efdca..ec5c4d9d619110d81c0c576088112aee10d6d282 100644 --- a/bob/bio/face/config/baseline/pytorch_pipe_v1.py +++ b/bob/bio/face/config/baseline/pytorch_pipe_v1.py @@ -61,4 +61,3 @@ transformer = make_pipeline( # Assemble the Vanilla Biometric pipeline and execute pipeline = VanillaBiometricsPipeline(transformer, algorithm) transformer = pipeline.transformer - diff --git a/bob/bio/face/config/baseline/pytorch_pipe_v2.py b/bob/bio/face/config/baseline/pytorch_pipe_v2.py index 212d8bb91cdd5654162bf585342e567846beca3c..630609e6fb22085783fa8c977ddc9702615d3364 100644 --- a/bob/bio/face/config/baseline/pytorch_pipe_v2.py +++ b/bob/bio/face/config/baseline/pytorch_pipe_v2.py @@ -64,4 +64,3 @@ transformer = make_pipeline( # Assemble the Vanilla Biometric pipeline and execute pipeline = VanillaBiometricsPipeline(transformer, algorithm) transformer = pipeline.transformer - diff --git a/bob/bio/face/config/baseline/tf_pipe.py b/bob/bio/face/config/baseline/tf_pipe.py index e6dfe6253470415783206dc63c1c463fa9ff2cf1..22c24d95abcf88bf1acb9c9fe9f587fbd7abeccd 100644 --- a/bob/bio/face/config/baseline/tf_pipe.py +++ b/bob/bio/face/config/baseline/tf_pipe.py @@ -64,4 +64,3 @@ transformer = make_pipeline( # Assemble the Vanilla Biometric pipeline and execute pipeline = VanillaBiometricsPipeline(transformer, algorithm) transformer = pipeline.transformer - diff --git a/bob/bio/face/extractor/__init__.py b/bob/bio/face/extractor/__init__.py index 32b97163775852dbca316f538672be6bccf2095d..21b237ad7b0acc5d13b492efb2aa9977a0ddd116 100644 --- a/bob/bio/face/extractor/__init__.py +++ b/bob/bio/face/extractor/__init__.py @@ -7,6 +7,7 @@ from .pytorch_model import pytorch_library_model from .tf_model import tf_model from .opencv_caffe import opencv_model + # gets sphinx autodoc done right - don't remove it def __appropriate__(*args): """Says object was actually declared here, and not in the import module. diff --git a/bob/bio/face/extractor/mxnet_resnet.py b/bob/bio/face/extractor/mxnet_resnet.py index aab050bfadd851e015e8b19e736a52aa854807e9..fd102ef0edf151c3673d672542788c4e0f31bb99 100644 --- a/bob/bio/face/extractor/mxnet_resnet.py +++ b/bob/bio/face/extractor/mxnet_resnet.py @@ -78,7 +78,7 @@ class mxnet_model(TransformerMixin, BaseEstimator): """ if self.model is None: - self.load_model() + self._load_model() X = check_array(X, allow_nd=True) X = mx.nd.array(X) @@ -94,4 +94,4 @@ class mxnet_model(TransformerMixin, BaseEstimator): return d def _more_tags(self): - return {"stateless": True, "requires_fit": False} + return {"stateless": True, "requires_fit": False} \ No newline at end of file diff --git a/bob/bio/face/extractor/opencv_caffe.py b/bob/bio/face/extractor/opencv_caffe.py index 647fc724fe4e1087e488f89e24ed42de750552fa..d824caf05eaedc67c9787ad9ee5928278f04fd0f 100644 --- a/bob/bio/face/extractor/opencv_caffe.py +++ b/bob/bio/face/extractor/opencv_caffe.py @@ -85,7 +85,7 @@ class opencv_model(TransformerMixin, BaseEstimator): """ if self.model is None: - self.load_model() + self._load_model() img = np.array(X) @@ -102,4 +102,4 @@ class opencv_model(TransformerMixin, BaseEstimator): return d def _more_tags(self): - return {"stateless": True, "requires_fit": False} + return {"stateless": True, "requires_fit": False} \ No newline at end of file diff --git a/bob/bio/face/extractor/pytorch_model.py b/bob/bio/face/extractor/pytorch_model.py index 52c4f172d1c74f7018429261a072d8185bd69289..9bdda0aee760c7f08f182cdb6b19b6db5ac41b63 100644 --- a/bob/bio/face/extractor/pytorch_model.py +++ b/bob/bio/face/extractor/pytorch_model.py @@ -79,7 +79,7 @@ class pytorch_loaded_model(TransformerMixin, BaseEstimator): """ if self.model is None: - self.load_model() + self._load_model() X = torch.Tensor(X) @@ -162,4 +162,4 @@ class pytorch_library_model(TransformerMixin, BaseEstimator): return d def _more_tags(self): - return {"stateless": True, "requires_fit": False} + return {"stateless": True, "requires_fit": False} \ No newline at end of file diff --git a/bob/bio/face/extractor/tf_model.py b/bob/bio/face/extractor/tf_model.py index 9e83ec389dafb05b1d9031c52338e235a9086ef8..fb6fed55b64b78a7c91a631bd4ccfe5e8f672192 100644 --- a/bob/bio/face/extractor/tf_model.py +++ b/bob/bio/face/extractor/tf_model.py @@ -73,7 +73,7 @@ class tf_model(TransformerMixin, BaseEstimator): """ if self.model is None: - self.load_model() + self._load_model() X = check_array(X, allow_nd=True) X = tf.convert_to_tensor(X) @@ -92,4 +92,4 @@ class tf_model(TransformerMixin, BaseEstimator): return d def _more_tags(self): - return {"stateless": True, "requires_fit": False} + return {"stateless": True, "requires_fit": False} \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 02e30ac5109f4d32cb93c768ec7a78195f25de94..bcd1763c12212b5e0c1ea6a1bbe82674f26f7f28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -22,4 +22,4 @@ mxnet opencv-python six scikit-image -scikit-learn # for pipelines Tranformers +scikit-learn # for pipelines Tranformers \ No newline at end of file diff --git a/setup.py b/setup.py index 1f278141e0e97753d13de4c23fd038fe3b446648..1b89313b5655bf3c32dd43cd65e66430a5862937 100644 --- a/setup.py +++ b/setup.py @@ -214,4 +214,4 @@ setup( "Programming Language :: Python", "Topic :: Scientific/Engineering :: Artificial Intelligence", ], -) +) \ No newline at end of file