Skip to content

Commit 74a09a2

Browse files
authored
CI: support PT 1.10 (#8133)
* prepare PT 1.10 * dockers * fixes * readme
1 parent 2e7007c commit 74a09a2

File tree

13 files changed

+159
-124
lines changed

13 files changed

+159
-124
lines changed

.github/workflows/ci_dockers.yml

Lines changed: 26 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
python_version: [3.7]
27-
pytorch_version: [1.6, 1.8]
26+
python_version: ["3.8"]
27+
pytorch_version: ["1.6", "1.8"]
2828
steps:
2929
- name: Checkout
3030
uses: actions/checkout@v2
@@ -45,8 +45,8 @@ jobs:
4545
strategy:
4646
fail-fast: false
4747
matrix:
48-
python_version: [3.7]
49-
xla_version: [1.6, 1.8, "nightly"]
48+
python_version: ["3.7"]
49+
xla_version: ["1.6", "1.8", "nightly"]
5050
steps:
5151
- name: Checkout
5252
uses: actions/checkout@v2
@@ -62,18 +62,17 @@ jobs:
6262
push: false
6363
timeout-minutes: 50
6464

65-
build-cuda:
65+
build-CUDA:
6666
runs-on: ubuntu-20.04
6767
strategy:
6868
fail-fast: false
6969
matrix:
7070
include:
71-
- python_version: 3.7
72-
pytorch_version: 1.6
73-
- python_version: 3.8
74-
pytorch_version: 1.8
75-
- python_version: 3.9
76-
pytorch_version: 1.9
71+
# todo: see notes in Dockerfile
72+
- python_version: "3.7"
73+
pytorch_version: "1.6"
74+
- python_version: "3.9"
75+
pytorch_version: "1.9"
7776
steps:
7877
- name: Checkout
7978
uses: actions/checkout@v2
@@ -90,30 +89,36 @@ jobs:
9089
push: false
9190
timeout-minutes: 50
9291

93-
build-conda:
92+
build-Conda:
9493
runs-on: ubuntu-20.04
9594
strategy:
9695
fail-fast: false
9796
matrix:
9897
include:
99-
- python_version: 3.6
100-
pytorch_version: 1.6
101-
- python_version: 3.8
102-
pytorch_version: 1.8
103-
- python_version: 3.9
104-
pytorch_version: 1.9
98+
- python_version: "3.7"
99+
pytorch_version: "1.6"
100+
- python_version: "3.8"
101+
pytorch_version: "1.9"
102+
- python_version: "3.9"
103+
pytorch_version: "1.10"
105104
steps:
106105
- name: Checkout
107106
uses: actions/checkout@v2
108107

108+
# see: https://pytorch.org/get-started/previous-versions/
109+
- run: |
110+
cuda=$(python -c "from distutils.version import LooseVersion as LVer ; print(11.1 if LVer('${{matrix.pytorch_version}}') > LVer('1.7') else 10.2)" 2>&1)
111+
echo "::set-output name=CUDA::$cuda"
112+
id: extend
113+
109114
- name: Build CUDA Docker
110115
# publish master/release
111116
uses: docker/build-push-action@v2
112117
with:
113118
build-args: |
114119
PYTHON_VERSION=${{ matrix.python_version }}
115120
PYTORCH_VERSION=${{ matrix.pytorch_version }}
116-
CUDA_VERSION=10.2
121+
CUDA_VERSION=${{ steps.extend.outputs.CUDA }}
117122
file: dockers/base-conda/Dockerfile
118123
push: false
119124
timeout-minutes: 50
@@ -139,8 +144,8 @@ jobs:
139144
fail-fast: false
140145
matrix:
141146
include:
142-
- python_version: 3.8
143-
pytorch_version: 1.7
147+
- python_version: "3.8"
148+
pytorch_version: "1.7"
144149
steps:
145150
- name: Checkout
146151
uses: actions/checkout@v2

.github/workflows/ci_test-conda.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
# os: [ubuntu-20.04]
18-
python-version: [3.7]
19-
pytorch-version: [1.6, 1.7, 1.8, 1.9]
18+
python-version: ["3.7"]
19+
pytorch-version: ["1.6", "1.7", "1.8", "1.9", "1.10"]
2020

2121
# Timeout: https://stackoverflow.com/a/59076067/4521646
2222
timeout-minutes: 35

.github/workflows/events-nightly.yml

Lines changed: 52 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,11 @@ name: Nightly events
44
# https://github.202132.xyzmunity/t/distinct-job-for-each-schedule/17811/2
55
on:
66
schedule:
7-
- cron: "0 0 * * *" # At the end of every day
7+
# At the end of every day
8+
- cron: "0 0 * * *"
9+
10+
env:
11+
PUSH_TO_HUB: true
812

913
# based on https://github.com/pypa/gh-action-pypi-publish
1014
jobs:
@@ -16,7 +20,7 @@ jobs:
1620
- uses: actions/checkout@v2
1721
- uses: actions/setup-python@v2
1822
with:
19-
python-version: 3.7
23+
python-version: 3.8
2024

2125
- name: Install dependencies
2226
run: >-
@@ -47,8 +51,8 @@ jobs:
4751
strategy:
4852
fail-fast: false
4953
matrix:
50-
python_version: [3.7]
51-
xla_version: [1.6, 1.7, 1.8] # todo: , "nightly"
54+
python_version: ["3.7"]
55+
xla_version: ["1.6", "1.7", "1.8", "1.9"] # todo: , "nightly"
5256
steps:
5357
- name: Checkout
5458
uses: actions/checkout@v2
@@ -70,24 +74,25 @@ jobs:
7074
PYTHON_VERSION=${{ matrix.python_version }}
7175
XLA_VERSION=${{ matrix.xla_version }}
7276
file: dockers/base-xla/Dockerfile
73-
push: true
77+
push: ${{ env.PUSH_TO_HUB }}
7478
tags: pytorchlightning/pytorch_lightning:base-xla-py${{ matrix.python_version }}-torch${{ matrix.xla_version }}
7579
timeout-minutes: 55
7680

77-
docker-cuda-conda:
81+
docker-CUDA:
7882
runs-on: ubuntu-20.04
7983
strategy:
8084
fail-fast: false
8185
matrix:
82-
python_version: [3.6, 3.7, 3.8]
83-
pytorch_version: [1.6, 1.7, 1.8, 1.9]
86+
python_version: ["3.6", "3.7", "3.8", "3.9"]
87+
pytorch_version: ["1.6", "1.7", "1.8", "1.9"]
88+
exclude:
89+
- python_version: "3.9"
90+
pytorch_version: "1.6"
8491

8592
steps:
8693
- name: Checkout
8794
uses: actions/checkout@v2
8895

89-
# https://github.com/docker/setup-buildx-action
90-
# Set up Docker Buildx - to use cache-from and cache-to argument of buildx command
9196
- uses: docker/setup-buildx-action@v1
9297
- name: Login to DockerHub
9398
uses: docker/login-action@v1
@@ -96,19 +101,45 @@ jobs:
96101
password: ${{ secrets.DOCKER_PASSWORD }}
97102

98103
- name: Publish CUDA to Docker Hub
99-
if: matrix.pytorch_version <= 1.8
100104
# publish master/release
101105
uses: docker/build-push-action@v2
102106
with:
103107
build-args: |
104108
PYTHON_VERSION=${{ matrix.python_version }}
105109
PYTORCH_VERSION=${{ matrix.pytorch_version }}
106-
CUDA_VERSION=10.2
107110
file: dockers/base-cuda/Dockerfile
108-
push: true
111+
push: ${{ env.PUSH_TO_HUB }}
109112
tags: pytorchlightning/pytorch_lightning:base-cuda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
110113
timeout-minutes: 55
111114

115+
docker-Conda:
116+
runs-on: ubuntu-20.04
117+
strategy:
118+
fail-fast: false
119+
matrix:
120+
python_version: ["3.6", "3.7", "3.8", "3.9"]
121+
pytorch_version: ["1.6", "1.7", "1.8", "1.9", "1.10"]
122+
exclude:
123+
- python_version: "3.9"
124+
pytorch_version: "1.6"
125+
126+
steps:
127+
- name: Checkout
128+
uses: actions/checkout@v2
129+
130+
- uses: docker/setup-buildx-action@v1
131+
- name: Login to DockerHub
132+
uses: docker/login-action@v1
133+
with:
134+
username: ${{ secrets.DOCKER_USERNAME }}
135+
password: ${{ secrets.DOCKER_PASSWORD }}
136+
137+
# see: https://pytorch.org/get-started/previous-versions/
138+
- run: |
139+
cuda=$(python -c "from distutils.version import LooseVersion as LVer ; print(11.1 if LVer('${{matrix.pytorch_version}}') > LVer('1.7') else 10.2)" 2>&1)
140+
echo "::set-output name=CUDA::$cuda"
141+
id: extend
142+
112143
- name: Publish Conda to Docker Hub
113144
# publish master/release
114145
uses: docker/build-push-action@v2
@@ -118,11 +149,11 @@ jobs:
118149
PYTORCH_VERSION=${{ matrix.pytorch_version }}
119150
CUDA_VERSION=${{ steps.extend.outputs.CUDA }}
120151
file: dockers/base-conda/Dockerfile
121-
push: true
152+
push: ${{ env.PUSH_TO_HUB }}
122153
tags: pytorchlightning/pytorch_lightning:base-conda-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
123154
timeout-minutes: 55
124155

125-
docker-nvidia:
156+
docker-NVIDIA:
126157
runs-on: ubuntu-20.04
127158
# todo: temporarily skip as the base container does not fit to agent
128159
if: false
@@ -143,18 +174,17 @@ jobs:
143174
uses: docker/build-push-action@v2
144175
with:
145176
file: dockers/nvidia/Dockerfile
146-
push: true
147-
tags: nvcr.io/pytorchlightning/pytorch_lightning:nvidia
177+
tags: nvcr.io/pytorchlightning/pytorch_lightning:latest
148178
timeout-minutes: 55
149179

150-
docker-ipu:
180+
docker-IPU:
151181
runs-on: ubuntu-20.04
152182
strategy:
153183
fail-fast: false
154184
matrix:
155185
include:
156-
- python_version: 3.8
157-
pytorch_version: 1.7
186+
- python_version: "3.8"
187+
pytorch_version: "1.7"
158188

159189
steps:
160190
- name: Checkout
@@ -177,7 +207,7 @@ jobs:
177207
PYTHON_VERSION=${{ matrix.python_version }}
178208
PYTORCH_VERSION=${{ matrix.pytorch_version }}
179209
file: dockers/base-ipu/Dockerfile
180-
push: true
210+
push: ${{ env.PUSH_TO_HUB }}
181211
tags: pytorchlightning/pytorch_lightning:base-ipu-py${{ matrix.python_version }}-torch${{ matrix.pytorch_version }}
182212
timeout-minutes: 55
183213

@@ -189,6 +219,6 @@ jobs:
189219
PYTHON_VERSION=${{ matrix.python_version }}
190220
PYTORCH_VERSION=${{ matrix.pytorch_version }}
191221
file: dockers/ipu-ci-runner/Dockerfile
192-
push: true
222+
push: ${{ env.PUSH_TO_HUB }}
193223
tags: pytorchlightning/pytorch_lightning:ipu-ci-runner-py${{ matrix.python_version }}
194224
timeout-minutes: 55

.github/workflows/release-docker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ jobs:
1515
strategy:
1616
fail-fast: false
1717
matrix:
18-
python_version: [3.6, 3.7, 3.8]
19-
pytorch_version: [1.6, 1.7, 1.8, 1.9]
18+
python_version: ["3.6", "3.7", "3.8", "3.9"]
19+
pytorch_version: ["1.6", "1.7", "1.8", "1.9"]
2020
steps:
2121
- name: Checkout
2222
uses: actions/checkout@v2

.github/workflows/release-pypi.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v2
1717
- uses: actions/setup-python@v2
1818
with:
19-
python-version: 3.7
19+
python-version: 3.8
2020

2121
- name: Install dependencies
2222
run: >-
@@ -90,7 +90,7 @@ jobs:
9090

9191
- uses: actions/setup-python@v2
9292
with:
93-
python-version: 3.7
93+
python-version: 3.8
9494

9595
- name: Weekly reset caching
9696
run: echo "::set-output name=period::$(python -c 'import time ; days = time.time() / 60 / 60 / 24 ; print(int(days / 7))' 2>&1)"

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,14 +74,14 @@ Lightning is rigorously tested across multiple GPUs, TPUs CPUs and against major
7474

7575
<center>
7676

77-
| System / PyTorch ver. | 1.6 | 1.7 | 1.8 (LTS) | 1.9 (latest) |
78-
| :---: | :---: | :---: | :---: | :---: |
79-
| Conda py3.7 [linux] | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) |
80-
| Linux py3.7 [GPUs**] | - | - | [![Build Status](https://dev.azure.com/PytorchLightning/pytorch-lightning/_apis/build/status/PL.pytorch-lightning%20(GPUs)?branchName=master)](https://dev.azure.com/PytorchLightning/pytorch-lightning/_build/latest?definitionId=6&branchName=master) | - |
81-
| Linux py3.{6,7} [TPUs***] | [![TPU tests](https://github.com/PyTorchLightning/pytorch-lightning/workflows/TPU%20tests/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22TPU+tests%22+branch%3Amaster) | - | [![TPU tests](https://github.com/PyTorchLightning/pytorch-lightning/workflows/TPU%20tests/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22TPU+tests%22+branch%3Amaster) | - |
82-
| Linux py3.{6,7,8,9} | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - | - | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) |
83-
| OSX py3.{6,7,8,9} | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - | - | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) |
84-
| Windows py3.{6,7,8,9} | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - | - | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) |
77+
| System / PyTorch ver. | 1.6 (min. req.) | 1.7 | 1.8 (LTS) | 1.9 (latest) | 1.10 (nightly) |
78+
| :---: | :---: | :---: | :---: | :---: | :---: |
79+
| Conda py3.7 [linux] | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) | [![PyTorch & Conda](https://github.com/PyTorchLightning/pytorch-lightning/workflows/PyTorch%20&%20Conda/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22PyTorch+%26+Conda%22+branch%3Amaster) |
80+
| Linux py3.7 [GPUs**] | - | - | [![Build Status](https://dev.azure.com/PytorchLightning/pytorch-lightning/_apis/build/status/PL.pytorch-lightning%20(GPUs)?branchName=master)](https://dev.azure.com/PytorchLightning/pytorch-lightning/_build/latest?definitionId=6&branchName=master) | - | - |
81+
| Linux py3.{6,7} [TPUs***] | [![TPU tests](https://github.com/PyTorchLightning/pytorch-lightning/workflows/TPU%20tests/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22TPU+tests%22+branch%3Amaster) | - | [![TPU tests](https://github.com/PyTorchLightning/pytorch-lightning/workflows/TPU%20tests/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22TPU+tests%22+branch%3Amaster) | - | - |
82+
| Linux py3.{6,7,8,9} | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - | - | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - |
83+
| OSX py3.{6,7,8,9} |[![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - | - | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - |
84+
| Windows py3.{6,7,8,9} | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - | - | [![CI complete testing](https://github.com/PyTorchLightning/pytorch-lightning/workflows/CI%20complete%20testing/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions?query=workflow%3A%22CI+testing%22) | - |
8585

8686
- _\** tests run on two NVIDIA P100_
8787
- _\*** tests run on Google GKE TPUv2/3_

0 commit comments

Comments
 (0)