Skip to content

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

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.

Sign up for GitHub

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 2 commits into from
Jul 28, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a16c39
[Fix] typing place
megemini Jul 28, 2024
6ac608f
[Fix] iterator with __next__
megemini Jul 28, 2024
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
6 changes: 5 additions & 1 deletion python/paddle/_typing/device_like.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
]
3 changes: 3 additions & 0 deletions python/paddle/io/dataloader/dataloader_iter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
8 changes: 4 additions & 4 deletions python/paddle/io/reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down Expand Up @@ -440,7 +440,7 @@ class DataLoader:
worker_init_fn: Callable[[int], 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
Expand All @@ -449,7 +449,7 @@ def __init__(
self,
dataset: Dataset,
feed_list: Sequence[Tensor] | None = None,
places: Sequence[PlaceLike] | None = None,
places: PlaceLike | Sequence[PlaceLike] | None = None,
return_list: bool = True,
batch_sampler: BatchSampler | None = None,
batch_size: int = 1,
Expand Down