Skip to content

Commit 6b02079

Browse files
pmeierpmeier
authored
cleanup v2 tests (#7812)
1 parent 5d8d61a commit 6b02079

File tree

1 file changed

+25
-85
lines changed

1 file changed

+25
-85
lines changed

‎test/test_transforms_v2_refactored.py‎

Lines changed: 25 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -173,15 +173,7 @@ def _check_dispatcher_scripted_smoke(dispatcher, input, *args, **kwargs):
173173
dispatcher_scripted(input.as_subclass(torch.Tensor), *args, **kwargs)
174174

175175

176-
def check_dispatcher(
177-
dispatcher,
178-
# TODO: remove this parameter
179-
kernel,
180-
input,
181-
*args,
182-
check_scripted_smoke=True,
183-
**kwargs,
184-
):
176+
def check_dispatcher(dispatcher, input, *args, check_scripted_smoke=True, **kwargs):
185177
unknown_input = object()
186178
with pytest.raises(TypeError, match=re.escape(str(type(unknown_input)))):
187179
dispatcher(unknown_input, *args, **kwargs)
@@ -516,20 +508,12 @@ def test_kernel_video(self):
516508

517509
@pytest.mark.parametrize("size", OUTPUT_SIZES)
518510
@pytest.mark.parametrize(
519-
("kernel", "make_input"),
520-
[
521-
(F.resize_image_tensor, make_image_tensor),
522-
(F.resize_image_pil, make_image_pil),
523-
(F.resize_image_tensor, make_image),
524-
(F.resize_bounding_boxes, make_bounding_box),
525-
(F.resize_mask, make_segmentation_mask),
526-
(F.resize_video, make_video),
527-
],
511+
"make_input",
512+
[make_image_tensor, make_image_pil, make_image, make_bounding_box, make_segmentation_mask, make_video],
528513
)
529-
def test_dispatcher(self, size, kernel, make_input):
514+
def test_dispatcher(self, size, make_input):
530515
check_dispatcher(
531516
F.resize,
532-
kernel,
533517
make_input(self.INPUT_SIZE),
534518
size=size,
535519
antialias=True,
@@ -805,18 +789,11 @@ def test_kernel_video(self):
805789
check_kernel(F.horizontal_flip_video, make_video())
806790

807791
@pytest.mark.parametrize(
808-
("kernel", "make_input"),
809-
[
810-
(F.horizontal_flip_image_tensor, make_image_tensor),
811-
(F.horizontal_flip_image_pil, make_image_pil),
812-
(F.horizontal_flip_image_tensor, make_image),
813-
(F.horizontal_flip_bounding_boxes, make_bounding_box),
814-
(F.horizontal_flip_mask, make_segmentation_mask),
815-
(F.horizontal_flip_video, make_video),
816-
],
792+
"make_input",
793+
[make_image_tensor, make_image_pil, make_image, make_bounding_box, make_segmentation_mask, make_video],
817794
)
818-
def test_dispatcher(self, kernel, make_input):
819-
check_dispatcher(F.horizontal_flip, kernel, make_input())
795+
def test_dispatcher(self, make_input):
796+
check_dispatcher(F.horizontal_flip, make_input())
820797

821798
@pytest.mark.parametrize(
822799
("kernel", "input_type"),
@@ -988,18 +965,11 @@ def test_kernel_video(self):
988965
self._check_kernel(F.affine_video, make_video())
989966

990967
@pytest.mark.parametrize(
991-
("kernel", "make_input"),
992-
[
993-
(F.affine_image_tensor, make_image_tensor),
994-
(F.affine_image_pil, make_image_pil),
995-
(F.affine_image_tensor, make_image),
996-
(F.affine_bounding_boxes, make_bounding_box),
997-
(F.affine_mask, make_segmentation_mask),
998-
(F.affine_video, make_video),
999-
],
968+
"make_input",
969+
[make_image_tensor, make_image_pil, make_image, make_bounding_box, make_segmentation_mask, make_video],
1000970
)
1001-
def test_dispatcher(self, kernel, make_input):
1002-
check_dispatcher(F.affine, kernel, make_input(), **self._MINIMAL_AFFINE_KWARGS)
971+
def test_dispatcher(self, make_input):
972+
check_dispatcher(F.affine, make_input(), **self._MINIMAL_AFFINE_KWARGS)
1003973

1004974
@pytest.mark.parametrize(
1005975
("kernel", "input_type"),
@@ -1284,18 +1254,11 @@ def test_kernel_video(self):
12841254
check_kernel(F.vertical_flip_video, make_video())
12851255

12861256
@pytest.mark.parametrize(
1287-
("kernel", "make_input"),
1288-
[
1289-
(F.vertical_flip_image_tensor, make_image_tensor),
1290-
(F.vertical_flip_image_pil, make_image_pil),
1291-
(F.vertical_flip_image_tensor, make_image),
1292-
(F.vertical_flip_bounding_boxes, make_bounding_box),
1293-
(F.vertical_flip_mask, make_segmentation_mask),
1294-
(F.vertical_flip_video, make_video),
1295-
],
1257+
"make_input",
1258+
[make_image_tensor, make_image_pil, make_image, make_bounding_box, make_segmentation_mask, make_video],
12961259
)
1297-
def test_dispatcher(self, kernel, make_input):
1298-
check_dispatcher(F.vertical_flip, kernel, make_input())
1260+
def test_dispatcher(self, make_input):
1261+
check_dispatcher(F.vertical_flip, make_input())
12991262

13001263
@pytest.mark.parametrize(
13011264
("kernel", "input_type"),
@@ -1441,18 +1404,11 @@ def test_kernel_video(self):
14411404
check_kernel(F.rotate_video, make_video(), **self._MINIMAL_AFFINE_KWARGS)
14421405

14431406
@pytest.mark.parametrize(
1444-
("kernel", "make_input"),
1445-
[
1446-
(F.rotate_image_tensor, make_image_tensor),
1447-
(F.rotate_image_pil, make_image_pil),
1448-
(F.rotate_image_tensor, make_image),
1449-
(F.rotate_bounding_boxes, make_bounding_box),
1450-
(F.rotate_mask, make_segmentation_mask),
1451-
(F.rotate_video, make_video),
1452-
],
1407+
"make_input",
1408+
[make_image_tensor, make_image_pil, make_image, make_bounding_box, make_segmentation_mask, make_video],
14531409
)
1454-
def test_dispatcher(self, kernel, make_input):
1455-
check_dispatcher(F.rotate, kernel, make_input(), **self._MINIMAL_AFFINE_KWARGS)
1410+
def test_dispatcher(self, make_input):
1411+
check_dispatcher(F.rotate, make_input(), **self._MINIMAL_AFFINE_KWARGS)
14561412

14571413
@pytest.mark.parametrize(
14581414
("kernel", "input_type"),
@@ -1711,22 +1667,14 @@ def test_kernel(self, kernel, make_input, input_dtype, output_dtype, device, sca
17111667
scale=scale,
17121668
)
17131669

1714-
@pytest.mark.parametrize(
1715-
("kernel", "make_input"),
1716-
[
1717-
(F.to_dtype_image_tensor, make_image_tensor),
1718-
(F.to_dtype_image_tensor, make_image),
1719-
(F.to_dtype_video, make_video),
1720-
],
1721-
)
1670+
@pytest.mark.parametrize("make_input", [make_image_tensor, make_image, make_video])
17221671
@pytest.mark.parametrize("input_dtype", [torch.float32, torch.float64, torch.uint8])
17231672
@pytest.mark.parametrize("output_dtype", [torch.float32, torch.float64, torch.uint8])
17241673
@pytest.mark.parametrize("device", cpu_and_cuda())
17251674
@pytest.mark.parametrize("scale", (True, False))
1726-
def test_dispatcher(self, kernel, make_input, input_dtype, output_dtype, device, scale):
1675+
def test_dispatcher(self, make_input, input_dtype, output_dtype, device, scale):
17271676
check_dispatcher(
17281677
F.to_dtype,
1729-
kernel,
17301678
make_input(dtype=input_dtype, device=device),
17311679
dtype=output_dtype,
17321680
scale=scale,
@@ -1890,17 +1838,9 @@ class TestAdjustBrightness:
18901838
def test_kernel(self, kernel, make_input, dtype, device):
18911839
check_kernel(kernel, make_input(dtype=dtype, device=device), brightness_factor=self._DEFAULT_BRIGHTNESS_FACTOR)
18921840

1893-
@pytest.mark.parametrize(
1894-
("kernel", "make_input"),
1895-
[
1896-
(F.adjust_brightness_image_tensor, make_image_tensor),
1897-
(F.adjust_brightness_image_pil, make_image_pil),
1898-
(F.adjust_brightness_image_tensor, make_image),
1899-
(F.adjust_brightness_video, make_video),
1900-
],
1901-
)
1902-
def test_dispatcher(self, kernel, make_input):
1903-
check_dispatcher(F.adjust_brightness, kernel, make_input(), brightness_factor=self._DEFAULT_BRIGHTNESS_FACTOR)
1841+
@pytest.mark.parametrize("make_input", [make_image_tensor, make_image_pil, make_image, make_video])
1842+
def test_dispatcher(self, make_input):
1843+
check_dispatcher(F.adjust_brightness, make_input(), brightness_factor=self._DEFAULT_BRIGHTNESS_FACTOR)
19041844

19051845
@pytest.mark.parametrize(
19061846
("kernel", "input_type"),

0 commit comments

Comments
 (0)