diff --git a/test/builtin_dataset_mocks.py b/test/builtin_dataset_mocks.py index 1153c1b33f0..768177b1c28 100644 --- a/test/builtin_dataset_mocks.py +++ b/test/builtin_dataset_mocks.py @@ -10,6 +10,7 @@ import pathlib import pickle import random +import warnings import xml.etree.ElementTree as ET from collections import defaultdict, Counter @@ -470,7 +471,10 @@ def imagenet(info, root, config): ] num_children = 1 synsets.extend((0, "", "", "", num_children, [], 0, 0) for _ in range(5)) - savemat(data_root / "meta.mat", dict(synsets=synsets)) + with warnings.catch_warnings(): + # The warning is not for savemat, but rather for some internals savemet is using + warnings.filterwarnings("ignore", category=np.VisibleDeprecationWarning) + savemat(data_root / "meta.mat", dict(synsets=synsets)) make_tar(root, devkit_root.with_suffix(".tar.gz").name, compression="gz") else: # config.split == "test" diff --git a/test/test_prototype_builtin_datasets.py b/test/test_prototype_builtin_datasets.py index f414f4e48cd..3057615acd4 100644 --- a/test/test_prototype_builtin_datasets.py +++ b/test/test_prototype_builtin_datasets.py @@ -35,6 +35,7 @@ def test_coverage(): ) +@pytest.mark.filterwarnings("error") class TestCommon: @parametrize_dataset_mocks(DATASET_MOCKS) def test_smoke(self, test_home, dataset_mock, config): diff --git a/torchvision/prototype/datasets/_builtin/imagenet.py b/torchvision/prototype/datasets/_builtin/imagenet.py index 3aed2cf0a30..47cf0db1dab 100644 --- a/torchvision/prototype/datasets/_builtin/imagenet.py +++ b/torchvision/prototype/datasets/_builtin/imagenet.py @@ -10,7 +10,7 @@ Mapper, Filter, Demultiplexer, - TarArchiveReader, + TarArchiveLoader, Enumerator, ) from torchvision.prototype.datasets.utils import ( @@ -158,7 +158,7 @@ def _make_datapipe( # the train archive is a tar of tars if config.split == "train": - dp = TarArchiveReader(dp) + dp = TarArchiveLoader(dp) dp = hint_sharding(dp) dp = hint_shuffling(dp) diff --git a/torchvision/prototype/datasets/_builtin/pcam.py b/torchvision/prototype/datasets/_builtin/pcam.py index ab95391b466..a0c68185287 100644 --- a/torchvision/prototype/datasets/_builtin/pcam.py +++ b/torchvision/prototype/datasets/_builtin/pcam.py @@ -99,7 +99,7 @@ def _prepare_sample(self, data: Tuple[Any, Any]) -> Dict[str, Any]: image, target = data # They're both numpy arrays at this point return { - "image": features.Image(image), + "image": features.Image(image.transpose(2, 0, 1)), "label": Label(target.item()), } diff --git a/torchvision/prototype/datasets/utils/_resource.py b/torchvision/prototype/datasets/utils/_resource.py index e88a6966390..507428a98d3 100644 --- a/torchvision/prototype/datasets/utils/_resource.py +++ b/torchvision/prototype/datasets/utils/_resource.py @@ -10,8 +10,8 @@ FileLister, FileOpener, IterDataPipe, - ZipArchiveReader, - TarArchiveReader, + ZipArchiveLoader, + TarArchiveLoader, RarArchiveLoader, ) from torchvision.datasets.utils import ( @@ -72,8 +72,8 @@ def _loader(self, path: pathlib.Path) -> IterDataPipe[Tuple[str, IO]]: return dp _ARCHIVE_LOADERS = { - ".tar": TarArchiveReader, - ".zip": ZipArchiveReader, + ".tar": TarArchiveLoader, + ".zip": ZipArchiveLoader, ".rar": RarArchiveLoader, }