Remove GeAffineTransform processor

Author: proneetsharma

docs/structure.py

@@ -371,7 +371,6 @@
             processors.GetTransformationSize,
             processors.GetTransformationScale,
             processors.GetSourceDestinationPoints,
-            processors.GetAffineTransform,
             processors.GetImageCenter,
             processors.WarpAffine,
         ]

paz/pipelines/image.py

@@ -1,5 +1,6 @@
 from ..abstract import SequentialProcessor
 from .. import processors as pr
+from ..backend.image import get_affine_transform
 
 
 class AugmentImage(SequentialProcessor):
@@ -99,15 +100,13 @@ class PreprocessImageHigherHRNet(pr.Processor):
         center: center of the image
         scale: scaled image dimensions
     """
-    def __init__(self, scaling_factor=200, input_size=512, inverse=False,
-                 multiple=64):
+    def __init__(self, scaling_factor=200, input_size=512, multiple=64):
         super(PreprocessImageHigherHRNet, self).__init__()
         self.get_image_center = pr.GetImageCenter()
         self.get_size = pr.GetTransformationSize(input_size, multiple)
         self.get_scale = pr.GetTransformationScale(scaling_factor)
         self.get_source_destination_point = pr.GetSourceDestinationPoints(
             scaling_factor)
-        self.get_affine_transform = pr.GetAffineTransform(inverse)
         self.transform_image = pr.SequentialProcessor(
             [pr.WarpAffine(), pr.ImagenetPreprocessInput(), pr.ExpandDims(0)])
 
@@ -117,6 +116,6 @@ def call(self, image):
         scale = self.get_scale(image, size)
         source_point, destination_point = self.get_source_destination_point(
             center, scale, size)
-        transform = self.get_affine_transform(source_point, destination_point)
+        transform = get_affine_transform(source_point, destination_point)
         image = self.transform_image(image, transform, size)
         return image, center, scale

paz/pipelines/keypoints.py

@@ -4,6 +4,7 @@
 from .renderer import RenderTwoViews
 from ..models import KeypointNet2D
 from tensorflow.keras.utils import get_file
+from ..backend.image import get_affine_transform
 
 
 class KeypointNetSharedAugmentation(SequentialProcessor):
@@ -183,15 +184,17 @@ class TransformKeypoints(pr.Processor):
     """
     def __init__(self, inverse=False):
         super(TransformKeypoints, self).__init__()
+        self.inverse = inverse
         self.get_source_destination_point = pr.GetSourceDestinationPoints(
             scaling_factor=200)
-        self.get_affine_transform = pr.GetAffineTransform(inverse=inverse)
         self.transform_keypoints = pr.TransformKeypoints()
 
     def call(self, grouped_keypoints, center, scale, shape):
         source_point, destination_point = self.get_source_destination_point(
             center, scale, shape)
-        transform = self.get_affine_transform(source_point, destination_point)
+        if self.inverse:
+            source_point, destination_point = destination_point, source_point
+        transform = get_affine_transform(source_point, destination_point)
         transformed_keypoints = self.transform_keypoints(grouped_keypoints,
                                                          transform)
         return transformed_keypoints

paz/processors/__init__.py

@@ -74,7 +74,6 @@
 from .geometric import GetTransformationSize
 from .geometric import GetTransformationScale
 from .geometric import GetSourceDestinationPoints
-from .geometric import GetAffineTransform
 from .geometric import GetImageCenter
 from .geometric import WarpAffine
 

paz/processors/geometric.py

@@ -507,9 +507,9 @@ class GetSourceDestinationPoints(Processor):
     """Returns the source and destination points for affine transformation.
 
     # Arguments
-        center: Numpy array. Center coordinates of image
-        scale: Numpy array. Scale of width and height of image
-        size: Numpy array. Size of image
+        center: Numpy array of shape (2,). Center coordinates of image
+        scale: Numpy array of shape (2,). Scale of width and height of image
+        size: List of length 2. Size of image
     """
     def __init__(self, scaling_factor):
         super(GetSourceDestinationPoints, self).__init__()
@@ -547,25 +547,6 @@ def call(self, center, scale, size):
         return source_point, destination_point
 
 
-class GetAffineTransform(Processor):
-    """Returns the affine transform of the image.
-
-    # Arguments
-        source_point: Numpy array
-        destination_point: Numpy array
-    """
-    def __init__(self, inverse):
-        super(GetAffineTransform, self).__init__()
-        self.inverse = inverse
-
-    def call(self, source_point, destination_point):
-        if self.inverse:
-            transform = get_affine_transform(destination_point, source_point)
-        else:
-            transform = get_affine_transform(source_point, destination_point)
-        return transform
-
-
 class GetImageCenter(Processor):
     """Calculate the center of the image and add an offset to the center.