From 1e0b268bbbbfe821ade393c0f2d24b1ed4a12059 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 06:08:48 +0900 Subject: [PATCH 01/17] Set pytorch-lightning>=1.4.8 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 12b0d5fffa..ca3afde894 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ torch>=1.6 torchmetrics>=0.4.1 -pytorch-lightning>=1.3.0 +pytorch-lightning>=1.4.8 dataclasses ; python_version <= "3.6" packaging From 3af0fe7b2c0dd44254629bf4af4f91965592744d Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:12:35 +0900 Subject: [PATCH 02/17] Revert "Set pytorch-lightning>=1.4.8" This reverts commit 1e0b268bbbbfe821ade393c0f2d24b1ed4a12059. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index ca3afde894..12b0d5fffa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ torch>=1.6 torchmetrics>=0.4.1 -pytorch-lightning>=1.4.8 +pytorch-lightning>=1.3.0 dataclasses ; python_version <= "3.6" packaging From b99de7eb86c757d7703fb84eee590546e69f0a67 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:23:37 +0900 Subject: [PATCH 03/17] Remove unused requirements --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 12b0d5fffa..1fd6e34b99 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,4 @@ torch>=1.6 torchmetrics>=0.4.1 pytorch-lightning>=1.3.0 -dataclasses ; python_version <= "3.6" packaging From e4042df3d311efb816c5eece3b073c9fff11a620 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:23:49 +0900 Subject: [PATCH 04/17] Test 3.7 and 3.9 --- .github/workflows/ci_test-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml index 1c384f307a..491a0eb761 100644 --- a/.github/workflows/ci_test-full.yml +++ b/.github/workflows/ci_test-full.yml @@ -17,7 +17,7 @@ jobs: matrix: # PyTorch 1.5 is failing on Win and bolts requires torchvision>=0.5 os: [ubuntu-20.04, macOS-10.15] #, windows-2019 - python-version: [3.6, 3.8] + python-version: [3.7, 3.9] requires: ['minimal', 'latest'] # Timeout: https://stackoverflow.com/a/59076067/4521646 From 680a69b81c72cea065a85613bf7e3dcfd56d5df8 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:35:08 +0900 Subject: [PATCH 05/17] Update PyTorch version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1fd6e34b99..512ca42104 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -torch>=1.6 +torch>=1.7.* torchmetrics>=0.4.1 pytorch-lightning>=1.3.0 packaging From 28395235cec0b00e2dd76614781efc9ef5a68924 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:38:13 +0900 Subject: [PATCH 06/17] Revert "Update PyTorch version" This reverts commit 680a69b81c72cea065a85613bf7e3dcfd56d5df8. --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 512ca42104..1fd6e34b99 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -torch>=1.7.* +torch>=1.6 torchmetrics>=0.4.1 pytorch-lightning>=1.3.0 packaging From d3728e18f093fd8772fb249f8874b0b948063623 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:39:00 +0900 Subject: [PATCH 07/17] keep the latest version 3.8 --- .github/workflows/ci_test-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml index 491a0eb761..d0aad177db 100644 --- a/.github/workflows/ci_test-full.yml +++ b/.github/workflows/ci_test-full.yml @@ -17,7 +17,7 @@ jobs: matrix: # PyTorch 1.5 is failing on Win and bolts requires torchvision>=0.5 os: [ubuntu-20.04, macOS-10.15] #, windows-2019 - python-version: [3.7, 3.9] + python-version: [3.7, 3.8] requires: ['minimal', 'latest'] # Timeout: https://stackoverflow.com/a/59076067/4521646 From e83e94bccbd37395c8e4e6f13062a9079316b06f Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:51:43 +0900 Subject: [PATCH 08/17] Update changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 535a43dc4f..ef9b15592d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Added nn.Module support for FasterRCNN backbone ([#661](https://github.com/PyTorchLightning/lightning-bolts/pull/661)) +- Added Python 3.9 support ([#786](https://github.com/PyTorchLightning/lightning-bolts/pull/786)) + + ### Changed - VAE now uses deterministic KL divergence during training, previously estimated KL divergence by random sampling ([#760](https://github.com/PyTorchLightning/lightning-bolts/pull/760)) From 189ebf95a2d8c1f6b0f4b77be898163ab739df48 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:53:53 +0900 Subject: [PATCH 09/17] Add 3.9 ci --- .github/workflows/ci_test-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml index d0aad177db..491a0eb761 100644 --- a/.github/workflows/ci_test-full.yml +++ b/.github/workflows/ci_test-full.yml @@ -17,7 +17,7 @@ jobs: matrix: # PyTorch 1.5 is failing on Win and bolts requires torchvision>=0.5 os: [ubuntu-20.04, macOS-10.15] #, windows-2019 - python-version: [3.7, 3.8] + python-version: [3.7, 3.9] requires: ['minimal', 'latest'] # Timeout: https://stackoverflow.com/a/59076067/4521646 From 9a1e2b71572d28ba24dfc9d22b932e1252e901dc Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 08:56:27 +0900 Subject: [PATCH 10/17] Update torch-related version --- requirements.txt | 2 +- requirements/models.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1fd6e34b99..512ca42104 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -torch>=1.6 +torch>=1.7.* torchmetrics>=0.4.1 pytorch-lightning>=1.3.0 packaging diff --git a/requirements/models.txt b/requirements/models.txt index 0d7507a2f8..2ce7b5571d 100644 --- a/requirements/models.txt +++ b/requirements/models.txt @@ -1,4 +1,4 @@ -torchvision>=0.7 +torchvision>=0.8.* scikit-learn>=0.23 Pillow opencv-python-headless From 631c09e176822f805a86371a92633d7c5d1c3a5f Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sun, 19 Dec 2021 09:21:15 +0900 Subject: [PATCH 11/17] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef9b15592d..d09176fa48 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Removed +- Removed PyTorch 1.6 support ([#786](https://github.com/PyTorchLightning/lightning-bolts/pull/786)) ### Fixed From ed79219ff9334a9a809ef8bf9b6fe79004bc0ea1 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sun, 19 Dec 2021 12:07:45 +0100 Subject: [PATCH 12/17] tags --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index ead838496a..e55aa8d7a9 100755 --- a/setup.py +++ b/setup.py @@ -82,8 +82,9 @@ def _prepare_extras(): # Specify the Python versions you support here. In particular, ensure # that you indicate whether you support Python 2, Python 3 or both. "Programming Language :: Python :: 3", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", ], ) From bcd0d5bf3bab14bea32d53726a1180b3cb125e1c Mon Sep 17 00:00:00 2001 From: Aki Nitta Date: Mon, 20 Dec 2021 01:55:45 +0900 Subject: [PATCH 13/17] Update setup.py --- setup.py | 1 - 1 file changed, 1 deletion(-) diff --git a/setup.py b/setup.py index 2e5be24a7d..7dbbf21de1 100755 --- a/setup.py +++ b/setup.py @@ -85,6 +85,5 @@ def _prepare_extras(): "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", ], ) From c0a125b3025ec634bcec74e425582069f86cbbcb Mon Sep 17 00:00:00 2001 From: Jirka Date: Sun, 19 Dec 2021 22:07:41 +0100 Subject: [PATCH 14/17] ci --- .github/workflows/ci_install-pkg.yml | 4 ++-- .github/workflows/ci_test-base.yml | 3 +-- .github/workflows/ci_test-full.yml | 4 +++- .github/workflows/code-format.yml | 2 +- .github/workflows/docs-check.yml | 4 ++-- .github/workflows/pypi-release.yml | 2 +- .readthedocs.yml | 2 +- azure-pipelines.yml | 2 +- 8 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci_install-pkg.yml b/.github/workflows/ci_install-pkg.yml index 50193b4ec7..24d92a9d88 100644 --- a/.github/workflows/ci_install-pkg.yml +++ b/.github/workflows/ci_install-pkg.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Create package run: | @@ -36,7 +36,7 @@ jobs: matrix: # PyTorch 1.5 is failing on Win and bolts requires torchvision>=0.5 os: [ubuntu-20.04, macOS-10.15, windows-2019] # - python-version: [3.7] + python-version: [3.8] steps: - uses: actions/checkout@master diff --git a/.github/workflows/ci_test-base.yml b/.github/workflows/ci_test-base.yml index 1465e1370e..18c3415d97 100644 --- a/.github/workflows/ci_test-base.yml +++ b/.github/workflows/ci_test-base.yml @@ -12,10 +12,9 @@ jobs: runs-on: ${{ matrix.os }} strategy: fail-fast: false - # max-parallel: 6 matrix: os: [ubuntu-20.04, windows-2019, macOS-10.15] - python-version: [3.7] + python-version: [3.8] # Timeout: https://stackoverflow.com/a/59076067/4521646 timeout-minutes: 20 diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml index 491a0eb761..63dbd2dede 100644 --- a/.github/workflows/ci_test-full.yml +++ b/.github/workflows/ci_test-full.yml @@ -13,12 +13,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: fail-fast: false - # max-parallel: 6 matrix: # PyTorch 1.5 is failing on Win and bolts requires torchvision>=0.5 os: [ubuntu-20.04, macOS-10.15] #, windows-2019 python-version: [3.7, 3.9] requires: ['minimal', 'latest'] + exclude: + # - {python-version: 3.7, requires: 'latest'} + - {python-version: 3.9, requires: 'minimal'} # Timeout: https://stackoverflow.com/a/59076067/4521646 # the reason for high number is MUCH slower tests on macOS and py3.8 diff --git a/.github/workflows/code-format.yml b/.github/workflows/code-format.yml index 9bb2665dca..23ff35b7fd 100644 --- a/.github/workflows/code-format.yml +++ b/.github/workflows/code-format.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: | pip install flake8 diff --git a/.github/workflows/docs-check.yml b/.github/workflows/docs-check.yml index 97863fec5b..497b47969d 100644 --- a/.github/workflows/docs-check.yml +++ b/.github/workflows/docs-check.yml @@ -14,7 +14,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 # Note: This uses an internal pip API and may not always work # https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 # Note: This uses an internal pip API and may not always work # https://github.com/actions/cache/blob/master/examples.md#multiple-oss-in-a-workflow diff --git a/.github/workflows/pypi-release.yml b/.github/workflows/pypi-release.yml index fbb0b25be7..ce1473e3e0 100644 --- a/.github/workflows/pypi-release.yml +++ b/.github/workflows/pypi-release.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@master - uses: actions/setup-python@v2 with: - python-version: 3.7 + python-version: 3.8 - name: Install dependencies run: >- diff --git a/.readthedocs.yml b/.readthedocs.yml index 9ea7074550..a1409a661d 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -17,7 +17,7 @@ formats: # Optionally set the version of Python and requirements required to build your docs python: - version: 3.7 + version: 3.8 install: - requirements: docs/requirements.txt #- requirements: requirements.txt diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c718e0cc41..6c0bb720c4 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,7 +28,7 @@ jobs: # ToDo: this need to have installed docker in the base image... #container: "pytorchlightning/pytorch_lightning:base-cuda-py$[ variables['python.version'] ]-torch1.6" container: - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.8" + image: "pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.8" #endpoint: azureContainerRegistryConnection options: "--runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all" From c62a75a7d856275733735cd26500bb8d1aad25a1 Mon Sep 17 00:00:00 2001 From: Jirka Date: Sun, 19 Dec 2021 22:38:44 +0100 Subject: [PATCH 15/17] . --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6c0bb720c4..4754d17a2d 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -28,7 +28,7 @@ jobs: # ToDo: this need to have installed docker in the base image... #container: "pytorchlightning/pytorch_lightning:base-cuda-py$[ variables['python.version'] ]-torch1.6" container: - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.8" + image: "pytorchlightning/pytorch_lightning:base-cuda-py3.8-torch1.8" #endpoint: azureContainerRegistryConnection options: "--runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all" From 8b57ad8eee897d78391a85ee9e00ae9cde390d9c Mon Sep 17 00:00:00 2001 From: Jirka Date: Sun, 19 Dec 2021 23:37:44 +0100 Subject: [PATCH 16/17] gym --- azure-pipelines.yml | 2 -- requirements/models.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4754d17a2d..7a1b830b01 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,8 +25,6 @@ jobs: pool: azure-gpus-spot - # ToDo: this need to have installed docker in the base image... - #container: "pytorchlightning/pytorch_lightning:base-cuda-py$[ variables['python.version'] ]-torch1.6" container: image: "pytorchlightning/pytorch_lightning:base-cuda-py3.8-torch1.8" #endpoint: azureContainerRegistryConnection diff --git a/requirements/models.txt b/requirements/models.txt index 2ce7b5571d..fa668ce484 100644 --- a/requirements/models.txt +++ b/requirements/models.txt @@ -2,6 +2,6 @@ torchvision>=0.8.* scikit-learn>=0.23 Pillow opencv-python-headless -gym>=0.17.2, <0.20.0 # needed for RL +gym[atari]>=0.17.2, <0.20.0 # needed for RL atari_py==0.2.* box2d-py==2.3.* From 984e6f15d0367faefd91cf86eb1881781b533d51 Mon Sep 17 00:00:00 2001 From: Jirka Date: Mon, 20 Dec 2021 08:49:42 +0100 Subject: [PATCH 17/17] 3.7 --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7a1b830b01..84a6a0e899 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -26,7 +26,7 @@ jobs: pool: azure-gpus-spot container: - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.8-torch1.8" + image: "pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.8" #endpoint: azureContainerRegistryConnection options: "--runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all"