Skip to content

fix category file generation #5770

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.

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions torchvision/prototype/datasets/_builtin/country211.py
Original file line number Diff line number Diff line change
Expand Up @@ -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})
2 changes: 1 addition & 1 deletion torchvision/prototype/datasets/_builtin/dtd.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,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)
Expand Down
2 changes: 1 addition & 1 deletion torchvision/prototype/datasets/_builtin/food101.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
5 changes: 2 additions & 3 deletions torchvision/prototype/datasets/_builtin/oxford_iiit_pet.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion torchvision/prototype/datasets/_builtin/sbd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
2 changes: 1 addition & 1 deletion torchvision/prototype/datasets/_builtin/voc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]})