diff --git a/doc/conf.py b/doc/conf.py index 38c97b2731524b654716184db1ba0e7fef8c2b9c..49b7ceacf910e8ea1e1d2c5c602654a678b64908 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -122,7 +122,7 @@ auto_intersphinx_packages = [ "psutil", "torch", "torchvision", - "pytorch-lightning", + "lightning", ("clapper", "latest"), ("python", "3"), ] diff --git a/src/ptbench/engine/callbacks.py b/src/ptbench/engine/callbacks.py index b1d86c8f41bedb77389da4343756e99cf96b6d3b..d6e35e84c14f59d400bd52d83b3d7b03cf9fb645 100644 --- a/src/ptbench/engine/callbacks.py +++ b/src/ptbench/engine/callbacks.py @@ -3,8 +3,8 @@ import time import numpy -from pytorch_lightning import Callback -from pytorch_lightning.callbacks import BasePredictionWriter +from lightning.pytorch import Callback +from lightning.pytorch.callbacks import BasePredictionWriter # This ensures CSVLogger logs training and evaluation metrics on the same line diff --git a/src/ptbench/engine/predictor.py b/src/ptbench/engine/predictor.py index 8afc8b8532eb7920bebfa554f05ba8e6bf8faf23..33dc18bea49097bfd3935b6b08141149a39ec392 100644 --- a/src/ptbench/engine/predictor.py +++ b/src/ptbench/engine/predictor.py @@ -5,7 +5,7 @@ import logging import os -from pytorch_lightning import Trainer +from lightning.pytorch import Trainer from ..utils.accelerator import AcceleratorProcessor from .callbacks import PredictionsWriter diff --git a/src/ptbench/engine/trainer.py b/src/ptbench/engine/trainer.py index b8532e85a0e488a703225a70ddbeab0db42d689a..76aaaf7626fe729174c0bf9980141da393c87fa7 100644 --- a/src/ptbench/engine/trainer.py +++ b/src/ptbench/engine/trainer.py @@ -7,10 +7,10 @@ import logging import os import shutil -from pytorch_lightning import Trainer -from pytorch_lightning.callbacks import ModelCheckpoint -from pytorch_lightning.loggers import CSVLogger, TensorBoardLogger -from pytorch_lightning.utilities.model_summary import ModelSummary +from lightning.pytorch import Trainer +from lightning.pytorch.callbacks import ModelCheckpoint +from lightning.pytorch.loggers import CSVLogger, TensorBoardLogger +from lightning.pytorch.utilities.model_summary import ModelSummary from ..utils.accelerator import AcceleratorProcessor from ..utils.resources import ResourceMonitor, cpu_constants, gpu_constants diff --git a/src/ptbench/models/alexnet.py b/src/ptbench/models/alexnet.py index 74c07b71ab33627438367cfa008016f4d02976dc..073013cd5a24ec370e8d594d0c4a7af050fef0b1 100644 --- a/src/ptbench/models/alexnet.py +++ b/src/ptbench/models/alexnet.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -import pytorch_lightning as pl +import lightning.pytorch as pl import torch import torch.nn as nn import torchvision.models as models @@ -10,7 +10,7 @@ import torchvision.models as models from .normalizer import TorchVisionNormalizer -class Alexnet(pl.LightningModule): +class Alexnet(pl.core.LightningModule): """Alexnet module. Note: only usable with a normalized dataset diff --git a/src/ptbench/models/densenet.py b/src/ptbench/models/densenet.py index 31abf44d7d8ad27dbc29d6161fa3b29a7de9aa22..27c3393df25e8695f647bada0418e72d1c7f821f 100644 --- a/src/ptbench/models/densenet.py +++ b/src/ptbench/models/densenet.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -import pytorch_lightning as pl +import lightning.pytorch as pl import torch import torch.nn as nn import torchvision.models as models diff --git a/src/ptbench/models/densenet_rs.py b/src/ptbench/models/densenet_rs.py index 557d34a9f5d48914078647e9304c213a16589031..16f4eefb2891e7a1185b3141d0f6369c0169642b 100644 --- a/src/ptbench/models/densenet_rs.py +++ b/src/ptbench/models/densenet_rs.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -import pytorch_lightning as pl +import lightning.pytorch as pl import torch import torch.nn as nn import torchvision.models as models diff --git a/src/ptbench/models/logistic_regression.py b/src/ptbench/models/logistic_regression.py index d53f8df044de14205d16227da5fa1347a23fd391..c6df54bcd8501de8dccb9d4cd475a0e4fa60d84f 100644 --- a/src/ptbench/models/logistic_regression.py +++ b/src/ptbench/models/logistic_regression.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -import pytorch_lightning as pl +import lightning.pytorch as pl import torch import torch.nn as nn diff --git a/src/ptbench/models/pasa.py b/src/ptbench/models/pasa.py index 76aab5a4270df455268bd6c7fc4edba4e88e42b5..3d4a7641bd82c6bdf461b90bdfe735ef7a8b3332 100644 --- a/src/ptbench/models/pasa.py +++ b/src/ptbench/models/pasa.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -import pytorch_lightning as pl +import lightning.pytorch as pl import torch import torch.nn as nn import torch.nn.functional as F diff --git a/src/ptbench/models/signs_to_tb.py b/src/ptbench/models/signs_to_tb.py index f88707e95452e6e83a32cb08d39b094d486f5528..4733772780951dc7999946895ae24c5ee89a10c7 100644 --- a/src/ptbench/models/signs_to_tb.py +++ b/src/ptbench/models/signs_to_tb.py @@ -2,7 +2,7 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -import pytorch_lightning as pl +import lightning.pytorch as pl import torch diff --git a/src/ptbench/scripts/train.py b/src/ptbench/scripts/train.py index 6d117c5fea978c54fd659dac8de36a2fb0841233..507052997760a8b8d114aa6613ace087e37efe7c 100644 --- a/src/ptbench/scripts/train.py +++ b/src/ptbench/scripts/train.py @@ -6,7 +6,7 @@ import click from clapper.click import ConfigCommand, ResourceOption, verbosity_option from clapper.logging import setup -from pytorch_lightning import seed_everything +from lightning.pytorch import seed_everything from ..utils.checkpointer import get_checkpoint