From b813acf4b2de08a2d1ff742da3740a6bb0d7c86d Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 6 Apr 2022 15:30:24 +0200 Subject: [PATCH 1/3] fix category file generation --- torchvision/prototype/datasets/_builtin/country211.py | 4 ++-- torchvision/prototype/datasets/_builtin/dtd.py | 5 +++-- torchvision/prototype/datasets/_builtin/food101.py | 2 +- torchvision/prototype/datasets/_builtin/oxford_iiit_pet.py | 5 ++--- torchvision/prototype/datasets/_builtin/sbd.py | 2 +- torchvision/prototype/datasets/_builtin/voc.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/torchvision/prototype/datasets/_builtin/country211.py b/torchvision/prototype/datasets/_builtin/country211.py index ae0564b224b..461cd71568f 100644 --- a/torchvision/prototype/datasets/_builtin/country211.py +++ b/torchvision/prototype/datasets/_builtin/country211.py @@ -73,6 +73,6 @@ def __len__(self) -> int: }[self._split] def _generate_categories(self) -> List[str]: - resources = self.resources() - dp = resources[0].load(self.root) + resources = self._resources() + dp = resources[0].load(self._root) return sorted({pathlib.Path(path).parent.name for path, _ in dp}) diff --git a/torchvision/prototype/datasets/_builtin/dtd.py b/torchvision/prototype/datasets/_builtin/dtd.py index a5de1359e4e..d7f07dc8b30 100644 --- a/torchvision/prototype/datasets/_builtin/dtd.py +++ b/torchvision/prototype/datasets/_builtin/dtd.py @@ -41,8 +41,9 @@ def _info() -> Dict[str, Any]: @register_dataset(NAME) class DTD(Dataset2): """DTD Dataset. - homepage="https://www.robots.ox.ac.uk/~vgg/data/dtd/", + homepage="https://www.robots.ox.ac.uk/~vgg/data/dtd/", """ + def __init__( self, root: Union[str, pathlib.Path], @@ -134,7 +135,7 @@ def _filter_images(self, data: Tuple[str, Any]) -> bool: return self._classify_archive(data) == DTDDemux.IMAGES def _generate_categories(self) -> List[str]: - resources = self.resources() + resources = self._resources() dp = resources[0].load(self._root) dp = Filter(dp, self._filter_images) diff --git a/torchvision/prototype/datasets/_builtin/food101.py b/torchvision/prototype/datasets/_builtin/food101.py index 36b2acca4d0..c86b9aaea84 100644 --- a/torchvision/prototype/datasets/_builtin/food101.py +++ b/torchvision/prototype/datasets/_builtin/food101.py @@ -96,7 +96,7 @@ def _datapipe(self, resource_dps: List[IterDataPipe]) -> IterDataPipe[Dict[str, return Mapper(dp, self._prepare_sample) def _generate_categories(self) -> List[str]: - resources = self.resources() + resources = self._resources() dp = resources[0].load(self._root) dp = Filter(dp, path_comparator("name", "classes.txt")) dp = LineReader(dp, decode=True, return_path=False) diff --git a/torchvision/prototype/datasets/_builtin/oxford_iiit_pet.py b/torchvision/prototype/datasets/_builtin/oxford_iiit_pet.py index 714360c24f6..0ea336a1421 100644 --- a/torchvision/prototype/datasets/_builtin/oxford_iiit_pet.py +++ b/torchvision/prototype/datasets/_builtin/oxford_iiit_pet.py @@ -136,12 +136,11 @@ def _filter_split_and_classification_anns(self, data: Tuple[str, Any]) -> bool: return self._classify_anns(data) == OxfordIIITPetDemux.SPLIT_AND_CLASSIFICATION def _generate_categories(self) -> List[str]: - config = self.default_config - resources = self.resources(config) + resources = self._resources() dp = resources[1].load(self._root) dp = Filter(dp, self._filter_split_and_classification_anns) - dp = Filter(dp, path_comparator("name", f"{config.split}.txt")) + dp = Filter(dp, path_comparator("name", "trainval.txt")) dp = CSVDictParser(dp, fieldnames=("image_id", "label"), delimiter=" ") raw_categories_and_labels = {(data["image_id"].rsplit("_", 1)[0], data["label"]) for data in dp} diff --git a/torchvision/prototype/datasets/_builtin/sbd.py b/torchvision/prototype/datasets/_builtin/sbd.py index 7fd47b6c991..bcacaea2d24 100644 --- a/torchvision/prototype/datasets/_builtin/sbd.py +++ b/torchvision/prototype/datasets/_builtin/sbd.py @@ -121,7 +121,7 @@ def _make_datapipe( return Mapper(dp, self._prepare_sample) def _generate_categories(self, root: pathlib.Path) -> Tuple[str, ...]: - resources = self.resources(self.default_config) + resources = self._resources(self.default_config) dp = resources[0].load(root) dp = Filter(dp, path_comparator("name", "category_names.m")) diff --git a/torchvision/prototype/datasets/_builtin/voc.py b/torchvision/prototype/datasets/_builtin/voc.py index 91b82794e27..1f5980bdc72 100644 --- a/torchvision/prototype/datasets/_builtin/voc.py +++ b/torchvision/prototype/datasets/_builtin/voc.py @@ -218,7 +218,7 @@ def _generate_categories(self) -> List[str]: resources = self._resources() archive_dp = resources[0].load(self._root) - dp = Filter(archive_dp, self._filter_detection_anns) + dp = Filter(archive_dp, self._filter_anns) dp = Mapper(dp, self._parse_detection_ann, input_col=1) return sorted({instance["name"] for _, anns in dp for instance in anns["object"]}) From a3f35f4d25ccaf62ed466b2d9aa61915558d1288 Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 6 Apr 2022 15:33:03 +0200 Subject: [PATCH 2/3] revert unrelated change --- torchvision/prototype/datasets/_builtin/dtd.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/torchvision/prototype/datasets/_builtin/dtd.py b/torchvision/prototype/datasets/_builtin/dtd.py index d7f07dc8b30..3bc80d5fc2b 100644 --- a/torchvision/prototype/datasets/_builtin/dtd.py +++ b/torchvision/prototype/datasets/_builtin/dtd.py @@ -41,8 +41,8 @@ def _info() -> Dict[str, Any]: @register_dataset(NAME) class DTD(Dataset2): """DTD Dataset. - homepage="https://www.robots.ox.ac.uk/~vgg/data/dtd/", - """ + homepage="https://www.robots.ox.ac.uk/~vgg/data/dtd/", + """ def __init__( self, From 3c7ef38c822242eb890c33481a986e4c382c166d Mon Sep 17 00:00:00 2001 From: Philip Meier Date: Wed, 6 Apr 2022 15:34:17 +0200 Subject: [PATCH 3/3] revert unrelated change --- torchvision/prototype/datasets/_builtin/dtd.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/torchvision/prototype/datasets/_builtin/dtd.py b/torchvision/prototype/datasets/_builtin/dtd.py index 3bc80d5fc2b..8e676ca6bff 100644 --- a/torchvision/prototype/datasets/_builtin/dtd.py +++ b/torchvision/prototype/datasets/_builtin/dtd.py @@ -42,8 +42,7 @@ def _info() -> Dict[str, Any]: class DTD(Dataset2): """DTD Dataset. homepage="https://www.robots.ox.ac.uk/~vgg/data/dtd/", - """ - + """ def __init__( self, root: Union[str, pathlib.Path],