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

Use scandir in _find_classes (#557) #559

Merged
merged 2 commits into from
Jul 27, 2018
Merged

Use scandir in _find_classes (#557) #559

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3146b18
Use scandir in _find_classes (#557)
Jul 27, 2018
1192ccd
fix lint
soumith Jul 27, 2018
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: 6 additions & 1 deletion torchvision/datasets/folder.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import os
import os.path
import sys


def has_file_allowed_extension(filename, extensions):
Expand Down Expand Up @@ -110,7 +111,11 @@ def _find_classes(self, dir):
Ensures:
No class is a subdirectory of another.
"""
classes = [d for d in os.listdir(dir) if os.path.isdir(os.path.join(dir, d))]
if sys.version_info >= (3,5):
# Faster and available in Python 3.5 and above
classes = [d.name for d in os.scandir(dir) if d.is_dir()]
else:
classes = [d for d in os.listdir(dir) if os.path.isdir(os.path.join(dir, d))]
classes.sort()
class_to_idx = {classes[i]: i for i in range(len(classes))}
return classes, class_to_idx
Expand Down