Skip to content

Add device check to io.decode_image #7406

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.

Sign up for GitHub

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 4 commits into from
Mar 10, 2023
Merged

Add device check to io.decode_image #7406

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa6e8dd
Add device check to `io.decode_image`
malfet Mar 9, 2023
740443c
Update test/test_image.py
malfet Mar 9, 2023
a5c3a17
Merge branch 'main' into malfet/decode-image-device-check
malfet Mar 9, 2023
5637233
Merge branch 'main' into malfet/decode-image-device-check
malfet Mar 10, 2023
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
7 changes: 7 additions & 0 deletions test/test_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,13 @@ def test_decode_jpeg_cuda(mode, img_path, scripted):
# Some difference expected between jpeg implementations
assert (img.float() - img_nvjpeg.cpu().float()).abs().mean() < 2

@needs_cuda
def test_decode_image_cuda_raises():
data = torch.randint(0, 127, size=(255,), device="cuda", dtype=torch.uint8)
exception_raised = True
Copy link
Member

@NicolasHug NicolasHug Mar 9, 2023

Choose a reason for hiding this comment

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

Nit: this can be removed now

Suggested change
exception_raised = True

Copy link
Contributor

@pmeier pmeier Mar 10, 2023

Choose a reason for hiding this comment

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

This shouldn't be a nit, since (amongst other things) it breaks the lint workflow: https://app.circleci.com/jobs/github/pytorch/vision/1851401

Copy link
Member

@NicolasHug NicolasHug Mar 10, 2023

Choose a reason for hiding this comment

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

#7408

with pytest.raises(RuntimeError):
decode_image(data)


@needs_cuda
@pytest.mark.parametrize("cuda_device", ("cuda", "cuda:0", torch.device("cuda")))
Expand Down
2 changes: 2 additions & 0 deletions torchvision/csrc/io/image/cpu/decode_image.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ namespace vision {
namespace image {

torch::Tensor decode_image(const torch::Tensor& data, ImageReadMode mode) {
// Check that tensor is a CPU tensor
TORCH_CHECK(data.device() == torch::kCPU, "Expected a CPU tensor");
// Check that the input tensor dtype is uint8
TORCH_CHECK(data.dtype() == torch::kU8, "Expected a torch.uint8 tensor");
// Check that the input tensor is 1-dimensional
Expand Down