Renamed the class MultiNetPatchClassifier to MultiNetPatchExtractor

bob/ip/pytorch_extractor/MultiNetPatchClassifier.py → bob/ip/pytorch_extractor/MultiNetPatchExtractor.py

@@ -18,7 +18,7 @@ from bob.ip.pytorch_extractor.utils import net_forward
 
 # =============================================================================
 # Main body:
-class MultiNetPatchClassifier(Extractor, object):
+class MultiNetPatchExtractor(Extractor, object):
     """
     This class is designed to pass a set of patches through a possibly multiple
     networks and compute a feature vector combining outputs of all networks.
@@ -88,7 +88,7 @@ class MultiNetPatchClassifier(Extractor, object):
         Init method.
         """
 
-        super(MultiNetPatchClassifier, self).__init__(config_file = config_file,
+        super(MultiNetPatchExtractor, self).__init__(config_file = config_file,
                                                       config_group = config_group,
                                                       model_file = model_file,
                                                       function_name = function_name,

bob/ip/pytorch_extractor/__init__.py

 from .CNN8 import CNN8Extractor
 from .CasiaNet import CasiaNetExtractor
 from .LightCNN9 import LightCNN9Extractor
-from .MultiNetPatchClassifier import MultiNetPatchClassifier
+from .MultiNetPatchExtractor import MultiNetPatchExtractor
 
 # gets sphinx autodoc done right - don't remove it
 def __appropriate__(*args):
@@ -22,7 +22,7 @@ __appropriate__(
     CNN8Extractor,
     CasiaNetExtractor,
     LightCNN9Extractor,
-    MultiNetPatchClassifier,
+    MultiNetPatchExtractor,
 )
 
 # gets sphinx autodoc done right - don't remove it

bob/ip/pytorch_extractor/test.py

@@ -46,12 +46,12 @@ def test_lightcnn9():
     output = extractor(data)
     assert output.shape[0] == 256
 
-def test_multi_net_patch_classifier():
+def test_multi_net_patch_extractor():
     """
-    Test the MultiNetPatchClassifier extractor class.
+    Test the MultiNetPatchExtractor extractor class.
     """
 
-    from bob.ip.pytorch_extractor import MultiNetPatchClassifier
+    from bob.ip.pytorch_extractor import MultiNetPatchExtractor
 
     # =========================================================================
     # prepare the test data:
@@ -91,13 +91,13 @@ def test_multi_net_patch_classifier():
 
     PATCH_RESHAPE_PARAMETERS = [3, 128, 128]  # reshape vectorized patches to this dimensions before passing to the Network
 
-    image_extractor = MultiNetPatchClassifier(config_file = CONFIG_FILE,
-                                              config_group = CONFIG_GROUP,
-                                              model_file = MODEL_FILE,
-                                              function_name = FUNCTION_NAME,
-                                              function_kwargs = FUNCTION_KWARGS,
-                                              patches_num = PATCHES_NUM,
-                                              patch_reshape_parameters = PATCH_RESHAPE_PARAMETERS)
+    image_extractor = MultiNetPatchExtractor(config_file = CONFIG_FILE,
+                                             config_group = CONFIG_GROUP,
+                                             model_file = MODEL_FILE,
+                                             function_name = FUNCTION_NAME,
+                                             function_kwargs = FUNCTION_KWARGS,
+                                             patches_num = PATCHES_NUM,
+                                             patch_reshape_parameters = PATCH_RESHAPE_PARAMETERS)
 
     # pass through encoder only, compute latent vector:
     latent_vector = image_extractor(patch_flat)