Replaced imports of pytorch_lightning py lightning.pytorch

doc/conf.py

@@ -122,7 +122,7 @@ auto_intersphinx_packages = [
     "psutil",
     "torch",
     "torchvision",
-    "pytorch-lightning",
+    "lightning",
     ("clapper", "latest"),
     ("python", "3"),
 ]

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

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

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

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

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

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

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
 

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

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
 
 

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