Unverified Commit cc9ceb54 authored by vfdev's avatar vfdev Committed by GitHub
Browse files

[proto] Clean-ups from 6512 (part 2) (#6523)



* Moving `_parse_pad_padding()` to functional geometry

* Other updates to make previous commit consistent
Co-authored-by: default avatarVasilis Vryniotis <vvryniotis@fb.com>
parent 000f84d5
...@@ -12,16 +12,7 @@ from torchvision.prototype.transforms import functional as F, InterpolationMode, ...@@ -12,16 +12,7 @@ from torchvision.prototype.transforms import functional as F, InterpolationMode,
from typing_extensions import Literal from typing_extensions import Literal
from ._transform import _RandomApplyTransform from ._transform import _RandomApplyTransform
from ._utils import ( from ._utils import _check_sequence_input, _setup_angle, _setup_size, has_all, has_any, query_bounding_box, query_chw
_check_sequence_input,
_parse_pad_padding,
_setup_angle,
_setup_size,
has_all,
has_any,
query_bounding_box,
query_chw,
)
class RandomHorizontalFlip(_RandomApplyTransform): class RandomHorizontalFlip(_RandomApplyTransform):
...@@ -433,7 +424,7 @@ class RandomCrop(Transform): ...@@ -433,7 +424,7 @@ class RandomCrop(Transform):
padding = self.padding padding = self.padding
if isinstance(padding, Sequence): if isinstance(padding, Sequence):
padding = list(padding) padding = list(padding)
pad_left, pad_right, pad_top, pad_bottom = _parse_pad_padding(padding) pad_left, pad_right, pad_top, pad_bottom = F._geometry._parse_pad_padding(padding)
height += pad_top + pad_bottom height += pad_top + pad_bottom
width += pad_left + pad_right width += pad_left + pad_right
......
...@@ -6,7 +6,6 @@ from torchvision._utils import sequence_to_str ...@@ -6,7 +6,6 @@ from torchvision._utils import sequence_to_str
from torchvision.prototype import features from torchvision.prototype import features
from torchvision.prototype.transforms.functional._meta import get_chw from torchvision.prototype.transforms.functional._meta import get_chw
from torchvision.transforms.functional_tensor import _parse_pad_padding # noqa: F401
from torchvision.transforms.transforms import _check_sequence_input, _setup_angle, _setup_size # noqa: F401 from torchvision.transforms.transforms import _check_sequence_input, _setup_angle, _setup_size # noqa: F401
......
...@@ -15,6 +15,7 @@ from torchvision.transforms.functional import ( ...@@ -15,6 +15,7 @@ from torchvision.transforms.functional import (
pil_to_tensor, pil_to_tensor,
to_pil_image, to_pil_image,
) )
from torchvision.transforms.functional_tensor import _parse_pad_padding
from ._meta import convert_bounding_box_format, get_dimensions_image_pil, get_dimensions_image_tensor from ._meta import convert_bounding_box_format, get_dimensions_image_pil, get_dimensions_image_tensor
...@@ -564,7 +565,7 @@ def _pad_with_vector_fill( ...@@ -564,7 +565,7 @@ def _pad_with_vector_fill(
raise ValueError(f"Padding mode '{padding_mode}' is not supported if fill is not scalar") raise ValueError(f"Padding mode '{padding_mode}' is not supported if fill is not scalar")
output = pad_image_tensor(img, padding, fill=0, padding_mode="constant") output = pad_image_tensor(img, padding, fill=0, padding_mode="constant")
left, right, top, bottom = _FT._parse_pad_padding(padding) left, right, top, bottom = _parse_pad_padding(padding)
fill = torch.tensor(fill, dtype=img.dtype, device=img.device).view(-1, 1, 1) fill = torch.tensor(fill, dtype=img.dtype, device=img.device).view(-1, 1, 1)
if top > 0: if top > 0:
...@@ -595,7 +596,7 @@ def pad_segmentation_mask( ...@@ -595,7 +596,7 @@ def pad_segmentation_mask(
def pad_bounding_box( def pad_bounding_box(
bounding_box: torch.Tensor, padding: Union[int, List[int]], format: features.BoundingBoxFormat bounding_box: torch.Tensor, padding: Union[int, List[int]], format: features.BoundingBoxFormat
) -> torch.Tensor: ) -> torch.Tensor:
left, _, top, _ = _FT._parse_pad_padding(padding) left, _, top, _ = _parse_pad_padding(padding)
bounding_box = bounding_box.clone() bounding_box = bounding_box.clone()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment