From b44c834c1c85a30d4139939d10a34eea2cd95d82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 1 Apr 2023 11:58:24 +0000 Subject: [PATCH 1/8] Update pytorch-lightning requirement from ==1.8.* to ==2.0.* Updates the requirements on [pytorch-lightning](https://github.com/Lightning-AI/lightning) to permit the latest version. - [Release notes](https://github.com/Lightning-AI/lightning/releases) - [Commits](https://github.com/Lightning-AI/lightning/compare/1.8.0rc0...2.0.1) --- updated-dependencies: - dependency-name: pytorch-lightning dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 35eb7cbb..fb40bcb2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ category-encoders==2.6.* numpy>=1.17.2 pandas>=1.1.5 scikit-learn>=1.0.0 -pytorch-lightning==1.8.* +pytorch-lightning==2.0.* omegaconf>=2.0.1 torchmetrics==0.11.* tensorboard>=2.2.0, !=2.5.0 From f2dc81a72402a7b0b42dd47b55d1719ecdb9902c Mon Sep 17 00:00:00 2001 From: Manu Joseph Date: Sat, 6 May 2023 06:42:33 +0530 Subject: [PATCH 2/8] Update requirements.txt Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index fb40bcb2..e7583eb3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ category-encoders==2.6.* numpy>=1.17.2 pandas>=1.1.5 scikit-learn>=1.0.0 -pytorch-lightning==2.0.* +pytorch-lightning>=1.8.0, <2.0.0 omegaconf>=2.0.1 torchmetrics==0.11.* tensorboard>=2.2.0, !=2.5.0 From 495da01a6e298d6d1f3c93e1ca316be90107f49e Mon Sep 17 00:00:00 2001 From: Manu Joseph Date: Wed, 10 May 2023 04:37:34 +0000 Subject: [PATCH 3/8] replaced lightning_lite with lightning_fabric --- src/pytorch_tabular/tabular_model.py | 2 +- src/pytorch_tabular/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pytorch_tabular/tabular_model.py b/src/pytorch_tabular/tabular_model.py index 39c05754..72010203 100644 --- a/src/pytorch_tabular/tabular_model.py +++ b/src/pytorch_tabular/tabular_model.py @@ -17,7 +17,7 @@ import pytorch_lightning as pl import torch import torchmetrics -from lightning_lite.utilities.seed import seed_everything +from lightning_fabric.utilities.seed import seed_everything from omegaconf import OmegaConf from omegaconf.dictconfig import DictConfig from pytorch_lightning.callbacks import RichProgressBar diff --git a/src/pytorch_tabular/utils.py b/src/pytorch_tabular/utils.py index 04fc8b72..9f14fcaa 100644 --- a/src/pytorch_tabular/utils.py +++ b/src/pytorch_tabular/utils.py @@ -8,7 +8,7 @@ import pandas as pd import torch import torch.nn as nn -from lightning_lite.utilities.cloud_io import get_filesystem +from lightning_fabric.utilities.cloud_io import get_filesystem from sklearn.cluster import KMeans from sklearn.preprocessing import LabelEncoder From 8bf4bcc5806894300302fcce6ce8bc5230118408 Mon Sep 17 00:00:00 2001 From: Manu Joseph Date: Wed, 10 May 2023 18:26:21 +0530 Subject: [PATCH 4/8] Update src/pytorch_tabular/tabular_model.py Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- src/pytorch_tabular/tabular_model.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pytorch_tabular/tabular_model.py b/src/pytorch_tabular/tabular_model.py index 02688793..be246e5c 100644 --- a/src/pytorch_tabular/tabular_model.py +++ b/src/pytorch_tabular/tabular_model.py @@ -17,7 +17,11 @@ import pytorch_lightning as pl import torch import torchmetrics -from lightning_fabric.utilities.seed import seed_everything +from pytorch_lightning.utilities.imports import package_available +if package_available("lightning_fabric"): + from lightning_fabric.utilities.seed import seed_everything +elif package_available("lightning_fabric"): + from lightning_lite.utilities.seed import seed_everything from omegaconf import OmegaConf from omegaconf.dictconfig import DictConfig from pytorch_lightning.callbacks import RichProgressBar From 007244053f1327dc23a59b22e9fd05aad5d24a28 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 12:56:30 +0000 Subject: [PATCH 5/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/pytorch_tabular/tabular_model.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pytorch_tabular/tabular_model.py b/src/pytorch_tabular/tabular_model.py index be246e5c..d3c1b77b 100644 --- a/src/pytorch_tabular/tabular_model.py +++ b/src/pytorch_tabular/tabular_model.py @@ -18,10 +18,12 @@ import torch import torchmetrics from pytorch_lightning.utilities.imports import package_available + if package_available("lightning_fabric"): from lightning_fabric.utilities.seed import seed_everything elif package_available("lightning_fabric"): from lightning_lite.utilities.seed import seed_everything + from omegaconf import OmegaConf from omegaconf.dictconfig import DictConfig from pytorch_lightning.callbacks import RichProgressBar From bd103c5b053922fe75cb75122eb1ebbffaaee6ac Mon Sep 17 00:00:00 2001 From: Manu Joseph Date: Wed, 10 May 2023 19:41:24 +0530 Subject: [PATCH 6/8] Update src/pytorch_tabular/tabular_model.py Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- src/pytorch_tabular/tabular_model.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pytorch_tabular/tabular_model.py b/src/pytorch_tabular/tabular_model.py index 7893ab46..f2fa2218 100644 --- a/src/pytorch_tabular/tabular_model.py +++ b/src/pytorch_tabular/tabular_model.py @@ -19,10 +19,7 @@ import torchmetrics from pytorch_lightning.utilities.imports import package_available -if package_available("lightning_fabric"): - from lightning_fabric.utilities.seed import seed_everything -elif package_available("lightning_fabric"): - from lightning_lite.utilities.seed import seed_everything +from pytorch_lightning import seed_everything from omegaconf import OmegaConf from omegaconf.dictconfig import DictConfig From d6a9fb83e29afc1d0ef637e49a870f4f59b971f1 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Wed, 10 May 2023 14:11:33 +0000 Subject: [PATCH 7/8] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/pytorch_tabular/tabular_model.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/pytorch_tabular/tabular_model.py b/src/pytorch_tabular/tabular_model.py index f2fa2218..7b3ec96a 100644 --- a/src/pytorch_tabular/tabular_model.py +++ b/src/pytorch_tabular/tabular_model.py @@ -17,12 +17,9 @@ import pytorch_lightning as pl import torch import torchmetrics -from pytorch_lightning.utilities.imports import package_available - -from pytorch_lightning import seed_everything - from omegaconf import OmegaConf from omegaconf.dictconfig import DictConfig +from pytorch_lightning import seed_everything from pytorch_lightning.callbacks import RichProgressBar from pytorch_lightning.callbacks.gradient_accumulation_scheduler import GradientAccumulationScheduler from pytorch_lightning.utilities.model_summary import summarize From 7c5063683607aff3e8489a4a65c40286b3a31c2e Mon Sep 17 00:00:00 2001 From: Manu Joseph Date: Thu, 11 May 2023 01:55:59 +0100 Subject: [PATCH 8/8] Update src/pytorch_tabular/utils.py Co-authored-by: Jirka Borovec <6035284+Borda@users.noreply.github.com> --- src/pytorch_tabular/utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_tabular/utils.py b/src/pytorch_tabular/utils.py index 544b2607..d341ab19 100644 --- a/src/pytorch_tabular/utils.py +++ b/src/pytorch_tabular/utils.py @@ -8,7 +8,7 @@ import pandas as pd import torch import torch.nn as nn -from lightning_fabric.utilities.cloud_io import get_filesystem +from pytorch_lightning.core.saving import get_filesystem from sklearn.cluster import KMeans from sklearn.preprocessing import LabelEncoder