From 9b694df351937402e5ff9ce0f37ee2cf5ce2188a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20W=C3=A4lchli?= Date: Thu, 27 Oct 2022 15:39:19 +0200 Subject: [PATCH] Fix import for OrderedDict in Python 3.7.0 (#15359) * weird --- src/pytorch_lightning/loops/batch/training_batch_loop.py | 3 ++- src/pytorch_lightning/loops/optimization/optimizer_loop.py | 3 ++- src/pytorch_lightning/strategies/colossalai.py | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/pytorch_lightning/loops/batch/training_batch_loop.py b/src/pytorch_lightning/loops/batch/training_batch_loop.py index 932a7daf12..f61e29cc01 100644 --- a/src/pytorch_lightning/loops/batch/training_batch_loop.py +++ b/src/pytorch_lightning/loops/batch/training_batch_loop.py @@ -11,9 +11,10 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import Any, List, Optional, OrderedDict, Tuple, Union +from typing import Any, List, Optional, Tuple, Union from torch import Tensor +from typing_extensions import OrderedDict from pytorch_lightning.loops.loop import Loop from pytorch_lightning.loops.optimization.manual_loop import _OUTPUTS_TYPE as _MANUAL_LOOP_OUTPUTS_TYPE diff --git a/src/pytorch_lightning/loops/optimization/optimizer_loop.py b/src/pytorch_lightning/loops/optimization/optimizer_loop.py index c5d6af3128..33106bda95 100644 --- a/src/pytorch_lightning/loops/optimization/optimizer_loop.py +++ b/src/pytorch_lightning/loops/optimization/optimizer_loop.py @@ -13,12 +13,13 @@ # limitations under the License. from dataclasses import dataclass, field from functools import partial -from typing import Any, Callable, Dict, List, Optional, OrderedDict, Tuple, Union +from typing import Any, Callable, Dict, List, Optional, Tuple, Union import torch from lightning_utilities.core.rank_zero import WarningCache from torch import Tensor from torch.optim import Optimizer +from typing_extensions import OrderedDict from pytorch_lightning.accelerators import TPUAccelerator from pytorch_lightning.core.optimizer import LightningOptimizer diff --git a/src/pytorch_lightning/strategies/colossalai.py b/src/pytorch_lightning/strategies/colossalai.py index c32c042b56..a8308e9acf 100644 --- a/src/pytorch_lightning/strategies/colossalai.py +++ b/src/pytorch_lightning/strategies/colossalai.py @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -from typing import Any, Callable, Dict, List, Mapping, Optional, OrderedDict, TYPE_CHECKING, Union +from typing import Any, Callable, Dict, List, Mapping, Optional, TYPE_CHECKING, Union import torch from lightning_utilities.core.imports import RequirementCache @@ -19,6 +19,7 @@ from lightning_utilities.core.rank_zero import rank_zero_warn from torch import Tensor from torch.nn import Module from torch.optim.optimizer import Optimizer +from typing_extensions import OrderedDict import pytorch_lightning as pl from lightning_lite.accelerators.cuda import _patch_cuda_is_available