rename KeyZipper to IterKeyZipper (#4884)

torchvision/prototype/datasets/_builtin/caltech.py

@@ -11,7 +11,7 @@ from torchdata.datapipes.iter import (
     TarArchiveReader,
     Shuffler,
     Filter,
-    KeyZipper,
+    IterKeyZipper,
 )
 from torchvision.prototype.datasets.utils import (
     Dataset,
@@ -124,7 +124,7 @@ class Caltech101(Dataset):
         anns_dp = TarArchiveReader(anns_dp)
         anns_dp = Filter(anns_dp, self._is_ann)
 
-        dp = KeyZipper(
+        dp = IterKeyZipper(
             images_dp,
             anns_dp,
             key_fn=self._images_key_fn,

torchvision/prototype/datasets/_builtin/celeba.py

@@ -10,7 +10,7 @@ from torchdata.datapipes.iter import (
     Filter,
     ZipArchiveReader,
     Zipper,
-    KeyZipper,
+    IterKeyZipper,
 )
 from torchvision.prototype.datasets.utils import (
     Dataset,
@@ -169,7 +169,7 @@ class CelebA(Dataset):
         )
         anns_dp = Mapper(anns_dp, self._collate_anns)
 
-        dp = KeyZipper(
+        dp = IterKeyZipper(
             splits_dp,
             images_dp,
             key_fn=getitem(0),
@@ -177,5 +177,5 @@ class CelebA(Dataset):
             buffer_size=INFINITE_BUFFER_SIZE,
             keep_key=True,
         )
-        dp = KeyZipper(dp, anns_dp, key_fn=getitem(0), buffer_size=INFINITE_BUFFER_SIZE)
+        dp = IterKeyZipper(dp, anns_dp, key_fn=getitem(0), buffer_size=INFINITE_BUFFER_SIZE)
         return Mapper(dp, self._collate_and_decode_sample, fn_kwargs=dict(decoder=decoder))

torchvision/prototype/datasets/_builtin/coco.py

@@ -11,7 +11,7 @@ from torchdata.datapipes.iter import (
     Demultiplexer,
     ZipArchiveReader,
     Grouper,
-    KeyZipper,
+    IterKeyZipper,
     JsonParser,
     UnBatcher,
 )
@@ -137,7 +137,7 @@ class Coco(Dataset):
         # drop images without annotations
         anns_dp = Filter(anns_dp, bool)
         anns_dp = Shuffler(anns_dp, buffer_size=INFINITE_BUFFER_SIZE)
-        anns_dp = KeyZipper(
+        anns_dp = IterKeyZipper(
             anns_dp,
             images_meta_dp,
             key_fn=getitem(0, "image_id"),
@@ -147,7 +147,7 @@ class Coco(Dataset):
 
         images_dp = ZipArchiveReader(images_dp)
 
-        dp = KeyZipper(
+        dp = IterKeyZipper(
             anns_dp,
             images_dp,
             key_fn=getitem(1, "file_name"),

torchvision/prototype/datasets/_builtin/imagenet.py

@@ -4,7 +4,7 @@ import re
 from typing import Any, Callable, Dict, List, Optional, Tuple, cast
 
 import torch
-from torchdata.datapipes.iter import IterDataPipe, LineReader, KeyZipper, Mapper, TarArchiveReader, Filter, Shuffler
+from torchdata.datapipes.iter import IterDataPipe, LineReader, IterKeyZipper, Mapper, TarArchiveReader, Filter, Shuffler
 from torchvision.prototype.datasets.utils import (
     Dataset,
     DatasetConfig,
@@ -144,7 +144,7 @@ class ImageNet(Dataset):
             devkit_dp = Enumerator(devkit_dp, 1)
             devkit_dp = Shuffler(devkit_dp, buffer_size=INFINITE_BUFFER_SIZE)
 
-            dp = KeyZipper(
+            dp = IterKeyZipper(
                 devkit_dp,
                 images_dp,
                 key_fn=getitem(0),

torchvision/prototype/datasets/_builtin/sbd.py

@@ -12,7 +12,7 @@ from torchdata.datapipes.iter import (
     Shuffler,
     Demultiplexer,
     Filter,
-    KeyZipper,
+    IterKeyZipper,
     LineReader,
 )
 from torchvision.prototype.datasets.utils import (
@@ -144,7 +144,7 @@ class SBD(Dataset):
 
         dp = split_dp
         for level, data_dp in enumerate((images_dp, anns_dp)):
-            dp = KeyZipper(
+            dp = IterKeyZipper(
                 dp,
                 data_dp,
                 key_fn=getitem(*[0] * level, 1),

torchvision/prototype/datasets/_builtin/voc.py

@@ -12,7 +12,7 @@ from torchdata.datapipes.iter import (
     Shuffler,
     Filter,
     Demultiplexer,
-    KeyZipper,
+    IterKeyZipper,
     LineReader,
 )
 from torchvision.datasets import VOCDetection
@@ -135,7 +135,7 @@ class VOC(Dataset):
 
         dp = split_dp
         for level, data_dp in enumerate((images_dp, anns_dp)):
-            dp = KeyZipper(
+            dp = IterKeyZipper(
                 dp,
                 data_dp,
                 key_fn=getitem(*[0] * level, 1),