Skip to content
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

Fix LRScheduler import for PyTorch 2.0 #15940

Merged
merged 4 commits into from
Dec 7, 2022
+10 −3
Merged

Fix LRScheduler import for PyTorch 2.0 #15940

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbc9b19
Fix LRScheduler import for PyTorch 2.0
lantiga Dec 7, 2022
07e82f4
Merge branch 'master' into lr-scheduler-fix
lantiga Dec 7, 2022
13df8c2
Add comment for posterity
lantiga Dec 7, 2022
dafcdad
Merge branch 'master' into lr-scheduler-fix
lantiga Dec 7, 2022
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
13 changes: 10 additions & 3 deletions src/pytorch_lightning/utilities/types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@
from torchmetrics import Metric
from typing_extensions import Protocol, runtime_checkable

try:
from torch.optim.lr_scheduler import LRScheduler as TorchLRScheduler
except ImportError:
# For torch <= 1.13.x
# TODO: Remove once minimum torch version is 1.14 (or 2.0)
from torch.optim.lr_scheduler import _LRScheduler as TorchLRScheduler

from lightning_lite.utilities.types import _LRScheduler, ProcessGroup, ReduceLROnPlateau

_NUMBER = Union[int, float]
Expand Down Expand Up @@ -111,9 +118,9 @@ def no_sync(self) -> Generator:


# todo: improve LRSchedulerType naming/typing
LRSchedulerTypeTuple = (torch.optim.lr_scheduler._LRScheduler, torch.optim.lr_scheduler.ReduceLROnPlateau)
LRSchedulerTypeUnion = Union[torch.optim.lr_scheduler._LRScheduler, torch.optim.lr_scheduler.ReduceLROnPlateau]
LRSchedulerType = Union[Type[torch.optim.lr_scheduler._LRScheduler], Type[torch.optim.lr_scheduler.ReduceLROnPlateau]]
LRSchedulerTypeTuple = (TorchLRScheduler, torch.optim.lr_scheduler.ReduceLROnPlateau)
LRSchedulerTypeUnion = Union[TorchLRScheduler, torch.optim.lr_scheduler.ReduceLROnPlateau]
LRSchedulerType = Union[Type[TorchLRScheduler], Type[torch.optim.lr_scheduler.ReduceLROnPlateau]]
LRSchedulerPLType = Union[_LRScheduler, ReduceLROnPlateau]


Expand Down