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

Correct Resize pipeline #211

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Correct Resize pipeline #211

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b1f972b
Update augmentation.py
makecent Jan 9, 2022
159e5ce
Update augmentation.py
makecent Jan 9, 2022
b0ab0dd
Update lsun-car_pad_512.py
makecent Jan 10, 2022
e98d5b8
Update imagenet_rgb.py
makecent Jan 10, 2022
12568ad
Update imagenet_rgb.py
makecent Jan 10, 2022
41ea798
Update augmentation.py
makecent Jan 10, 2022
1246986
Update augmentation.py
makecent Jan 10, 2022
6a263be
Update augmentation.py
makecent Jan 11, 2022
880e94b
Update augmentation.py
makecent Jan 11, 2022
156d50b
revise pre-commit
makecent Jan 11, 2022
6564429
Update augmentation.py
makecent Jan 12, 2022
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
Prev Previous commit
Next Next commit
Update augmentation.py
  • Loading branch information
@makecent
makecent committed Jan 11, 2022
commit 880e94bc53ce668e632b7b8dcf07b042b0764b41
19 changes: 9 additions & 10 deletions mmgen/datasets/pipelines/augmentation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,18 @@ def __call__(self, results):
new_w = min(self.max_size - (self.max_size % self.size_factor),
new_w)
scale = (new_w, new_h)
elif isinstance(self.scale, tuple) and (np.inf in self.scale):
elif isinstance(self.scale, tuple):
# find inf in self.scale, calculate ``scale`` manually
h, w = results[self.keys[0]].shape[:2]
if h < w:
scale = (int(self.scale[-1] / h * w), self.scale[-1])
if np.inf in self.scale:
h, w = results[self.keys[0]].shape[:2]
if h < w:
scale = (int(self.scale[-1] / h * w), self.scale[-1])
else:
scale = (self.scale[-1], int(self.scale[-1] / w * h))
else:
scale = (self.scale[-1], int(self.scale[-1] / w * h))
else:
# direct use the given ones
if mmcv.is_tuple_of(self.scale, int):
scale = self.scale[::-1]
else:
scale = float(self.scale)
else:
scale = float(self.scale)

# here we assume all images in self.keys have the same input size
for key in self.keys:
Expand Down