Skip to content
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

Jump to bottom

PR: Make JPEG/PNG reading ops return images in CHW format #2680

Merged
merged 2 commits into from Sep 18, 2020
Merged

PR: Make JPEG/PNG reading ops return images in CHW format #2680

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e58fd28
Make JPEG/PNG return images in CHW format
andfoy Sep 16, 2020
006ccc4
Use int array
andfoy Sep 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions test/test_image.py
View file
Open in desktop
Expand Up @@ -30,12 +30,14 @@ class ImageTester(unittest.TestCase):
def test_read_jpeg(self):
for img_path in get_images(IMAGE_ROOT, ".jpg"):
img_pil = torch.load(img_path.replace('jpg', 'pth'))
img_pil = img_pil.permute(2, 0, 1)
img_ljpeg = read_jpeg(img_path)
self.assertTrue(img_ljpeg.equal(img_pil))

def test_decode_jpeg(self):
for img_path in get_images(IMAGE_ROOT, ".jpg"):
img_pil = torch.load(img_path.replace('jpg', 'pth'))
img_pil = img_pil.permute(2, 0, 1)
size = os.path.getsize(img_path)
img_ljpeg = decode_jpeg(torch.from_file(img_path, dtype=torch.uint8, size=size))
self.assertTrue(img_ljpeg.equal(img_pil))
Expand Down Expand Up @@ -68,12 +70,14 @@ def test_read_png(self):
# Check across .png
for img_path in get_images(IMAGE_DIR, ".png"):
img_pil = torch.from_numpy(np.array(Image.open(img_path)))
img_pil = img_pil.permute(2, 0, 1)
img_lpng = read_png(img_path)
self.assertTrue(img_lpng.equal(img_pil))

def test_decode_png(self):
for img_path in get_images(IMAGE_DIR, ".png"):
img_pil = torch.from_numpy(np.array(Image.open(img_path)))
img_pil = img_pil.permute(2, 0, 1)
size = os.path.getsize(img_path)
img_lpng = decode_png(torch.from_file(img_path, dtype=torch.uint8, size=size))
self.assertTrue(img_lpng.equal(img_pil))
Expand Down
2 changes: 1 addition & 1 deletion torchvision/csrc/cpu/image/readjpeg_cpu.cpp
View file
Open in desktop
Expand Up @@ -137,7 +137,7 @@ torch::Tensor decodeJPEG(const torch::Tensor& data) {

jpeg_finish_decompress(&cinfo);
jpeg_destroy_decompress(&cinfo);
return tensor;
return tensor.permute({2, 0, 1});
}

#endif // JPEG_FOUND
2 changes: 1 addition & 1 deletion torchvision/csrc/cpu/image/readpng_cpu.cpp
View file
Open in desktop
Expand Up @@ -79,6 +79,6 @@ torch::Tensor decodePNG(const torch::Tensor& data) {
ptr += bytes;
}
png_destroy_read_struct(&png_ptr, &info_ptr, nullptr);
return tensor;
return tensor.permute({2, 0, 1});
}
#endif // PNG_FOUND