From 01b5fedf06d6279db48deaf3d9dd9fb0c2f8b7a6 Mon Sep 17 00:00:00 2001 From: Deepali Chourasia Date: Fri, 17 Mar 2023 06:48:03 +0000 Subject: [PATCH 1/4] remove reference to torch._six --- pl_bolts/datamodules/async_dataloader.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pl_bolts/datamodules/async_dataloader.py b/pl_bolts/datamodules/async_dataloader.py index 93ddc84add..0767ad4a1a 100644 --- a/pl_bolts/datamodules/async_dataloader.py +++ b/pl_bolts/datamodules/async_dataloader.py @@ -6,7 +6,6 @@ import torch from torch import Tensor -from torch._six import string_classes from torch.utils.data import DataLoader, Dataset from pl_bolts.utils.stability import under_review @@ -85,7 +84,7 @@ def load_instance(self, sample: Any) -> Any: return {key: self.load_instance(sample[key]) for key in sample} elif isinstance(sample, tuple) and hasattr(sample, "_fields"): # namedtuple return elem_type(*(self.load_instance(d) for d in sample)) - elif isinstance(sample, container_abcs.Sequence) and not isinstance(sample, string_classes): + elif isinstance(sample, container_abcs.Sequence) and not isinstance(sample, str): return [self.load_instance(s) for s in sample] else: return sample From 27b94d8481f0f3918b168dd91fb69ae44e34f3bf Mon Sep 17 00:00:00 2001 From: Jirka Date: Tue, 28 Mar 2023 19:56:42 +0200 Subject: [PATCH 2/4] req. --- requirements/loggers.txt | 4 ++-- requirements/models.txt | 12 ++++++------ requirements/test.txt | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/requirements/loggers.txt b/requirements/loggers.txt index faa232f2f6..6952d04ccb 100644 --- a/requirements/loggers.txt +++ b/requirements/loggers.txt @@ -1,5 +1,5 @@ -# test_tube>=0.7.5 -# trains>=0.14.1 +# test_tube >=0.7.5 +# trains >=0.14.1 matplotlib wandb scipy diff --git a/requirements/models.txt b/requirements/models.txt index 08efffa006..737212f4d3 100644 --- a/requirements/models.txt +++ b/requirements/models.txt @@ -1,8 +1,8 @@ -torchvision>=0.10 -scikit-learn>=1.0.2 +torchvision >=0.10 +scikit-learn >=1.0.2 Pillow opencv-python-headless -gym[atari]>=0.17.2, <0.20.0 -atari_py>=0.2, <0.3 -box2d-py>=2.3, <2.4 -opencv-python>=4.5.5.62 +gym[atari] >=0.17.2, <0.20.0 +atari_py >=0.2.0, <0.3 +box2d-py >=2.3, <2.4 +opencv-python >=4.5.5.62 diff --git a/requirements/test.txt b/requirements/test.txt index 8632fbc74f..91728ca135 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,13 +1,13 @@ # coverage>=5.0 -codecov>=2.1, <=2.1.12 -pytest>=6.0, <=7.2.0 -pytest-cov>2.10, <=4.0.0 +codecov >=2.1, <=2.1.12 +pytest >=6.0, <=7.2.0 +pytest-cov >2.10, <=4.0.0 # pytest-flake8 check-manifest -pre-commit>=1.0 -mypy==0.982 -atari-py==0.2.9 # needed for RL -scikit-learn>=1.0.2, <=1.1.3 -sparseml>=1.0.0, <=1.2.0 -ale-py>=0.7, <=0.8.0 +pre-commit >=1.0 +mypy ==0.982 +atari-py ==0.2.9 # needed for RL +scikit-learn >=1.0.2, <=1.1.3 +sparseml >=1.0.0, <=1.2.0 +ale-py >=0.7, <=0.8.0 jsonargparse[signatures] # for LightningCLI From 1e500219f8e28d85080ed78ebe2c8be669783f3d Mon Sep 17 00:00:00 2001 From: Jirka Date: Tue, 28 Mar 2023 19:56:42 +0200 Subject: [PATCH 3/4] freeze req. --- requirements.txt | 8 ++++---- requirements/loggers.txt | 4 ++-- requirements/models.txt | 12 ++++++------ requirements/test.txt | 18 +++++++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0a8cdb7dfe..e830784fbf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -numpy<1.24.0 # todo: seeing some compatibility issues -pytorch-lightning>=1.7.0 -lightning-utilities>=0.3.0, !=0.4.0 # this is needed for PL 1.7 -torchvision>=0.10.0 # todo: move to topic related extras +numpy <1.24.0 # todo: seeing some compatibility issues +pytorch-lightning >=1.7.0, <1.9.0 +lightning-utilities >=0.3.0, !=0.4.0 # this is needed for PL 1.7 +torchvision >=0.10.0 # todo: move to topic related extras diff --git a/requirements/loggers.txt b/requirements/loggers.txt index faa232f2f6..6952d04ccb 100644 --- a/requirements/loggers.txt +++ b/requirements/loggers.txt @@ -1,5 +1,5 @@ -# test_tube>=0.7.5 -# trains>=0.14.1 +# test_tube >=0.7.5 +# trains >=0.14.1 matplotlib wandb scipy diff --git a/requirements/models.txt b/requirements/models.txt index 08efffa006..737212f4d3 100644 --- a/requirements/models.txt +++ b/requirements/models.txt @@ -1,8 +1,8 @@ -torchvision>=0.10 -scikit-learn>=1.0.2 +torchvision >=0.10 +scikit-learn >=1.0.2 Pillow opencv-python-headless -gym[atari]>=0.17.2, <0.20.0 -atari_py>=0.2, <0.3 -box2d-py>=2.3, <2.4 -opencv-python>=4.5.5.62 +gym[atari] >=0.17.2, <0.20.0 +atari_py >=0.2.0, <0.3 +box2d-py >=2.3, <2.4 +opencv-python >=4.5.5.62 diff --git a/requirements/test.txt b/requirements/test.txt index 8632fbc74f..91728ca135 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,13 +1,13 @@ # coverage>=5.0 -codecov>=2.1, <=2.1.12 -pytest>=6.0, <=7.2.0 -pytest-cov>2.10, <=4.0.0 +codecov >=2.1, <=2.1.12 +pytest >=6.0, <=7.2.0 +pytest-cov >2.10, <=4.0.0 # pytest-flake8 check-manifest -pre-commit>=1.0 -mypy==0.982 -atari-py==0.2.9 # needed for RL -scikit-learn>=1.0.2, <=1.1.3 -sparseml>=1.0.0, <=1.2.0 -ale-py>=0.7, <=0.8.0 +pre-commit >=1.0 +mypy ==0.982 +atari-py ==0.2.9 # needed for RL +scikit-learn >=1.0.2, <=1.1.3 +sparseml >=1.0.0, <=1.2.0 +ale-py >=0.7, <=0.8.0 jsonargparse[signatures] # for LightningCLI From e80f685c0174c703f54d9ae07c47a95a7f3b3b88 Mon Sep 17 00:00:00 2001 From: Jirka Date: Tue, 28 Mar 2023 19:56:42 +0200 Subject: [PATCH 4/4] freeze req. --- requirements.txt | 8 ++++---- requirements/loggers.txt | 4 ++-- requirements/models.txt | 12 ++++++------ requirements/test.txt | 18 +++++++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0a8cdb7dfe..e830784fbf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -numpy<1.24.0 # todo: seeing some compatibility issues -pytorch-lightning>=1.7.0 -lightning-utilities>=0.3.0, !=0.4.0 # this is needed for PL 1.7 -torchvision>=0.10.0 # todo: move to topic related extras +numpy <1.24.0 # todo: seeing some compatibility issues +pytorch-lightning >=1.7.0, <1.9.0 +lightning-utilities >=0.3.0, !=0.4.0 # this is needed for PL 1.7 +torchvision >=0.10.0 # todo: move to topic related extras diff --git a/requirements/loggers.txt b/requirements/loggers.txt index faa232f2f6..6952d04ccb 100644 --- a/requirements/loggers.txt +++ b/requirements/loggers.txt @@ -1,5 +1,5 @@ -# test_tube>=0.7.5 -# trains>=0.14.1 +# test_tube >=0.7.5 +# trains >=0.14.1 matplotlib wandb scipy diff --git a/requirements/models.txt b/requirements/models.txt index 08efffa006..e808be4de6 100644 --- a/requirements/models.txt +++ b/requirements/models.txt @@ -1,8 +1,8 @@ -torchvision>=0.10 -scikit-learn>=1.0.2 +torchvision >=0.10 +scikit-learn >=1.0.2 Pillow opencv-python-headless -gym[atari]>=0.17.2, <0.20.0 -atari_py>=0.2, <0.3 -box2d-py>=2.3, <2.4 -opencv-python>=4.5.5.62 +gym[atari] >=0.17.2, <0.20.0 +atari_py >0.2, <0.3 +box2d-py >=2.3, <2.4 +opencv-python >=4.5.5.62 diff --git a/requirements/test.txt b/requirements/test.txt index 8632fbc74f..91728ca135 100644 --- a/requirements/test.txt +++ b/requirements/test.txt @@ -1,13 +1,13 @@ # coverage>=5.0 -codecov>=2.1, <=2.1.12 -pytest>=6.0, <=7.2.0 -pytest-cov>2.10, <=4.0.0 +codecov >=2.1, <=2.1.12 +pytest >=6.0, <=7.2.0 +pytest-cov >2.10, <=4.0.0 # pytest-flake8 check-manifest -pre-commit>=1.0 -mypy==0.982 -atari-py==0.2.9 # needed for RL -scikit-learn>=1.0.2, <=1.1.3 -sparseml>=1.0.0, <=1.2.0 -ale-py>=0.7, <=0.8.0 +pre-commit >=1.0 +mypy ==0.982 +atari-py ==0.2.9 # needed for RL +scikit-learn >=1.0.2, <=1.1.3 +sparseml >=1.0.0, <=1.2.0 +ale-py >=0.7, <=0.8.0 jsonargparse[signatures] # for LightningCLI