use torchdata as single source of truth for datapipes (#4643)

torchvision/prototype/datasets/_builtin/caltech.py

@@ -5,14 +5,14 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 import numpy as np
 import torch
-from torch.utils.data import IterDataPipe
-from torch.utils.data.datapipes.iter import (
+from torchdata.datapipes.iter import (
+    IterDataPipe,
     Mapper,
     TarArchiveReader,
     Shuffler,
     Filter,
+    KeyZipper,
 )
-from torchdata.datapipes.iter import KeyZipper
 from torchvision.prototype.datasets.utils import (
     Dataset,
     DatasetConfig,

torchvision/prototype/datasets/_builtin/celeba.py

@@ -3,15 +3,15 @@ import io
 from typing import Any, Callable, Dict, List, Optional, Tuple, Mapping, Union
 
 import torch
-from torch.utils.data import IterDataPipe
-from torch.utils.data.datapipes.iter import (
+from torchdata.datapipes.iter import (
+    IterDataPipe,
     Mapper,
     Shuffler,
     Filter,
     ZipArchiveReader,
     Zipper,
+    KeyZipper,
 )
-from torchdata.datapipes.iter import KeyZipper
 from torchvision.prototype.datasets.utils import (
     Dataset,
     DatasetConfig,

torchvision/prototype/datasets/_builtin/cifar.py

@@ -7,8 +7,8 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union, Iterator
 
 import numpy as np
 import torch
-from torch.utils.data import IterDataPipe
-from torch.utils.data.datapipes.iter import (
+from torchdata.datapipes.iter import (
+    IterDataPipe,
     Filter,
     Mapper,
     TarArchiveReader,

torchvision/prototype/datasets/_builtin/mnist.py

@@ -9,8 +9,8 @@ from typing import Any, Callable, Dict, Iterator, List, Optional, Tuple, cast, U
 
 import numpy as np
 import torch
-from torch.utils.data import IterDataPipe
-from torch.utils.data.datapipes.iter import (
+from torchdata.datapipes.iter import (
+    IterDataPipe,
     Demultiplexer,
     Mapper,
     ZipArchiveReader,

torchvision/prototype/datasets/_builtin/sbd.py

@@ -5,9 +5,16 @@ from typing import Any, Callable, Dict, List, Optional, Tuple, Union
 
 import numpy as np
 import torch
-from torch.utils.data import IterDataPipe
-from torch.utils.data.datapipes.iter import Mapper, TarArchiveReader, Shuffler, Demultiplexer, Filter
-from torchdata.datapipes.iter import KeyZipper, LineReader
+from torchdata.datapipes.iter import (
+    IterDataPipe,
+    Mapper,
+    TarArchiveReader,
+    Shuffler,
+    Demultiplexer,
+    Filter,
+    KeyZipper,
+    LineReader,
+)
 from torchvision.prototype.datasets.utils import (
     Dataset,
     DatasetConfig,

torchvision/prototype/datasets/_builtin/voc.py

@@ -5,15 +5,16 @@ from typing import Any, Callable, Dict, List, Optional, Tuple
 from xml.etree import ElementTree
 
 import torch
-from torch.utils.data import IterDataPipe
-from torch.utils.data.datapipes.iter import (
+from torchdata.datapipes.iter import (
+    IterDataPipe,
     Mapper,
     TarArchiveReader,
     Shuffler,
     Filter,
     Demultiplexer,
+    KeyZipper,
+    LineReader,
 )
-from torchdata.datapipes.iter import KeyZipper, LineReader
 from torchvision.datasets import VOCDetection
 from torchvision.prototype.datasets.utils import (
     Dataset,