Skip to content

Commit

Permalink
Add Python 3.9 and drop PyTorch 1.6 (#786)
Browse files Browse the repository at this point in the history
* Remove unused requirements
* Test 3.7 and 3.9
* Add 3.9 ci
* Update torch-related version
* Update changelog
* tags
* ci

Co-authored-by: Jirka <jirka.borovec@seznam.cz>
  • Loading branch information
akihironitta and Borda authored Dec 20, 2021
1 parent f8972df commit c79c0ca
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci_install-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci_test-base.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/ci_test-full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.8]
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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypi-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: >-
Expand Down
2 changes: 1 addition & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -26,6 +29,9 @@ 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))


- Removed Python 3.6 support ([#785](https://github.com/PyTorchLightning/lightning-bolts/pull/785))

### Fixed
Expand Down
2 changes: 0 additions & 2 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.7-torch1.8"
#endpoint: azureContainerRegistryConnection
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
torch>=1.6
torch>=1.7.*
torchmetrics>=0.4.1
pytorch-lightning>=1.3.0
packaging
4 changes: 2 additions & 2 deletions requirements/models.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
torchvision>=0.7
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.*
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,5 +84,6 @@ def _prepare_extras():
"Programming Language :: Python :: 3",
"Programming Language :: Python :: 3.7",
"Programming Language :: Python :: 3.8",
"Programming Language :: Python :: 3.9",
],
)

0 comments on commit c79c0ca

Please sign in to comment.