Skip to content

Commit 939a861

Browse files
carmoccacarmocca
authored
Update Python testing (#10269)
1 parent 3664659 commit 939a861

File tree

11 files changed

+31
-28
lines changed

11 files changed

+31
-28
lines changed

‎.azure-pipelines/gpu-benchmark.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ jobs:
2828
cancelTimeoutInMinutes: "2"
2929
pool: gridai-spot-pool
3030
container:
31-
# base ML image: mcr.microsoft.com/azureml/openmpi3.1.2-cuda10.2-cudnn8-ubuntu18.04
32-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.8-torch1.8"
31+
# should match the one in '.azure-pipelines/gpu-benchmark.yml'
32+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.7-torch1.8"
3333
options: "--runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all --shm-size=32g"
3434
workspace:
3535
clean: all

‎.github/workflows/ci_dockers.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ jobs:
9292
fail-fast: false
9393
matrix:
9494
# the config used in '.github/workflows/ci_test-conda.yml'
95-
python_version: ["3.7"]
95+
python_version: ["3.8"]
9696
pytorch_version: ["1.6", "1.7", "1.8", "1.9", "1.10"]
9797
steps:
9898
- name: Checkout
@@ -119,7 +119,7 @@ jobs:
119119
fail-fast: false
120120
matrix:
121121
# the config used in 'dockers/ipu-ci-runner/Dockerfile'
122-
python_version: ["3.8"] # latest
122+
python_version: ["3.9"] # latest
123123
# TODO: upgrade - PopTorch 2.2 uses torch 1.9, see:
124124
# https://docs.graphcore.ai/projects/poptorch-user-guide/en/latest/installation.html#version-compatibility
125125
pytorch_version: ["1.7"]

‎.github/workflows/ci_test-conda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
python-version: ["3.7"]
17+
python-version: ["3.8"] # previous to last Python version as that one is already used in test-full
1818
pytorch-version: ["1.6", "1.7", "1.8", "1.9", "1.10"]
1919

2020
# Timeout: https://stackoverflow.com/a/59076067/4521646

‎.github/workflows/ci_test-full.yml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,21 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
os: [ubuntu-18.04, windows-2019, macOS-10.15]
21-
python-version: [3.6, 3.8, 3.9]
22-
requires: ['minimal', 'latest']
23-
release: ['stable']
24-
exclude:
25-
- python-version: 3.9
26-
requires: 'minimal'
21+
python-version: ["3.7", "3.9"] # minimum, maximum
22+
requires: ["oldest", "latest"]
23+
release: ["stable"]
2724
include:
28-
- os: ubuntu-20.04
29-
python-version: 3.9
30-
requires: 'latest'
31-
release: 'pre'
25+
# test 3.6 only on oldest until EOL: https://github.com/PyTorchLightning/pytorch-lightning/issues/9981
26+
- {os: ubuntu-18.04, python-version: "3.6", requires: "oldest", release: "stable"}
27+
- {os: windows-2019, python-version: "3.6", requires: "oldest", release: "stable"}
28+
- {os: macOS-10.15, python-version: "3.6", requires: "oldest", release: "stable"}
29+
# nightly: add when there's a release candidate
30+
#- {os: ubuntu-20.04, python-version: "3.10", requires: "latest", release: "pre"}
31+
exclude:
32+
# PyTorch 1.6 is not available with Python 3.9: https://github.com/pytorch/pytorch/issues/46205
33+
- {os: ubuntu-18.04, python-version: "3.9", requires: "oldest", release: "stable"}
34+
- {os: windows-2019, python-version: "3.9", requires: "oldest", release: "stable"}
35+
- {os: macOS-10.15, python-version: "3.9", requires: "oldest", release: "stable"}
3236

3337
# Timeout: https://stackoverflow.com/a/59076067/4521646
3438
# TODO: the macOS is taking too long, probably caching did not work...
@@ -64,7 +68,7 @@ jobs:
6468
python .github/prune-packages.py requirements/extra.txt "horovod"
6569
6670
- name: Set min. dependencies
67-
if: matrix.requires == 'minimal'
71+
if: matrix.requires == 'oldest'
6872
run: |
6973
python .github/set-min-requirements.py
7074

‎.github/workflows/events-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ jobs:
122122
fail-fast: false
123123
matrix:
124124
# the config used in '.github/workflows/ci_test-conda.yml'
125-
python_version: ["3.7"]
125+
python_version: ["3.8"]
126126
pytorch_version: ["1.6", "1.7", "1.8", "1.9", "1.10"]
127127

128128
steps:
@@ -163,7 +163,7 @@ jobs:
163163
matrix:
164164
# the config used in 'dockers/ipu-ci-runner/Dockerfile'
165165
include:
166-
- python_version: "3.8"
166+
- python_version: "3.9"
167167
pytorch_version: "1.7"
168168

169169
steps:

‎dockers/base-cuda/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ARG CUDA_VERSION=10.2
1616

1717
FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu18.04
1818

19-
ARG PYTHON_VERSION=3.8
19+
ARG PYTHON_VERSION=3.9
2020
ARG PYTORCH_VERSION=1.6
2121

2222
SHELL ["/bin/bash", "-c"]

‎dockers/base-ipu/Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ FROM ubuntu:20.04
1616

1717
LABEL maintainer="PyTorchLightning <https://github.com/PyTorchLightning>"
1818

19-
ARG PYTHON_VERSION=3.8
20-
ARG PYTORCH_VERSION=1.7
19+
ARG PYTHON_VERSION=3.9
2120
ARG CONDA_VERSION=4.9.2
2221

2322
SHELL ["/bin/bash", "-c"]
@@ -41,7 +40,7 @@ RUN apt-get update -qq && \
4140
&& \
4241
# Install conda and python.
4342
# NOTE new Conda does not forward the exit status... https://github.com/conda/conda/issues/8385
44-
curl -o ~/miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py38_${CONDA_VERSION}-Linux-x86_64.sh && \
43+
curl -o ~/miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py39_${CONDA_VERSION}-Linux-x86_64.sh && \
4544
chmod +x ~/miniconda.sh && \
4645
~/miniconda.sh -b && \
4746
rm ~/miniconda.sh && \

‎dockers/base-xla/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ FROM google/cloud-sdk:slim
1616

1717
LABEL maintainer="PyTorchLightning <https://github.com/PyTorchLightning>"
1818

19-
# CALL: docker image build -t pytorch-lightning:XLA-extras-py3.6 -f dockers/base-xla/Dockerfile . --build-arg PYTHON_VERSION=3.6
20-
ARG PYTHON_VERSION=3.7
19+
# CALL: docker image build -t pytorch-lightning:XLA-extras-py3.6 -f dockers/base-xla/Dockerfile . --build-arg PYTHON_VERSION=3.8
20+
ARG PYTHON_VERSION=3.9
2121
ARG CONDA_VERSION=4.9.2
2222
ARG XLA_VERSION=1.6
2323

@@ -42,7 +42,7 @@ RUN apt-get update -qq && \
4242
&& \
4343
# Install conda and python.
4444
# NOTE new Conda does not forward the exit status... https://github.com/conda/conda/issues/8385
45-
curl -o ~/miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py38_${CONDA_VERSION}-Linux-x86_64.sh && \
45+
curl -o ~/miniconda.sh https://repo.anaconda.com/miniconda/Miniconda3-py39_${CONDA_VERSION}-Linux-x86_64.sh && \
4646
chmod +x ~/miniconda.sh && \
4747
~/miniconda.sh -b && \
4848
rm ~/miniconda.sh && \

‎dockers/ipu-ci-runner/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PYTHON_VERSION=3.8
15+
ARG PYTHON_VERSION=3.9
1616
ARG PYTORCH_VERSION=1.7
1717

1818
FROM pytorchlightning/pytorch_lightning:base-ipu-py${PYTHON_VERSION}-torch${PYTORCH_VERSION}

‎dockers/release/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PYTHON_VERSION=3.7
15+
ARG PYTHON_VERSION=3.9
1616
ARG PYTORCH_VERSION=1.6
1717

1818
FROM pytorchlightning/pytorch_lightning:base-cuda-py${PYTHON_VERSION}-torch${PYTORCH_VERSION}

‎dockers/tpu-tests/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG PYTHON_VERSION=3.7
15+
ARG PYTHON_VERSION=3.9
1616
ARG PYTORCH_VERSION=1.6
1717

1818
FROM pytorchlightning/pytorch_lightning:base-xla-py${PYTHON_VERSION}-torch${PYTORCH_VERSION}

0 commit comments

Comments
 (0)