From ee9b9bf56510a332143b6de5a56f8e4f078f3051 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 29 May 2023 22:04:37 +0200 Subject: [PATCH 1/5] bump PL to <2.0 --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1ba8642f..9835e0e7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,8 +3,8 @@ category-encoders >=2.6.0, <2.7.0 numpy >=1.17.2 pandas >=1.1.5 scikit-learn >=1.0.0 -pytorch-lightning >=1.8.0, <1.9.0 -omegaconf >=2.1.0 +pytorch-lightning>=1.8.0, <2.0.0 +omegaconf >=2.0.1 torchmetrics >=0.10.0, <0.12.0 tensorboard >2.2.0, !=2.5.0 protobuf >=3.20.0, <4.23.0 From fffae85d16ea71c49078f8eef345682f6fc90992 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 29 May 2023 22:05:46 +0200 Subject: [PATCH 2/5] seed_everything --- src/pytorch_tabular/tabular_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_tabular/tabular_model.py b/src/pytorch_tabular/tabular_model.py index 1c4a9c92..ad2a73d3 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 pytorch_lightning import seed_everything from omegaconf import OmegaConf from omegaconf.dictconfig import DictConfig from pytorch_lightning.callbacks import RichProgressBar From eeb838a15d347e4a628e2c1232ddb320e5d6d2a7 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 29 May 2023 22:08:44 +0200 Subject: [PATCH 3/5] get_filesystem --- src/pytorch_tabular/utils.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pytorch_tabular/utils.py b/src/pytorch_tabular/utils.py index 7e0103c3..b57bf239 100644 --- a/src/pytorch_tabular/utils.py +++ b/src/pytorch_tabular/utils.py @@ -8,10 +8,14 @@ import pandas as pd import torch import torch.nn as nn -from lightning_lite.utilities.cloud_io import get_filesystem from sklearn.cluster import KMeans from sklearn.preprocessing import LabelEncoder +try: # for 1.8 + from pytorch_lightning.utilities.cloud_io import get_filesystem +except ImportError: # for 1.9 + from pytorch_lightning.core.saving import get_filesystem + import pytorch_tabular as root_module _PATH = Union[str, Path] From 43dd21bfc72a3ef6c7a5c90b16153fa649ac1a75 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 29 May 2023 22:09:46 +0200 Subject: [PATCH 4/5] isort --- src/pytorch_tabular/tabular_model.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pytorch_tabular/tabular_model.py b/src/pytorch_tabular/tabular_model.py index ad2a73d3..f7dcbbd7 100644 --- a/src/pytorch_tabular/tabular_model.py +++ b/src/pytorch_tabular/tabular_model.py @@ -17,9 +17,9 @@ import pytorch_lightning as pl import torch import torchmetrics -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 02ca9a8f7c8bafbc5c587d27a493cbe84b7f81d9 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 29 May 2023 22:20:33 +0200 Subject: [PATCH 5/5] rev omegaconf --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9835e0e7..5c7d3fec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ numpy >=1.17.2 pandas >=1.1.5 scikit-learn >=1.0.0 pytorch-lightning>=1.8.0, <2.0.0 -omegaconf >=2.0.1 +omegaconf >=2.1.0 torchmetrics >=0.10.0, <0.12.0 tensorboard >2.2.0, !=2.5.0 protobuf >=3.20.0, <4.23.0