[NOMERGE] drop in transforms v2 into the v1 tests

test/test_functional_tensor.py

@@ -10,10 +10,10 @@
 import PIL.Image
 import pytest
 import torch
-import torchvision.transforms as T
 import torchvision.transforms._functional_pil as F_pil
 import torchvision.transforms._functional_tensor as F_t
-import torchvision.transforms.functional as F
+import torchvision.transforms.v2 as T
+import torchvision.transforms.v2.functional as F
 from common_utils import (
     _assert_approx_equal_tensor_to_pil,
     _assert_equal_tensor_to_pil,
@@ -1249,13 +1249,13 @@ def test_ten_crop(device):
 
 
 def test_elastic_transform_asserts():
+    img_tensor = torch.rand(1, 3, 32, 24)
     with pytest.raises(TypeError, match="Argument displacement should be a Tensor"):
-        _ = F.elastic_transform("abc", displacement=None)
+        _ = F.elastic_transform(img_tensor, displacement=None)
 
-    with pytest.raises(TypeError, match="img should be PIL Image or Tensor"):
+    with pytest.raises(TypeError, match="supports inputs of type"):
         _ = F.elastic_transform("abc", displacement=torch.rand(1))
 
-    img_tensor = torch.rand(1, 3, 32, 24)
     with pytest.raises(ValueError, match="Argument displacement shape should"):
         _ = F.elastic_transform(img_tensor, displacement=torch.rand(1, 2))
 

test/test_transforms.py

@@ -1,17 +1,17 @@
 import math
 import os
 import random
-import re
 import textwrap
 import warnings
+from collections import defaultdict
 from functools import partial
 
 import numpy as np
 import pytest
 import torch
-import torchvision.transforms as transforms
 import torchvision.transforms._functional_tensor as F_t
-import torchvision.transforms.functional as F
+import torchvision.transforms.v2 as transforms
+import torchvision.transforms.v2.functional as F
 from PIL import Image
 from torch._utils_internal import get_file_path_2
 
@@ -241,6 +241,8 @@ def test_to_tensor_errors(self):
         trans = transforms.ToTensor()
         np_rng = np.random.RandomState(0)
 
+        # TODO: DID NOT RAISE
+        return
         with pytest.raises(TypeError):
             trans(np_rng.rand(1, height, width).tolist())
 
@@ -299,6 +301,9 @@ def test_pil_to_tensor_errors(self):
         trans = transforms.PILToTensor()
         np_rng = np.random.RandomState(0)
 
+        # TODO: DID NOT RAISE
+        return
+
         with pytest.raises(TypeError):
             trans(np_rng.rand(1, height, width).tolist())
 
@@ -1214,7 +1219,7 @@ def test_rotate():
     x = np.zeros((100, 100, 3), dtype=np.uint8)
     x[40, 40] = [255, 255, 255]
 
-    with pytest.raises(TypeError, match=r"img should be PIL Image"):
+    with pytest.raises(TypeError, match=r"supports inputs of type"):
         F.rotate(x, 10)
 
     img = F.to_pil_image(x)
@@ -1270,6 +1275,10 @@ def test_gaussian_blur_asserts():
     np_img = np.ones((100, 100, 3), dtype=np.uint8) * 255
     img = F.to_pil_image(np_img, "RGB")
 
+    # TODO: Not critical, but is it really better to distinguish between
+    # TypeError and ValueError?  Would it be easier to treat any user-provided
+    # input failure as ValueError?
+
     with pytest.raises(ValueError, match=r"If kernel_size is a sequence its length should be 2"):
         F.gaussian_blur(img, [3])
     with pytest.raises(ValueError, match=r"If kernel_size is a sequence its length should be 2"):
@@ -1289,22 +1298,22 @@ def test_gaussian_blur_asserts():
 
     with pytest.raises(ValueError, match=r"If sigma is a sequence, its length should be 2"):
         F.gaussian_blur(img, 3, [1, 1, 1])
-    with pytest.raises(ValueError, match=r"sigma should be a single number or a list/tuple with length 2"):
+    with pytest.raises(TypeError, match=r"sigma should be a single "):
         transforms.GaussianBlur(3, [1, 1, 1])
 
     with pytest.raises(ValueError, match=r"sigma should have positive values"):
         F.gaussian_blur(img, 3, -1.0)
     with pytest.raises(ValueError, match=r"If sigma is a single number, it must be positive"):
         transforms.GaussianBlur(3, -1.0)
 
-    with pytest.raises(TypeError, match=r"kernel_size should be int or a sequence of integers"):
+    with pytest.raises(ValueError, match=r"If kernel_size is a sequence"):
         F.gaussian_blur(img, "kernel_size_string")
     with pytest.raises(ValueError, match=r"Kernel size should be a tuple/list of two integers"):
         transforms.GaussianBlur("kernel_size_string")
 
-    with pytest.raises(TypeError, match=r"sigma should be either float or sequence of floats"):
+    with pytest.raises(TypeError, match=r"sigma should be "):
         F.gaussian_blur(img, 3, "sigma_string")
-    with pytest.raises(ValueError, match=r"sigma should be a single number or a list/tuple with length 2"):
+    with pytest.raises(TypeError, match=r"sigma should be "):
         transforms.GaussianBlur(3, "sigma_string")
 
 
@@ -1794,7 +1803,7 @@ def test_color_jitter():
 
 @pytest.mark.parametrize("hue", [1, (-1, 1)])
 def test_color_jitter_hue_out_of_bounds(hue):
-    with pytest.raises(ValueError, match=re.escape("hue values should be between (-0.5, 0.5)")):
+    with pytest.raises((ValueError, TypeError), match="hue"):
         transforms.ColorJitter(hue=hue)
 
 
@@ -1853,7 +1862,8 @@ def test_random_rotation():
         transforms.RandomRotation([-0.7, 0, 0.7])
 
     t = transforms.RandomRotation(0, fill=None)
-    assert t.fill == 0
+    # TODO: BC-break - do we care?
+    assert t.fill is None
 
     t = transforms.RandomRotation(10)
     angle = t.get_params(t.degrees)
@@ -1873,7 +1883,7 @@ def test_random_rotation():
 def test_random_rotation_error():
     # assert fill being either a Sequence or a Number
     with pytest.raises(TypeError):
-        transforms.RandomRotation(0, fill={})
+        transforms.RandomRotation(0, fill="BLAH")
 
 
 def test_randomperspective():
@@ -1902,10 +1912,11 @@ def test_randomperspective_fill(mode, seed):
 
     # assert fill being either a Sequence or a Number
     with pytest.raises(TypeError):
-        transforms.RandomPerspective(fill={})
+        transforms.RandomPerspective(fill="LOL")
 
     t = transforms.RandomPerspective(fill=None)
-    assert t.fill == 0
+    # BC-breaking: Do we care?
+    assert t.fill is None
 
     height = 100
     width = 100
@@ -2002,6 +2013,7 @@ def input_img(self):
         return input_img
 
     def test_affine_translate_seq(self, input_img):
+        input_img = torch.randint(0, 256, size=(224, 224), dtype=torch.uint8)
         with pytest.raises(TypeError, match=r"Argument translate should be a sequence"):
             F.affine(input_img, 10, translate=0, scale=1, shear=1)
 
@@ -2047,7 +2059,9 @@ def _test_transformation(self, angle, translate, scale, shear, pil_image, input_
         true_matrix = np.matmul(T, np.matmul(C, np.matmul(RSS, Cinv)))
 
         result_matrix = self._to_3x3_inv(
-            F._get_inverse_affine_matrix(center=cnt, angle=angle, translate=translate, scale=scale, shear=shear)
+            F._geometry._get_inverse_affine_matrix(
+                center=cnt, angle=angle, translate=translate, scale=scale, shear=shear
+            )
         )
         assert np.sum(np.abs(true_matrix - result_matrix)) < 1e-10
         # 2) Perform inverse mapping:
@@ -2174,10 +2188,11 @@ def test_random_affine():
 
     # assert fill being either a Sequence or a Number
     with pytest.raises(TypeError):
-        transforms.RandomAffine(0, fill={})
+        transforms.RandomAffine(0, fill="BLAH")
 
     t = transforms.RandomAffine(0, fill=None)
-    assert t.fill == 0
+    # TODO: do we care?
+    assert t.fill is None
 
     x = np.zeros((100, 100, 3), dtype=np.uint8)
     img = F.to_pil_image(x)
@@ -2196,7 +2211,7 @@ def test_random_affine():
     t.__repr__()
 
     t = transforms.RandomAffine(10, interpolation=transforms.InterpolationMode.BILINEAR)
-    assert "bilinear" in t.__repr__()
+    assert "bilinear" in t.__repr__().lower()
 
     t = transforms.RandomAffine(10, interpolation=Image.BILINEAR)
     assert t.interpolation == transforms.InterpolationMode.BILINEAR
@@ -2205,23 +2220,24 @@ def test_random_affine():
 def test_elastic_transformation():
     with pytest.raises(TypeError, match=r"alpha should be float or a sequence of floats"):
         transforms.ElasticTransform(alpha=True, sigma=2.0)
-    with pytest.raises(TypeError, match=r"alpha should be a sequence of floats"):
+    with pytest.raises(ValueError, match=r"alpha should be a sequence of floats"):
         transforms.ElasticTransform(alpha=[1.0, True], sigma=2.0)
-    with pytest.raises(ValueError, match=r"alpha is a sequence its length should be 2"):
+    with pytest.raises(ValueError, match=r"If alpha is a sequence"):
         transforms.ElasticTransform(alpha=[1.0, 0.0, 1.0], sigma=2.0)
 
     with pytest.raises(TypeError, match=r"sigma should be float or a sequence of floats"):
         transforms.ElasticTransform(alpha=2.0, sigma=True)
-    with pytest.raises(TypeError, match=r"sigma should be a sequence of floats"):
+    with pytest.raises(ValueError, match=r"sigma should be a sequence of floats"):
         transforms.ElasticTransform(alpha=2.0, sigma=[1.0, True])
-    with pytest.raises(ValueError, match=r"sigma is a sequence its length should be 2"):
+    with pytest.raises(ValueError, match=r"If sigma is a sequence"):
         transforms.ElasticTransform(alpha=2.0, sigma=[1.0, 0.0, 1.0])
 
-    t = transforms.transforms.ElasticTransform(alpha=2.0, sigma=2.0, interpolation=Image.BILINEAR)
+    t = transforms.ElasticTransform(alpha=2.0, sigma=2.0, interpolation=Image.BILINEAR)
     assert t.interpolation == transforms.InterpolationMode.BILINEAR
 
-    with pytest.raises(TypeError, match=r"fill should be int or float"):
-        transforms.ElasticTransform(alpha=1.0, sigma=1.0, fill={})
+    with pytest.raises(TypeError, match=r"Got inappropriate fill arg"):
+        # Had to change {} to a str because {} is actually valid now
+        transforms.ElasticTransform(alpha=1.0, sigma=1.0, fill="LOL")
 
     x = torch.randint(0, 256, (3, 32, 32), dtype=torch.uint8)
     img = F.to_pil_image(x)