pad passing all tests

Author: justincdavis

test/test_transforms_v2.py

@@ -4748,7 +4748,7 @@ def test_functional(self, make_input):
             (F.pad_mask, tv_tensors.Mask),
             (F.pad_video, tv_tensors.Video),
             pytest.param(
-                F.pad_image_cvcuda,
+                F._geometry._pad_cvcuda,
                 "cvcuda.Tensor",
                 marks=pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="test requires CVCUDA"),
             ),
@@ -4813,6 +4813,26 @@ def test_image_correctness(self, padding, padding_mode, fill, fn):
 
         assert_equal(actual, expected)
 
+    @pytest.mark.skipif(not CVCUDA_AVAILABLE, reason="test requires CVCUDA")
+    @pytest.mark.parametrize("padding", CORRECTNESS_PADDINGS)
+    @pytest.mark.parametrize(
+        ("padding_mode", "fill"),
+        [
+            *[("constant", fill) for fill in CORRECTNESS_FILLS],
+            *[(padding_mode, None) for padding_mode in ["symmetric", "edge", "reflect"]],
+        ],
+    )
+    @pytest.mark.parametrize("fn", [F.pad, transform_cls_to_functional(transforms.Pad)])
+    def test_cvcuda_correctness(self, padding, padding_mode, fill, fn):
+        image = make_image_cvcuda(dtype=torch.uint8, device="cuda")
+
+        fill = adapt_fill(fill, dtype=torch.uint8)
+
+        actual = fn(image, padding=padding, padding_mode=padding_mode, fill=fill)
+        expected = F.pad(F.cvcuda_to_tensor(image), padding=padding, padding_mode=padding_mode, fill=fill)
+
+        assert_equal(F.cvcuda_to_tensor(actual), expected)
+
     def _reference_pad_bounding_boxes(self, bounding_boxes, *, padding):
         if isinstance(padding, int):
             padding = [padding]

torchvision/transforms/v2/functional/_geometry.py

@@ -1683,12 +1683,12 @@ def _pad_with_vector_fill(
 
 
 if _CVCUDA_AVAILABLE:
-    cvcuda = _import_cvcuda()
     _pad_mode_to_cvcuda = {
-        "constant": cvcuda.BorderType.CONSTANT,
-        "reflect": cvcuda.BorderType.REFLECT,
-        "replicate": cvcuda.BorderType.REPLICATE,
-        "symmetric": cvcuda.BorderType.WRAP,
+        "constant": cvcuda.Border.CONSTANT,
+        "reflect": cvcuda.Border.REFLECT101,
+        "replicate": cvcuda.Border.REPLICATE,
+        "edge": cvcuda.Border.REPLICATE,
+        "symmetric": cvcuda.Border.REFLECT,
     }
 
 
@@ -1700,7 +1700,7 @@ def _pad_cvcuda(
 ) -> "cvcuda.Tensor":
     cvcuda = _import_cvcuda()
 
-    if padding_mode not in _pad_mode_to_cvcuda:
+    if _pad_mode_to_cvcuda.get(padding_mode) is None:
         raise ValueError(f"Padding mode '{padding_mode}' is not supported with CVCUDA")
 
     if fill is None: