Merge branch 'bump/pt-2.5' of https://github.com/Lightning-AI/lightning into bump/pt-2.5

Author: Borda

tests/tests_pytorch/callbacks/test_early_stopping.py

@@ -15,15 +15,13 @@
 import math
 import os
 import pickle
-from contextlib import nullcontext
 from typing import List, Optional
 from unittest import mock
 from unittest.mock import Mock
 
 import cloudpickle
 import pytest
 import torch
-from lightning.fabric.utilities.imports import _TORCH_EQUAL_2_4_0
 from lightning.pytorch import Trainer, seed_everything
 from lightning.pytorch.callbacks import EarlyStopping, ModelCheckpoint
 from lightning.pytorch.demos.boring_classes import BoringModel

tests/tests_pytorch/checkpointing/test_model_checkpoint.py

@@ -17,7 +17,6 @@
 import re
 import time
 from argparse import Namespace
-from contextlib import nullcontext
 from datetime import timedelta
 from inspect import signature
 from pathlib import Path
@@ -32,7 +31,6 @@
 import yaml
 from jsonargparse import ArgumentParser
 from lightning.fabric.utilities.cloud_io import _load as pl_load
-from lightning.fabric.utilities.imports import _TORCH_EQUAL_2_4_0
 from lightning.pytorch import Trainer, seed_everything
 from lightning.pytorch.callbacks import ModelCheckpoint
 from lightning.pytorch.demos.boring_classes import BoringModel

tests/tests_pytorch/core/test_metric_result_integration.py

@@ -19,7 +19,6 @@
 import lightning.pytorch as pl
 import pytest
 import torch
-from lightning.fabric.utilities.imports import _TORCH_EQUAL_2_4_0
 from lightning.fabric.utilities.warnings import PossibleUserWarning
 from lightning.pytorch import Trainer
 from lightning.pytorch.callbacks import OnExceptionCheckpoint

tests/tests_pytorch/helpers/test_datasets.py

@@ -12,12 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import pickle
-from contextlib import nullcontext
 
 import cloudpickle
 import pytest
 import torch
-from lightning.fabric.utilities.imports import _TORCH_EQUAL_2_4_0
 
 from tests_pytorch import _PATH_DATASETS
 from tests_pytorch.helpers.datasets import MNIST, AverageDataset, TrialMNIST

tests/tests_pytorch/loggers/test_all.py

@@ -14,13 +14,11 @@
 import inspect
 import os
 import pickle
-from contextlib import nullcontext
 from unittest import mock
 from unittest.mock import ANY, Mock
 
 import pytest
 import torch
-from lightning.fabric.utilities.imports import _TORCH_EQUAL_2_4_0, _TORCH_GREATER_EQUAL_2_4_1
 from lightning.pytorch import Callback, Trainer
 from lightning.pytorch.demos.boring_classes import BoringModel
 from lightning.pytorch.loggers import (

tests/tests_pytorch/loggers/test_logger.py

@@ -13,15 +13,13 @@
 # limitations under the License.
 import pickle
 from argparse import Namespace
-from contextlib import nullcontext
 from copy import deepcopy
 from typing import Any, Dict, Optional
 from unittest.mock import patch
 
 import numpy as np
 import pytest
 import torch
-from lightning.fabric.utilities.imports import _TORCH_EQUAL_2_4_0
 from lightning.fabric.utilities.logger import _convert_params, _sanitize_params
 from lightning.pytorch import Trainer
 from lightning.pytorch.demos.boring_classes import BoringDataModule, BoringModel

tests/tests_pytorch/loggers/test_wandb.py

@@ -13,13 +13,11 @@
 # limitations under the License.
 import os
 import pickle
-from contextlib import nullcontext
 from pathlib import Path
 from unittest import mock
 
 import pytest
 import yaml
-from lightning.fabric.utilities.imports import _TORCH_EQUAL_2_4_0
 from lightning.pytorch import Trainer
 from lightning.pytorch.callbacks import ModelCheckpoint
 from lightning.pytorch.cli import LightningCLI