Skip to content

Minor Compressions in statements in folder.py #874

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
fmassa merged 2 commits into from
Apr 25, 2019
Merged

Minor Compressions in statements in folder.py #874

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3404cbd
minor improvments
surgan12 Apr 25, 2019
2bfd7b5
Merge remote-tracking branch 'upstream/master'
surgan12 Apr 25, 2019
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
6 changes: 2 additions & 4 deletions torchvision/datasets/folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,8 @@ def is_image_file(filename):
def make_dataset(dir, class_to_idx, extensions=None, is_valid_file=None):
images = []
dir = os.path.expanduser(dir)
if extensions is None and is_valid_file is None:
raise ValueError("Both extensions and is_valid_file cannot be None")
if extensions is not None and is_valid_file is not None:
raise ValueError("One of the extensions and is_valid_file should be None")
if not ((extensions is None) ^ (is_valid_file is None)):
raise ValueError("Both extensions and is_valid_file cannot be None or not None at the same time")
if extensions is not None:
def is_valid_file(x):
return has_file_allowed_extension(x, extensions)
Expand Down