Cleanup prototype kernel signatures (#6648)

* pass metadata directly after input in prototype kernels

* rename img to image

Author: pmeier

test/test_prototype_transforms_functional.py

@@ -632,7 +632,7 @@ def _compute_expected_bbox(bbox, padding_):
         bboxes_format = bboxes.format
         bboxes_image_size = bboxes.image_size
 
-        output_boxes = F.pad_bounding_box(bboxes, padding, format=bboxes_format)
+        output_boxes = F.pad_bounding_box(bboxes, format=bboxes_format, padding=padding)
 
         if bboxes.ndim < 2 or bboxes.shape[0] == 0:
             bboxes = [bboxes]
@@ -781,7 +781,7 @@ def _compute_expected_bbox(bbox, output_size_):
         bboxes_format = bboxes.format
         bboxes_image_size = bboxes.image_size
 
-        output_boxes = F.center_crop_bounding_box(bboxes, bboxes_format, output_size, bboxes_image_size)
+        output_boxes = F.center_crop_bounding_box(bboxes, bboxes_format, bboxes_image_size, output_size)
 
         if bboxes.ndim < 2:
             bboxes = [bboxes]

torchvision/prototype/features/_bounding_box.py

@@ -83,7 +83,7 @@ def resize(  # type: ignore[override]
         max_size: Optional[int] = None,
         antialias: bool = False,
     ) -> BoundingBox:
-        output = self._F.resize_bounding_box(self, size, image_size=self.image_size, max_size=max_size)
+        output = self._F.resize_bounding_box(self, image_size=self.image_size, size=size, max_size=max_size)
         if isinstance(size, int):
             size = [size]
         image_size = (size[0], size[0]) if len(size) == 1 else (size[0], size[1])
@@ -95,7 +95,7 @@ def crop(self, top: int, left: int, height: int, width: int) -> BoundingBox:
 
     def center_crop(self, output_size: List[int]) -> BoundingBox:
         output = self._F.center_crop_bounding_box(
-            self, format=self.format, output_size=output_size, image_size=self.image_size
+            self, format=self.format, image_size=self.image_size, output_size=output_size
         )
         if isinstance(output_size, int):
             output_size = [output_size]
@@ -126,7 +126,7 @@ def pad(
         if not isinstance(padding, int):
             padding = list(padding)
 
-        output = self._F.pad_bounding_box(self, padding, format=self.format, padding_mode=padding_mode)
+        output = self._F.pad_bounding_box(self, format=self.format, padding=padding, padding_mode=padding_mode)
 
         # Update output image size:
         left, right, top, bottom = self._F._geometry._parse_pad_padding(padding)

torchvision/prototype/transforms/functional/_augment.py

@@ -10,11 +10,11 @@
 
 @torch.jit.unused
 def erase_image_pil(
-    img: PIL.Image.Image, i: int, j: int, h: int, w: int, v: torch.Tensor, inplace: bool = False
+    image: PIL.Image.Image, i: int, j: int, h: int, w: int, v: torch.Tensor, inplace: bool = False
 ) -> PIL.Image.Image:
-    t_img = pil_to_tensor(img)
+    t_img = pil_to_tensor(image)
     output = erase_image_tensor(t_img, i=i, j=j, h=h, w=w, v=v, inplace=inplace)
-    return to_pil_image(output, mode=img.mode)
+    return to_pil_image(output, mode=image.mode)
 
 
 def erase(