recursive dir walking (#80)

8fe6e45a · NC Cullen · Soumith Chintala · c0a6cfe1 · 8fe6e45a
Commit 8fe6e45a authored Feb 28, 2017 by NC Cullen Committed by Soumith Chintala Feb 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

torchvision/datasets/folder.py torchvision/datasets/folder.py +6 -5

No files found.
--- a/torchvision/datasets/folder.py
+++ b/torchvision/datasets/folder.py
@@ -28,11 +28,12 @@ def make_dataset(dir, class_to_idx):
        if not os.path.isdir(d):
            continue
-        for filename in os.listdir(d):
+        for root, _, fnames in sorted(os.walk(d)):
-            if is_image_file(filename):
+            for fname in fnames:
-                path = '{0}/{1}'.format(target, filename)
+                if is_image_file(fname):
-                item = (path, class_to_idx[target])
+                    path = os.path.join(root, fname)
-                images.append(item)
+                    item = (path, class_to_idx[target])
+                    images.append(item)
    return images