From 0c2544fcc2ba84904abc921e817085abb157d340 Mon Sep 17 00:00:00 2001 From: alessandro Date: Thu, 1 Apr 2021 16:23:34 +0100 Subject: [PATCH 1/5] make find_classes public --- torchvision/datasets/folder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/torchvision/datasets/folder.py b/torchvision/datasets/folder.py index d121bad7a19..8359ff60f0c 100644 --- a/torchvision/datasets/folder.py +++ b/torchvision/datasets/folder.py @@ -182,7 +182,7 @@ def __init__( ) -> None: super(DatasetFolder, self).__init__(root, transform=transform, target_transform=target_transform) - classes, class_to_idx = self._find_classes(self.root) + classes, class_to_idx = self.find_classes(self.root) samples = self.make_dataset(self.root, class_to_idx, extensions, is_valid_file) self.loader = loader @@ -203,7 +203,7 @@ def make_dataset( return make_dataset(directory, class_to_idx, extensions=extensions, is_valid_file=is_valid_file) @staticmethod - def _find_classes(dir: str) -> Tuple[List[str], Dict[str, int]]: + def find_classes(dir: str) -> Tuple[List[str], Dict[str, int]]: return find_classes(dir) def __getitem__(self, index: int) -> Tuple[Any, Any]: From da0838469fdc782b9ac7625dd3ef13b55f5dbc97 Mon Sep 17 00:00:00 2001 From: alessandro Date: Thu, 1 Apr 2021 18:07:33 +0100 Subject: [PATCH 2/5] instance method --- torchvision/datasets/folder.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/torchvision/datasets/folder.py b/torchvision/datasets/folder.py index 8359ff60f0c..7853304368f 100644 --- a/torchvision/datasets/folder.py +++ b/torchvision/datasets/folder.py @@ -202,8 +202,7 @@ def make_dataset( ) -> List[Tuple[str, int]]: return make_dataset(directory, class_to_idx, extensions=extensions, is_valid_file=is_valid_file) - @staticmethod - def find_classes(dir: str) -> Tuple[List[str], Dict[str, int]]: + def find_classes(self, dir: str) -> Tuple[List[str], Dict[str, int]]: return find_classes(dir) def __getitem__(self, index: int) -> Tuple[Any, Any]: From 39ba4b08186d193a0717fb271edd38cdd0687248 Mon Sep 17 00:00:00 2001 From: alessandro Date: Fri, 2 Apr 2021 15:21:28 +0100 Subject: [PATCH 3/5] add docstring --- torchvision/datasets/folder.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/torchvision/datasets/folder.py b/torchvision/datasets/folder.py index 7853304368f..df044f513e2 100644 --- a/torchvision/datasets/folder.py +++ b/torchvision/datasets/folder.py @@ -203,6 +203,10 @@ def make_dataset( return make_dataset(directory, class_to_idx, extensions=extensions, is_valid_file=is_valid_file) def find_classes(self, dir: str) -> Tuple[List[str], Dict[str, int]]: + """ + Same as :func:find_classes. This method can be overridden to only consider + a subset of classes, or to adapt to a different dataset directory structure. + """ return find_classes(dir) def __getitem__(self, index: int) -> Tuple[Any, Any]: From 66650de09db0a05ffd5128013df74095d23092fe Mon Sep 17 00:00:00 2001 From: Alessandro Melis Date: Fri, 2 Apr 2021 15:37:46 +0100 Subject: [PATCH 4/5] Update torchvision/datasets/folder.py Co-authored-by: Nicolas Hug --- torchvision/datasets/folder.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/torchvision/datasets/folder.py b/torchvision/datasets/folder.py index df044f513e2..81ac34cf847 100644 --- a/torchvision/datasets/folder.py +++ b/torchvision/datasets/folder.py @@ -203,8 +203,9 @@ def make_dataset( return make_dataset(directory, class_to_idx, extensions=extensions, is_valid_file=is_valid_file) def find_classes(self, dir: str) -> Tuple[List[str], Dict[str, int]]: - """ - Same as :func:find_classes. This method can be overridden to only consider + """Same as :func:`find_classes`. + + This method can be overridden to only consider a subset of classes, or to adapt to a different dataset directory structure. """ return find_classes(dir) From 216f3a06979237bb7580bf7956ac81358a57bf04 Mon Sep 17 00:00:00 2001 From: alessandro Date: Fri, 2 Apr 2021 16:59:17 +0100 Subject: [PATCH 5/5] fix python_lint ./torchvision/datasets/folder.py:207:1: W293 blank line contains whitespace ./torchvision/datasets/folder.py:208:55: W291 trailing whitespace --- torchvision/datasets/folder.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/torchvision/datasets/folder.py b/torchvision/datasets/folder.py index 81ac34cf847..9eb849bbe34 100644 --- a/torchvision/datasets/folder.py +++ b/torchvision/datasets/folder.py @@ -204,8 +204,8 @@ def make_dataset( def find_classes(self, dir: str) -> Tuple[List[str], Dict[str, int]]: """Same as :func:`find_classes`. - - This method can be overridden to only consider + + This method can be overridden to only consider a subset of classes, or to adapt to a different dataset directory structure. """ return find_classes(dir)