From 8d48fd4a23b27613595f9c1820b3b5161f69aa63 Mon Sep 17 00:00:00 2001
From: Xinyi ZHANG <xzhang@vws101.idiap.ch>
Date: Tue, 13 Apr 2021 21:45:20 +0200
Subject: [PATCH] =?UTF-8?q?=E2=80=9Dchang=5Fgpu=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bob/bio/face/extractor/opencv_caffe.py | 6 ++----
bob/bio/face/extractor/pytorch_model.py | 9 +++------
bob/bio/face/extractor/tf_model.py | 5 +----
conda/meta.yaml | 2 --
4 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/bob/bio/face/extractor/opencv_caffe.py b/bob/bio/face/extractor/opencv_caffe.py
index 7634e4c1..53ab52a6 100644
--- a/bob/bio/face/extractor/opencv_caffe.py
+++ b/bob/bio/face/extractor/opencv_caffe.py
@@ -40,14 +40,12 @@ class opencv_model(TransformerMixin, BaseEstimator):
.. note::
This structure only can be used for CAFFE pretrained model.
- **Parameters:**
- use_gpu: True or False.
+
"""
- def __init__(self, use_gpu=False, **kwargs):
+ def __init__(self, **kwargs):
super().__init__(**kwargs)
self.model = None
- self.use_gpu = use_gpu
internal_path = pkg_resources.resource_filename(
__name__, os.path.join("data", "opencv_model"),
diff --git a/bob/bio/face/extractor/pytorch_model.py b/bob/bio/face/extractor/pytorch_model.py
index d784d7f4..2d7a5f1c 100644
--- a/bob/bio/face/extractor/pytorch_model.py
+++ b/bob/bio/face/extractor/pytorch_model.py
@@ -29,14 +29,12 @@ class pytorch_loaded_model(TransformerMixin, BaseEstimator):
The extracted features can be combined with different the algorithms.
- **Parameters:**
- use_gpu: True or False.
+
"""
- def __init__(self, use_gpu=False, **kwargs):
+ def __init__(self, **kwargs):
super().__init__(**kwargs)
self.model = None
- self.use_gpu = use_gpu
internal_path = pkg_resources.resource_filename(
__name__, os.path.join("data", "resnet"),
@@ -110,10 +108,9 @@ class pytorch_library_model(TransformerMixin, BaseEstimator):
use_gpu: True or False.
"""
- def __init__(self, model=None, use_gpu=False, **kwargs):
+ def __init__(self, model=None, **kwargs):
super().__init__(**kwargs)
self.model = model
- self.use_gpu = use_gpu
internal_path = pkg_resources.resource_filename(
__name__, os.path.join("data", "resnet"),
diff --git a/bob/bio/face/extractor/tf_model.py b/bob/bio/face/extractor/tf_model.py
index ae39ebb4..c690f2ac 100644
--- a/bob/bio/face/extractor/tf_model.py
+++ b/bob/bio/face/extractor/tf_model.py
@@ -30,14 +30,11 @@ class tf_model(TransformerMixin, BaseEstimator):
The extracted features can be combined with different the algorithms.
- **Parameters:**
- use_gpu: True or False.
"""
- def __init__(self, use_gpu=False, **kwargs):
+ def __init__(self, **kwargs):
super().__init__(**kwargs)
self.model = None
- self.use_gpu = use_gpu
internal_path = pkg_resources.resource_filename(
__name__, os.path.join("data", "resnet"),
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 129c3dc2..6250242c 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -43,8 +43,6 @@ requirements:
- scikit-image {{ scikit_image }}
- six {{ six }}
- tensorflow {{ tensorflow }} # [linux]
- - mxnet {{ mxnet }}
- - opencv-pyrhon {{ opencv_python }}
run:
- python
- setuptools
--
GitLab