Skip to content

Commit 9cb639a

Browse files
NicolasHugNicolasHug
authored
Remove private PIL kernels from __init__.py (#8329)
1 parent 924b162 commit 9cb639a

File tree

2 files changed

+35
-65
lines changed

2 files changed

+35
-65
lines changed

‎test/test_transforms_v2.py

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ def test_functional(self, size, make_input):
668668
("kernel", "input_type"),
669669
[
670670
(F.resize_image, torch.Tensor),
671-
(F._resize_image_pil, PIL.Image.Image),
671+
(F._geometry._resize_image_pil, PIL.Image.Image),
672672
(F.resize_image, tv_tensors.Image),
673673
(F.resize_bounding_boxes, tv_tensors.BoundingBoxes),
674674
(F.resize_mask, tv_tensors.Mask),
@@ -986,7 +986,7 @@ def test_functional(self, make_input):
986986
("kernel", "input_type"),
987987
[
988988
(F.horizontal_flip_image, torch.Tensor),
989-
(F._horizontal_flip_image_pil, PIL.Image.Image),
989+
(F._geometry._horizontal_flip_image_pil, PIL.Image.Image),
990990
(F.horizontal_flip_image, tv_tensors.Image),
991991
(F.horizontal_flip_bounding_boxes, tv_tensors.BoundingBoxes),
992992
(F.horizontal_flip_mask, tv_tensors.Mask),
@@ -1154,7 +1154,7 @@ def test_functional(self, make_input):
11541154
("kernel", "input_type"),
11551155
[
11561156
(F.affine_image, torch.Tensor),
1157-
(F._affine_image_pil, PIL.Image.Image),
1157+
(F._geometry._affine_image_pil, PIL.Image.Image),
11581158
(F.affine_image, tv_tensors.Image),
11591159
(F.affine_bounding_boxes, tv_tensors.BoundingBoxes),
11601160
(F.affine_mask, tv_tensors.Mask),
@@ -1436,7 +1436,7 @@ def test_functional(self, make_input):
14361436
("kernel", "input_type"),
14371437
[
14381438
(F.vertical_flip_image, torch.Tensor),
1439-
(F._vertical_flip_image_pil, PIL.Image.Image),
1439+
(F._geometry._vertical_flip_image_pil, PIL.Image.Image),
14401440
(F.vertical_flip_image, tv_tensors.Image),
14411441
(F.vertical_flip_bounding_boxes, tv_tensors.BoundingBoxes),
14421442
(F.vertical_flip_mask, tv_tensors.Mask),
@@ -1578,7 +1578,7 @@ def test_functional(self, make_input):
15781578
("kernel", "input_type"),
15791579
[
15801580
(F.rotate_image, torch.Tensor),
1581-
(F._rotate_image_pil, PIL.Image.Image),
1581+
(F._geometry._rotate_image_pil, PIL.Image.Image),
15821582
(F.rotate_image, tv_tensors.Image),
15831583
(F.rotate_bounding_boxes, tv_tensors.BoundingBoxes),
15841584
(F.rotate_mask, tv_tensors.Mask),
@@ -2149,7 +2149,7 @@ def test_functional(self, make_input):
21492149
("kernel", "input_type"),
21502150
[
21512151
(F.adjust_brightness_image, torch.Tensor),
2152-
(F._adjust_brightness_image_pil, PIL.Image.Image),
2152+
(F._color._adjust_brightness_image_pil, PIL.Image.Image),
21532153
(F.adjust_brightness_image, tv_tensors.Image),
21542154
(F.adjust_brightness_video, tv_tensors.Video),
21552155
],
@@ -2311,7 +2311,7 @@ class TestShapeGetters:
23112311
("kernel", "make_input"),
23122312
[
23132313
(F.get_dimensions_image, make_image_tensor),
2314-
(F._get_dimensions_image_pil, make_image_pil),
2314+
(F._meta._get_dimensions_image_pil, make_image_pil),
23152315
(F.get_dimensions_image, make_image),
23162316
(F.get_dimensions_video, make_video),
23172317
],
@@ -2328,7 +2328,7 @@ def test_get_dimensions(self, kernel, make_input):
23282328
("kernel", "make_input"),
23292329
[
23302330
(F.get_num_channels_image, make_image_tensor),
2331-
(F._get_num_channels_image_pil, make_image_pil),
2331+
(F._meta._get_num_channels_image_pil, make_image_pil),
23322332
(F.get_num_channels_image, make_image),
23332333
(F.get_num_channels_video, make_video),
23342334
],
@@ -2344,7 +2344,7 @@ def test_get_num_channels(self, kernel, make_input):
23442344
("kernel", "make_input"),
23452345
[
23462346
(F.get_size_image, make_image_tensor),
2347-
(F._get_size_image_pil, make_image_pil),
2347+
(F._meta._get_size_image_pil, make_image_pil),
23482348
(F.get_size_image, make_image),
23492349
(F.get_size_bounding_boxes, make_bounding_boxes),
23502350
(F.get_size_mask, make_detection_masks),
@@ -2451,7 +2451,7 @@ class TestGetKernel:
24512451
# would also be fine
24522452
KERNELS = {
24532453
torch.Tensor: F.resize_image,
2454-
PIL.Image.Image: F._resize_image_pil,
2454+
PIL.Image.Image: F._geometry._resize_image_pil,
24552455
tv_tensors.Image: F.resize_image,
24562456
tv_tensors.BoundingBoxes: F.resize_bounding_boxes,
24572457
tv_tensors.Mask: F.resize_mask,
@@ -2568,7 +2568,7 @@ def test_functional(self, make_input):
25682568
("kernel", "input_type"),
25692569
[
25702570
(F.permute_channels_image, torch.Tensor),
2571-
(F._permute_channels_image_pil, PIL.Image.Image),
2571+
(F._color._permute_channels_image_pil, PIL.Image.Image),
25722572
(F.permute_channels_image, tv_tensors.Image),
25732573
(F.permute_channels_video, tv_tensors.Video),
25742574
],
@@ -2655,7 +2655,7 @@ def test_functional(self, make_input):
26552655
("kernel", "input_type"),
26562656
[
26572657
(F.elastic_image, torch.Tensor),
2658-
(F._elastic_image_pil, PIL.Image.Image),
2658+
(F._geometry._elastic_image_pil, PIL.Image.Image),
26592659
(F.elastic_image, tv_tensors.Image),
26602660
(F.elastic_bounding_boxes, tv_tensors.BoundingBoxes),
26612661
(F.elastic_mask, tv_tensors.Mask),
@@ -2772,7 +2772,7 @@ def test_functional(self, make_input):
27722772
("kernel", "input_type"),
27732773
[
27742774
(F.crop_image, torch.Tensor),
2775-
(F._crop_image_pil, PIL.Image.Image),
2775+
(F._geometry._crop_image_pil, PIL.Image.Image),
27762776
(F.crop_image, tv_tensors.Image),
27772777
(F.crop_bounding_boxes, tv_tensors.BoundingBoxes),
27782778
(F.crop_mask, tv_tensors.Mask),
@@ -2994,7 +2994,7 @@ def test_functional(self, make_input):
29942994
("kernel", "input_type"),
29952995
[
29962996
(F.erase_image, torch.Tensor),
2997-
(F._erase_image_pil, PIL.Image.Image),
2997+
(F._augment._erase_image_pil, PIL.Image.Image),
29982998
(F.erase_image, tv_tensors.Image),
29992999
(F.erase_video, tv_tensors.Video),
30003000
],
@@ -3133,7 +3133,7 @@ def test_functional(self, make_input):
31333133
("kernel", "input_type"),
31343134
[
31353135
(F.gaussian_blur_image, torch.Tensor),
3136-
(F._gaussian_blur_image_pil, PIL.Image.Image),
3136+
(F._misc._gaussian_blur_image_pil, PIL.Image.Image),
31373137
(F.gaussian_blur_image, tv_tensors.Image),
31383138
(F.gaussian_blur_video, tv_tensors.Video),
31393139
],
@@ -3515,7 +3515,7 @@ def test_functional(self, make_input):
35153515
("kernel", "input_type"),
35163516
[
35173517
(F.resized_crop_image, torch.Tensor),
3518-
(F._resized_crop_image_pil, PIL.Image.Image),
3518+
(F._geometry._resized_crop_image_pil, PIL.Image.Image),
35193519
(F.resized_crop_image, tv_tensors.Image),
35203520
(F.resized_crop_bounding_boxes, tv_tensors.BoundingBoxes),
35213521
(F.resized_crop_mask, tv_tensors.Mask),
@@ -3700,7 +3700,7 @@ def test_functional(self, make_input):
37003700
# Since the whole fill story is already really inconsistent, we won't introduce yet another case to allow
37013701
# for this test to pass.
37023702
# See https://github.com/pytorch/vision/issues/6623 for a discussion.
3703-
# (F._pad_image_pil, PIL.Image.Image),
3703+
# (F._geometry._pad_image_pil, PIL.Image.Image),
37043704
(F.pad_image, tv_tensors.Image),
37053705
(F.pad_bounding_boxes, tv_tensors.BoundingBoxes),
37063706
(F.pad_mask, tv_tensors.Mask),
@@ -3828,7 +3828,7 @@ def test_functional(self, make_input):
38283828
("kernel", "input_type"),
38293829
[
38303830
(F.center_crop_image, torch.Tensor),
3831-
(F._center_crop_image_pil, PIL.Image.Image),
3831+
(F._geometry._center_crop_image_pil, PIL.Image.Image),
38323832
(F.center_crop_image, tv_tensors.Image),
38333833
(F.center_crop_bounding_boxes, tv_tensors.BoundingBoxes),
38343834
(F.center_crop_mask, tv_tensors.Mask),
@@ -3994,7 +3994,7 @@ def test_functional(self, make_input):
39943994
("kernel", "input_type"),
39953995
[
39963996
(F.perspective_image, torch.Tensor),
3997-
(F._perspective_image_pil, PIL.Image.Image),
3997+
(F._geometry._perspective_image_pil, PIL.Image.Image),
39983998
(F.perspective_image, tv_tensors.Image),
39993999
(F.perspective_bounding_boxes, tv_tensors.BoundingBoxes),
40004000
(F.perspective_mask, tv_tensors.Mask),
@@ -4151,7 +4151,7 @@ def test_functional(self, make_input):
41514151
("kernel", "input_type"),
41524152
[
41534153
(F.equalize_image, torch.Tensor),
4154-
(F._equalize_image_pil, PIL.Image.Image),
4154+
(F._color._equalize_image_pil, PIL.Image.Image),
41554155
(F.equalize_image, tv_tensors.Image),
41564156
(F.equalize_video, tv_tensors.Video),
41574157
],
@@ -4381,7 +4381,7 @@ def test_functional(self, make_input):
43814381
("kernel", "input_type"),
43824382
[
43834383
(F.invert_image, torch.Tensor),
4384-
(F._invert_image_pil, PIL.Image.Image),
4384+
(F._color._invert_image_pil, PIL.Image.Image),
43854385
(F.invert_image, tv_tensors.Image),
43864386
(F.invert_video, tv_tensors.Video),
43874387
],
@@ -4420,7 +4420,7 @@ def test_functional(self, make_input):
44204420
("kernel", "input_type"),
44214421
[
44224422
(F.posterize_image, torch.Tensor),
4423-
(F._posterize_image_pil, PIL.Image.Image),
4423+
(F._color._posterize_image_pil, PIL.Image.Image),
44244424
(F.posterize_image, tv_tensors.Image),
44254425
(F.posterize_video, tv_tensors.Video),
44264426
],
@@ -4467,7 +4467,7 @@ def test_functional(self, make_input):
44674467
("kernel", "input_type"),
44684468
[
44694469
(F.solarize_image, torch.Tensor),
4470-
(F._solarize_image_pil, PIL.Image.Image),
4470+
(F._color._solarize_image_pil, PIL.Image.Image),
44714471
(F.solarize_image, tv_tensors.Image),
44724472
(F.solarize_video, tv_tensors.Video),
44734473
],
@@ -4514,7 +4514,7 @@ def test_functional(self, make_input):
45144514
("kernel", "input_type"),
45154515
[
45164516
(F.autocontrast_image, torch.Tensor),
4517-
(F._autocontrast_image_pil, PIL.Image.Image),
4517+
(F._color._autocontrast_image_pil, PIL.Image.Image),
45184518
(F.autocontrast_image, tv_tensors.Image),
45194519
(F.autocontrast_video, tv_tensors.Video),
45204520
],
@@ -4553,7 +4553,7 @@ def test_functional(self, make_input):
45534553
("kernel", "input_type"),
45544554
[
45554555
(F.adjust_sharpness_image, torch.Tensor),
4556-
(F._adjust_sharpness_image_pil, PIL.Image.Image),
4556+
(F._color._adjust_sharpness_image_pil, PIL.Image.Image),
45574557
(F.adjust_sharpness_image, tv_tensors.Image),
45584558
(F.adjust_sharpness_video, tv_tensors.Video),
45594559
],
@@ -4602,7 +4602,7 @@ def test_functional(self, make_input):
46024602
("kernel", "input_type"),
46034603
[
46044604
(F.adjust_contrast_image, torch.Tensor),
4605-
(F._adjust_contrast_image_pil, PIL.Image.Image),
4605+
(F._color._adjust_contrast_image_pil, PIL.Image.Image),
46064606
(F.adjust_contrast_image, tv_tensors.Image),
46074607
(F.adjust_contrast_video, tv_tensors.Video),
46084608
],
@@ -4644,7 +4644,7 @@ def test_functional(self, make_input):
46444644
("kernel", "input_type"),
46454645
[
46464646
(F.adjust_gamma_image, torch.Tensor),
4647-
(F._adjust_gamma_image_pil, PIL.Image.Image),
4647+
(F._color._adjust_gamma_image_pil, PIL.Image.Image),
46484648
(F.adjust_gamma_image, tv_tensors.Image),
46494649
(F.adjust_gamma_video, tv_tensors.Video),
46504650
],
@@ -4684,7 +4684,7 @@ def test_functional(self, make_input):
46844684
("kernel", "input_type"),
46854685
[
46864686
(F.adjust_hue_image, torch.Tensor),
4687-
(F._adjust_hue_image_pil, PIL.Image.Image),
4687+
(F._color._adjust_hue_image_pil, PIL.Image.Image),
46884688
(F.adjust_hue_image, tv_tensors.Image),
46894689
(F.adjust_hue_video, tv_tensors.Video),
46904690
],
@@ -4728,7 +4728,7 @@ def test_functional(self, make_input):
47284728
("kernel", "input_type"),
47294729
[
47304730
(F.adjust_saturation_image, torch.Tensor),
4731-
(F._adjust_saturation_image_pil, PIL.Image.Image),
4731+
(F._color._adjust_saturation_image_pil, PIL.Image.Image),
47324732
(F.adjust_saturation_image, tv_tensors.Image),
47334733
(F.adjust_saturation_video, tv_tensors.Video),
47344734
],
@@ -4799,11 +4799,11 @@ def test_functional(self, make_input, functional):
47994799
("functional", "kernel", "input_type"),
48004800
[
48014801
(F.five_crop, F.five_crop_image, torch.Tensor),
4802-
(F.five_crop, F._five_crop_image_pil, PIL.Image.Image),
4802+
(F.five_crop, F._geometry._five_crop_image_pil, PIL.Image.Image),
48034803
(F.five_crop, F.five_crop_image, tv_tensors.Image),
48044804
(F.five_crop, F.five_crop_video, tv_tensors.Video),
48054805
(F.ten_crop, F.ten_crop_image, torch.Tensor),
4806-
(F.ten_crop, F._ten_crop_image_pil, PIL.Image.Image),
4806+
(F.ten_crop, F._geometry._ten_crop_image_pil, PIL.Image.Image),
48074807
(F.ten_crop, F.ten_crop_image, tv_tensors.Image),
48084808
(F.ten_crop, F.ten_crop_video, tv_tensors.Video),
48094809
],
@@ -4955,7 +4955,7 @@ def test_functional(self, make_input):
49554955
("kernel", "input_type"),
49564956
[
49574957
(F.rgb_to_grayscale_image, torch.Tensor),
4958-
(F._rgb_to_grayscale_image_pil, PIL.Image.Image),
4958+
(F._color._rgb_to_grayscale_image_pil, PIL.Image.Image),
49594959
(F.rgb_to_grayscale_image, tv_tensors.Image),
49604960
],
49614961
)
@@ -5019,7 +5019,7 @@ def test_functional(self, make_input):
50195019
("kernel", "input_type"),
50205020
[
50215021
(F.rgb_to_grayscale_image, torch.Tensor),
5022-
(F._rgb_to_grayscale_image_pil, PIL.Image.Image),
5022+
(F._color._rgb_to_grayscale_image_pil, PIL.Image.Image),
50235023
(F.rgb_to_grayscale_image, tv_tensors.Image),
50245024
],
50255025
)
@@ -5951,7 +5951,7 @@ def test_functional(self, make_input):
59515951
("kernel", "input_type"),
59525952
[
59535953
(F.jpeg_image, torch.Tensor),
5954-
(F._jpeg_image_pil, PIL.Image.Image),
5954+
(F._augment._jpeg_image_pil, PIL.Image.Image),
59555955
(F.jpeg_image, tv_tensors.Image),
59565956
(F.jpeg_video, tv_tensors.Video),
59575957
],

‎torchvision/transforms/v2/functional/__init__.py

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,39 +6,23 @@
66
clamp_bounding_boxes,
77
convert_bounding_box_format,
88
get_dimensions_image,
9-
_get_dimensions_image_pil,
109
get_dimensions_video,
1110
get_dimensions,
1211
get_num_frames_video,
1312
get_num_frames,
1413
get_image_num_channels,
1514
get_num_channels_image,
16-
_get_num_channels_image_pil,
1715
get_num_channels_video,
1816
get_num_channels,
1917
get_size_bounding_boxes,
2018
get_size_image,
21-
_get_size_image_pil,
2219
get_size_mask,
2320
get_size_video,
2421
get_size,
2522
) # usort: skip
2623

27-
from ._augment import _erase_image_pil, _jpeg_image_pil, erase, erase_image, erase_video, jpeg, jpeg_image, jpeg_video
24+
from ._augment import erase, erase_image, erase_video, jpeg, jpeg_image, jpeg_video
2825
from ._color import (
29-
_adjust_brightness_image_pil,
30-
_adjust_contrast_image_pil,
31-
_adjust_gamma_image_pil,
32-
_adjust_hue_image_pil,
33-
_adjust_saturation_image_pil,
34-
_adjust_sharpness_image_pil,
35-
_autocontrast_image_pil,
36-
_equalize_image_pil,
37-
_invert_image_pil,
38-
_permute_channels_image_pil,
39-
_posterize_image_pil,
40-
_rgb_to_grayscale_image_pil,
41-
_solarize_image_pil,
4226
adjust_brightness,
4327
adjust_brightness_image,
4428
adjust_brightness_video,
@@ -82,19 +66,6 @@
8266
to_grayscale,
8367
)
8468
from ._geometry import (
85-
_affine_image_pil,
86-
_center_crop_image_pil,
87-
_crop_image_pil,
88-
_elastic_image_pil,
89-
_five_crop_image_pil,
90-
_horizontal_flip_image_pil,
91-
_pad_image_pil,
92-
_perspective_image_pil,
93-
_resize_image_pil,
94-
_resized_crop_image_pil,
95-
_rotate_image_pil,
96-
_ten_crop_image_pil,
97-
_vertical_flip_image_pil,
9869
affine,
9970
affine_bounding_boxes,
10071
affine_image,
@@ -161,7 +132,6 @@
161132
vflip,
162133
)
163134
from ._misc import (
164-
_gaussian_blur_image_pil,
165135
convert_image_dtype,
166136
gaussian_blur,
167137
gaussian_blur_image,

0 commit comments

Comments
 (0)