[Typing] 增加 _Place 修复继承类型关系 (#66676)

megemini · web-flow · commit 6a217095a49e · 2024-07-29T02:07:37.000+08:00
diff --git a/python/paddle/_typing/device_like.py b/python/paddle/_typing/device_like.py
@@ -27,12 +27,16 @@
         XPUPlace,
     )
 
-PlaceLike: TypeAlias = Union[
+_Place: TypeAlias = Union[
     "CPUPlace",
     "CUDAPlace",
     "CUDAPinnedPlace",
     "IPUPlace",
     "CustomPlace",
     "XPUPlace",
+]
+
+PlaceLike: TypeAlias = Union[
+    _Place,
     str,  # some string like "cpu", "gpu:0", etc.
 ]
diff --git a/python/paddle/io/dataloader/dataloader_iter.py b/python/paddle/io/dataloader/dataloader_iter.py
@@ -135,6 +135,9 @@ def _index_sampler(self):
     def __iter__(self):
         return self
 
+    def __next__(self):
+        raise NotImplementedError('Should implement `__next__` for a iterator')
+
     def __len__(self):
         return len(self._batch_sampler)
 
diff --git a/python/paddle/io/reader.py b/python/paddle/io/reader.py
@@ -54,10 +54,10 @@
 
     from paddle import Tensor
     from paddle._typing import PlaceLike
+    from paddle._typing.device_like import _Place
+    from paddle.io.dataloader.dataloader_iter import _DataLoaderIterBase
     from paddle.io.dataloader.dataset import Dataset
 
-    from .dataloader.dataloader_iter import _DataLoaderIterBase
-
     _K = TypeVar('_K')
     _V = TypeVar('_V')
 
@@ -440,7 +440,7 @@ class DataLoader:
     worker_init_fn: Callable[[int], None] | None
     dataset: Dataset
     feed_list: Sequence[Tensor] | None
-    places: Sequence[PlaceLike] | None
+    places: list[_Place]
     num_workers: int
     dataset_kind: _DatasetKind
     use_shared_memory: bool
