Skip to content

make size param of Scale (h,w) not (w,h) #256

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 3 commits into from
Sep 16, 2017
Merged

make size param of Scale (h,w) not (w,h) #256

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
523b48c
make size param of CenterCrop and RandomCrop (w,h) not (h,w)
alykhantejani Sep 14, 2017
4b6bb8d
revert swapping size dims in crop and random_crop
alykhantejani Sep 15, 2017
9e3a2ee
change Scale's size param to be (h,w) not (w,h)
alykhantejani Sep 16, 2017
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
4 changes: 2 additions & 2 deletions test/test_transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,15 @@ def test_scale(self):
owidth = random.randint(5, 12) * 2
result = transforms.Compose([
transforms.ToPILImage(),
transforms.Scale((owidth, oheight)),
transforms.Scale((oheight, owidth)),
transforms.ToTensor(),
])(img)
assert result.size(1) == oheight
assert result.size(2) == owidth

result = transforms.Compose([
transforms.ToPILImage(),
transforms.Scale([owidth, oheight]),
transforms.Scale([oheight, owidth]),
transforms.ToTensor(),
])(img)
assert result.size(1) == oheight
Expand Down
4 changes: 2 additions & 2 deletions torchvision/transforms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ class Scale(object):

Args:
size (sequence or int): Desired output size. If size is a sequence like
(w, h), output size will be matched to this. If size is an int,
(h, w), output size will be matched to this. If size is an int,
smaller edge of the image will be matched to this number.
i.e, if height > width, then image will be rescaled to
(size * height / width, size)
Expand Down Expand Up @@ -199,7 +199,7 @@ def __call__(self, img):
ow = int(self.size * w / h)
return img.resize((ow, oh), self.interpolation)
else:
return img.resize(self.size, self.interpolation)
return img.resize(self.size[::-1], self.interpolation)


class CenterCrop(object):
Expand Down