diff --git a/CHANGELOG.md b/CHANGELOG.md index a44a1c0291..a8b7197cb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ - Fix issue with remote runs re-open (mihran113) - Deprecate custom set Run.hash values (alberttorosyan) - Tune mlflow converter run properties (tmynn) +- Fix `AimLogger` deprecation issues related to release of PyTorch Lightning v1.7 (djwessel) ## 3.13.0 Aug 21, 2022 diff --git a/aim/sdk/adapters/pytorch_lightning.py b/aim/sdk/adapters/pytorch_lightning.py index f17e17dc2d..1b31f81473 100644 --- a/aim/sdk/adapters/pytorch_lightning.py +++ b/aim/sdk/adapters/pytorch_lightning.py @@ -3,10 +3,22 @@ from argparse import Namespace try: - from pytorch_lightning.loggers.base import ( - LightningLoggerBase, - rank_zero_experiment, - ) + import pytorch_lightning as pl + + def versiontuple(v): + return tuple(map(int, (v.split(".")))) + + if versiontuple(pl.__version__) < (1, 7): + from pytorch_lightning.loggers.base import ( + LightningLoggerBase as Logger, + rank_zero_experiment, + ) + else: + from pytorch_lightning.loggers.logger import ( + Logger, + rank_zero_experiment, + ) + from pytorch_lightning.utilities import rank_zero_only except ImportError: raise RuntimeError( @@ -20,7 +32,7 @@ from aim.ext.resource.configs import DEFAULT_SYSTEM_TRACKING_INT -class AimLogger(LightningLoggerBase): +class AimLogger(Logger): def __init__(self, repo: Optional[str] = None, experiment: Optional[str] = None,