fix category file generation (#5770)

* fix category file generation

* revert unrelated change

* revert unrelated change

Author: pmeier

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})

torchvision/prototype/datasets/_builtin/dtd.py

@@ -135,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)

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)

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}

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"))

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"]})