diff --git a/bob/bio/face/extractor/opencv_caffe.py b/bob/bio/face/extractor/opencv_caffe.py index f3951f8b94ab8421af31210146bb0cb439dc8266..eb520e6dc6fc963becd48620c3916044e86cbbc0 100644 --- a/bob/bio/face/extractor/opencv_caffe.py +++ b/bob/bio/face/extractor/opencv_caffe.py @@ -40,15 +40,14 @@ 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 fb5d5161963f522e717662e1082c76af651936cc..c940aae6b1fe1043803099e2aeeb844d71820946 100644 --- a/bob/bio/face/extractor/pytorch_model.py +++ b/bob/bio/face/extractor/pytorch_model.py @@ -28,14 +28,13 @@ 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"), @@ -109,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 a2de8d5f9b424dce8e25d4601a5e0a270bb39fef..a94f0adb867019eaf9f4adef76428562533be98a 100644 --- a/bob/bio/face/extractor/tf_model.py +++ b/bob/bio/face/extractor/tf_model.py @@ -29,14 +29,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 129c3dc245bd4919797d498c55bcbb7753cb9c88..6250242cefc4bbd94d530964896e8a0b02cc7957 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