Skip to content

Add pathlib.Path support for image IO utils #8314

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions test/test_image.py
Original file line number Diff line number Diff line change
Expand Up @@ -532,5 +532,21 @@ def test_write_jpeg(img_path, tmpdir, scripted):
assert_equal(torch_bytes, pil_bytes)


def test_pathlib_support(tmpdir):
# Just make sure pathlib.Path is supported where relevant

jpeg_path = Path(next(get_images(ENCODE_JPEG, ".jpg")))

read_file(jpeg_path)
read_image(jpeg_path)

write_path = Path(tmpdir) / "whatever"
img = torch.randint(0, 10, size=(3, 4, 4), dtype=torch.uint8)

write_file(write_path, data=img.flatten())
write_jpeg(img, write_path)
write_png(img, write_path)


if __name__ == "__main__":
pytest.main([__file__])
14 changes: 7 additions & 7 deletions torchvision/io/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@ def read_file(path: str) -> torch.Tensor:
with one dimension.

Args:
path (str): the path to the file to be read
path (str or ``pathlib.Path``): the path to the file to be read
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that we can't change the type signatures because of torchscript.


Returns:
data (Tensor)
"""
if not torch.jit.is_scripting() and not torch.jit.is_tracing():
_log_api_usage_once(read_file)
data = torch.ops.image.read_file(path)
data = torch.ops.image.read_file(str(path))
return data


Expand All @@ -59,12 +59,12 @@ def write_file(filename: str, data: torch.Tensor) -> None:
file.

Args:
filename (str): the path to the file to be written
filename (str or ``pathlib.Path``): the path to the file to be written
data (Tensor): the contents to be written to the output file
"""
if not torch.jit.is_scripting() and not torch.jit.is_tracing():
_log_api_usage_once(write_file)
torch.ops.image.write_file(filename, data)
torch.ops.image.write_file(str(filename), data)


def decode_png(
Expand Down Expand Up @@ -123,7 +123,7 @@ def write_png(input: torch.Tensor, filename: str, compression_level: int = 6):
Args:
input (Tensor[channels, image_height, image_width]): int8 image tensor of
``c`` channels, where ``c`` must be 1 or 3.
filename (str): Path to save the image.
filename (str or ``pathlib.Path``): Path to save the image.
compression_level (int): Compression factor for the resulting file, it must be a number
between 0 and 9. Default: 6
"""
Expand Down Expand Up @@ -211,7 +211,7 @@ def write_jpeg(input: torch.Tensor, filename: str, quality: int = 75):
Args:
input (Tensor[channels, image_height, image_width]): int8 image tensor of ``c``
channels, where ``c`` must be 1 or 3.
filename (str): Path to save the image.
filename (str or ``pathlib.Path``): Path to save the image.
quality (int): Quality of the resulting JPEG file, it must be a number
between 1 and 100. Default: 75
"""
Expand Down Expand Up @@ -259,7 +259,7 @@ def read_image(
The values of the output tensor are uint8 in [0, 255].

Args:
path (str): path of the JPEG or PNG image.
path (str or ``pathlib.Path``): path of the JPEG or PNG image.
mode (ImageReadMode): the read mode used for optionally converting the image.
Default: ``ImageReadMode.UNCHANGED``.
See ``ImageReadMode`` class for more information on various
Expand Down