Add lightning-lite dependency

environment.yml

@@ -24,6 +24,7 @@ dependencies:
     - isort[colors]>=5.8
     - kornia>=0.6.5
     - laspy>=2
+    - lightning-lite>=1.8
     - mypy>=0.900
     - nbmake>=0.1
     - nbsphinx>=0.8.5

requirements/min.old

@@ -5,6 +5,7 @@ setuptools==42.0.0
 einops==0.3.0
 fiona==1.8.0
 kornia==0.6.5
+lightning-lite==1.8.0
 matplotlib==3.3.0
 numpy==1.17.2
 omegaconf==2.1.0

requirements/required.old

@@ -5,6 +5,7 @@ setuptools==62.6.0
 einops==0.4.1
 fiona==1.9a2
 kornia==0.6.5
+lightning-lite==1.8.6
 matplotlib==3.5.2
 numpy==1.23.0;python_version>='3.8'
 numpy==1.21.6;python_version=='3.7'

requirements/required.txt

@@ -5,6 +5,7 @@ setuptools==65.6.2
 einops==0.6.0
 fiona==1.9b1
 kornia==0.6.9
+lightning-lite==1.8.6
 matplotlib==3.6.2
 numpy==1.24.1;python_version>='3.8'
 omegaconf==2.3.0

setup.cfg

@@ -31,6 +31,8 @@ install_requires =
     fiona>=1.8,<2
     # kornia 0.6.5+ required due to change in kornia.augmentation API
     kornia>=0.6.5,<0.7
+    # lightning-lite 1.8 is oldest version on PyPI
+    lightning-lite>=1.8,<2
     # matplotlib 3.3+ required for (H, W, 1) image support in plt.imshow
     matplotlib>=3.3,<4
     # numpy 1.17.2+ required by pytorch-lightning

tests/trainers/test_byol.py

@@ -6,13 +6,9 @@
 
 import pytest
 import torch.nn as nn
+from lightning_lite.utilities.exceptions import MisconfigurationException
 from omegaconf import OmegaConf
 from pytorch_lightning import LightningDataModule, Trainer
-
-# TODO: import from lightning_lite instead
-from pytorch_lightning.utilities.exceptions import (  # type: ignore[attr-defined]
-    MisconfigurationException,
-)
 from torchvision.models import resnet18
 
 from torchgeo.datamodules import ChesapeakeCVPRDataModule

tests/trainers/test_classification.py

@@ -7,13 +7,9 @@
 import pytest
 import timm
 from _pytest.monkeypatch import MonkeyPatch
+from lightning_lite.utilities.exceptions import MisconfigurationException
 from omegaconf import OmegaConf
 from pytorch_lightning import LightningDataModule, Trainer
-
-# TODO: import from lightning_lite instead
-from pytorch_lightning.utilities.exceptions import (  # type: ignore[attr-defined]
-    MisconfigurationException,
-)
 from torch.nn.modules import Module
 
 from torchgeo.datamodules import (

tests/trainers/test_detection.py

@@ -6,14 +6,10 @@
 
 import pytest
 from _pytest.monkeypatch import MonkeyPatch
+from lightning_lite.utilities.exceptions import MisconfigurationException
 from omegaconf import OmegaConf
 from pytorch_lightning import LightningDataModule, Trainer
 
-# TODO: import from lightning_lite instead
-from pytorch_lightning.utilities.exceptions import (  # type: ignore[attr-defined]
-    MisconfigurationException,
-)
-
 from torchgeo.datamodules import NASAMarineDebrisDataModule
 from torchgeo.datasets import NASAMarineDebris
 from torchgeo.trainers import ObjectDetectionTask

tests/trainers/test_regression.py

@@ -6,14 +6,10 @@
 
 import pytest
 from _pytest.monkeypatch import MonkeyPatch
+from lightning_lite.utilities.exceptions import MisconfigurationException
 from omegaconf import OmegaConf
 from pytorch_lightning import LightningDataModule, Trainer
 
-# TODO: import from lightning_lite instead
-from pytorch_lightning.utilities.exceptions import (  # type: ignore[attr-defined]
-    MisconfigurationException,
-)
-
 from torchgeo.datamodules import COWCCountingDataModule, TropicalCycloneDataModule
 from torchgeo.datasets import TropicalCyclone
 from torchgeo.trainers import RegressionTask

tests/trainers/test_segmentation.py

@@ -7,13 +7,9 @@
 import pytest
 import segmentation_models_pytorch as smp
 from _pytest.monkeypatch import MonkeyPatch
+from lightning_lite.utilities.exceptions import MisconfigurationException
 from omegaconf import OmegaConf
 from pytorch_lightning import LightningDataModule, Trainer
-
-# TODO: import from lightning_lite instead
-from pytorch_lightning.utilities.exceptions import (  # type: ignore[attr-defined]
-    MisconfigurationException,
-)
 from torch.nn.modules import Module
 
 from torchgeo.datamodules import (

torchgeo/datamodules/geo.py

@@ -8,12 +8,8 @@
 import kornia.augmentation as K
 import matplotlib.pyplot as plt
 import torch
+from lightning_lite.utilities.exceptions import MisconfigurationException
 from pytorch_lightning import LightningDataModule
-
-# TODO: import from lightning_lite instead
-from pytorch_lightning.utilities.exceptions import (  # type: ignore[attr-defined]
-    MisconfigurationException,
-)
 from torch import Tensor
 from torch.utils.data import DataLoader, Dataset