From 669ba62b3e97c818cd020aeb1460652ab8c34189 Mon Sep 17 00:00:00 2001
From: Xinyi ZHANG <xzhang@vws101.idiap.ch>
Date: Mon, 12 Apr 2021 13:22:48 +0200
Subject: [PATCH] =?UTF-8?q?=E2=80=9Dnew=5Fversion=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bob/bio/face/config/annotator/tinyface.py | 2 +-
bob/bio/face/config/baseline/opencv_pipe.py | 2 +-
bob/bio/face/extractor/__init__.py | 1 -
bob/bio/face/extractor/mxnet_resnet.py | 2 +-
bob/bio/face/extractor/opencv_caffe.py | 4 +++-
bob/bio/face/extractor/pytorch_model.py | 10 ++--------
bob/bio/face/extractor/tf_model.py | 2 +-
doc/references.rst | 2 +-
8 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/bob/bio/face/config/annotator/tinyface.py b/bob/bio/face/config/annotator/tinyface.py
index bf223ea9..2274bfef 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()
\ No newline at end of file
+annotator = BobIpTinyface()
diff --git a/bob/bio/face/config/baseline/opencv_pipe.py b/bob/bio/face/config/baseline/opencv_pipe.py
index cff19b26..aac2d3f1 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
\ No newline at end of file
+transformer = pipeline.transformer
diff --git a/bob/bio/face/extractor/__init__.py b/bob/bio/face/extractor/__init__.py
index 21b237ad..32b97163 100644
--- a/bob/bio/face/extractor/__init__.py
+++ b/bob/bio/face/extractor/__init__.py
@@ -7,7 +7,6 @@ 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 fd102ef0..213c6971 100644
--- a/bob/bio/face/extractor/mxnet_resnet.py
+++ b/bob/bio/face/extractor/mxnet_resnet.py
@@ -94,4 +94,4 @@ class mxnet_model(TransformerMixin, BaseEstimator):
return d
def _more_tags(self):
- return {"stateless": True, "requires_fit": False}
\ No newline at end of file
+ return {"stateless": True, "requires_fit": False}
diff --git a/bob/bio/face/extractor/opencv_caffe.py b/bob/bio/face/extractor/opencv_caffe.py
index d824caf0..f3951f8b 100644
--- a/bob/bio/face/extractor/opencv_caffe.py
+++ b/bob/bio/face/extractor/opencv_caffe.py
@@ -85,6 +85,7 @@ class opencv_model(TransformerMixin, BaseEstimator):
"""
if self.model is None:
+
self._load_model()
img = np.array(X)
@@ -102,4 +103,5 @@ class opencv_model(TransformerMixin, BaseEstimator):
return d
def _more_tags(self):
- return {"stateless": True, "requires_fit": False}
\ No newline at end of file
+
+ return {"stateless": True, "requires_fit": False}
diff --git a/bob/bio/face/extractor/pytorch_model.py b/bob/bio/face/extractor/pytorch_model.py
index 9bdda0ae..fb5d5161 100644
--- a/bob/bio/face/extractor/pytorch_model.py
+++ b/bob/bio/face/extractor/pytorch_model.py
@@ -94,15 +94,9 @@ class pytorch_loaded_model(TransformerMixin, BaseEstimator):
return d
def _more_tags(self):
+
return {"stateless": True, "requires_fit": False}
-
-
-
-
-
-
-
-
+
class pytorch_library_model(TransformerMixin, BaseEstimator):
"""Extracts features using deep face recognition with registered model frames in the PyTorch Library.
diff --git a/bob/bio/face/extractor/tf_model.py b/bob/bio/face/extractor/tf_model.py
index fb6fed55..a2de8d5f 100644
--- a/bob/bio/face/extractor/tf_model.py
+++ b/bob/bio/face/extractor/tf_model.py
@@ -92,4 +92,4 @@ class tf_model(TransformerMixin, BaseEstimator):
return d
def _more_tags(self):
- return {"stateless": True, "requires_fit": False}
\ No newline at end of file
+ return {"stateless": True, "requires_fit": False}
diff --git a/doc/references.rst b/doc/references.rst
index 28b98d5f..bbb5417a 100644
--- a/doc/references.rst
+++ b/doc/references.rst
@@ -17,4 +17,4 @@ References
.. [ZSQ09] *W. Zhang, S. Shan, L. Qing, X. Chen and W. Gao*. **Are Gabor phases really useless for face recognition?** Pattern Analysis & Applications, 12:301-307, 2009.
.. [TFP18] de Freitas Pereira, Tiago, André Anjos, and Sébastien Marcel. "Heterogeneous face recognition using domain specific units." IEEE Transactions on Information Forensics and Security 14.7 (2018): 1803-1816.
.. [HRM06] *G. Heusch, Y. Rodriguez, and S. Marcel*. **Local Binary Patterns as an Image Preprocessing for Face Authentication**. In IEEE International Conference on Automatic Face and Gesture Recognition (AFGR), 2006.
-.. [LGB18] *C. Li, M. Gunther and T. E. Boult*. **ECLIPSE: Ensembles of Centroids Leveraging Iteratively Processed Spatial Eclipse Clustering**. 2018 IEEE Winter Conference on Applications of Computer Vision (WACV), Lake Tahoe, NV, USA, 2018, pp. 131-140, doi: 10.1109/WACV.2018.00021.
+.. [LGB18] *C. Li, M. Gunther and T. E. Boult*. **ECLIPSE: Ensembles of Centroids Leveraging Iteratively Processed Spatial Eclipse Clustering**. 2018 IEEE Winter Conference on Applications of Computer Vision (WACV), Lake Tahoe, NV, USA, 2018, pp. 131-140, doi: 10.1109/WACV.2018.00021.
\ No newline at end of file
--
GitLab