From 821ca7e85ddd8b54327700348b5c4912503143a6 Mon Sep 17 00:00:00 2001 From: Kushashwa Ravi Shrimali Date: Tue, 8 Mar 2022 23:32:32 +0530 Subject: [PATCH] Drop PyTorch 1.7 testing from the CI (#12191) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Carlos Mocholí Co-authored-by: Adrian Wälchli Co-authored-by: Aki Nitta --- .github/workflows/ci_dockers.yml | 6 ++---- .github/workflows/ci_test-conda.yml | 2 +- .github/workflows/ci_test-full.yml | 3 --- .github/workflows/events-nightly.yml | 4 ++-- .github/workflows/release-docker.yml | 2 +- CHANGELOG.md | 3 +++ README.md | 16 ++++++++-------- environment.yml | 6 +++--- requirements.txt | 2 +- requirements/examples.txt | 2 +- requirements/extra.txt | 2 +- 11 files changed, 23 insertions(+), 25 deletions(-) diff --git a/.github/workflows/ci_dockers.yml b/.github/workflows/ci_dockers.yml index 13f3148054..e517d5d7c1 100644 --- a/.github/workflows/ci_dockers.yml +++ b/.github/workflows/ci_dockers.yml @@ -97,7 +97,7 @@ jobs: matrix: # the config used in '.github/workflows/ci_test-conda.yml' python_version: ["3.8"] - pytorch_version: ["1.7", "1.8", "1.9", "1.10"] + pytorch_version: ["1.8", "1.9", "1.10"] steps: - name: Checkout uses: actions/checkout@v2 @@ -124,9 +124,7 @@ jobs: matrix: # the config used in 'dockers/ipu-ci-runner/Dockerfile' python_version: ["3.9"] # latest - # TODO: upgrade - PopTorch 2.2 uses torch 1.9, see: - # https://docs.graphcore.ai/projects/poptorch-user-guide/en/latest/installation.html#version-compatibility - pytorch_version: ["1.7"] + pytorch_version: ["1.9"] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/.github/workflows/ci_test-conda.yml b/.github/workflows/ci_test-conda.yml index 69ac71f101..96932cf8cb 100644 --- a/.github/workflows/ci_test-conda.yml +++ b/.github/workflows/ci_test-conda.yml @@ -19,7 +19,7 @@ jobs: fail-fast: false matrix: python-version: ["3.8"] # previous to last Python version as that one is already used in test-full - pytorch-version: ["1.7", "1.8", "1.9", "1.10"] # nightly: add when there's a release candidate + pytorch-version: ["1.8", "1.9", "1.10"] # nightly: add when there's a release candidate timeout-minutes: 30 steps: diff --git a/.github/workflows/ci_test-full.yml b/.github/workflows/ci_test-full.yml index 87d3665d62..115f1fd2ad 100644 --- a/.github/workflows/ci_test-full.yml +++ b/.github/workflows/ci_test-full.yml @@ -24,9 +24,6 @@ jobs: python-version: ["3.7", "3.9"] # minimum, maximum requires: ["oldest", "latest"] release: ["stable"] - exclude: - # Skip if torch<1.8 and py3.9 on Linux: https://github.com/pytorch/pytorch/issues/50014 - - {os: ubuntu-20.04, python-version: "3.9", requires: "oldest"} #include: # nightly: add when there's a release candidate #- {os: ubuntu-20.04, python-version: "3.10", requires: "latest", release: "pre"} diff --git a/.github/workflows/events-nightly.yml b/.github/workflows/events-nightly.yml index ee60736454..7cb795bfcc 100644 --- a/.github/workflows/events-nightly.yml +++ b/.github/workflows/events-nightly.yml @@ -125,7 +125,7 @@ jobs: matrix: # the config used in '.github/workflows/ci_test-conda.yml' python_version: ["3.8"] - pytorch_version: ["1.7", "1.8", "1.9", "1.10"] + pytorch_version: ["1.8", "1.9", "1.10"] steps: - name: Checkout @@ -165,7 +165,7 @@ jobs: matrix: # the config used in 'dockers/ipu-ci-runner/Dockerfile' include: - - {python_version: "3.9", pytorch_version: "1.7"} + - {python_version: "3.9", pytorch_version: "1.9"} steps: - name: Checkout diff --git a/.github/workflows/release-docker.yml b/.github/workflows/release-docker.yml index 39e2598086..6c9d22f455 100644 --- a/.github/workflows/release-docker.yml +++ b/.github/workflows/release-docker.yml @@ -16,7 +16,7 @@ jobs: fail-fast: false matrix: python_version: ["3.7", "3.8", "3.9"] - pytorch_version: ["1.7", "1.8", "1.9", "1.10"] + pytorch_version: ["1.8", "1.9", "1.10"] steps: - name: Checkout uses: actions/checkout@v2 diff --git a/CHANGELOG.md b/CHANGELOG.md index daf117eff1..06bc97f644 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -149,6 +149,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). ### Changed +- Drop PyTorch 1.7 support ([#12191](https://github.com/PyTorchLightning/pytorch-lightning/pull/12191)) + + - Make `benchmark` flag optional and set its value based on the deterministic flag ([#11944](https://github.com/PyTorchLightning/pytorch-lightning/pull/11944)) diff --git a/README.md b/README.md index e0504ced8b..d79463d0cf 100644 --- a/README.md +++ b/README.md @@ -78,14 +78,14 @@ Lightning is rigorously tested across multiple GPUs, TPUs CPUs and against major
-| System / PyTorch ver. | 1.7 (min. req.) | 1.8 (LTS) | 1.9 | 1.10 (latest) | -| :------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | -| Linux py3.7 \[GPUs\*\*\] | - | [![Build Status]()](https://dev.azure.com/PytorchLightning/pytorch-lightning/_build/latest?definitionId=6&branchName=master) | - | - | -| Linux py3.7 \[TPUs\*\*\*\] | - | [![CircleCI](https://circleci.com/gh/PyTorchLightning/pytorch-lightning/tree/master.svg?style=svg)](https://circleci.com/gh/PyTorchLightning/pytorch-lightning/tree/master) | - | - | -| Linux py3.8 (with Conda | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml) | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml) | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml) | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml) | -| Linux py3.{7,9} | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | - | - | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | -| OSX py3.{7,9} | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | - | - | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | -| Windows py3.{7,9} | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | - | - | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | +| System / PyTorch ver. | 1.8 (LTS, min. req.) | 1.9 | 1.10 (latest) | +| :------------------------: | :-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | +| Linux py3.7 \[GPUs\*\*\] | [![Build Status]()](https://dev.azure.com/PytorchLightning/pytorch-lightning/_build/latest?definitionId=6&branchName=master) | - | - | +| Linux py3.7 \[TPUs\*\*\*\] | [![CircleCI](https://circleci.com/gh/PyTorchLightning/pytorch-lightning/tree/master.svg?style=svg)](https://circleci.com/gh/PyTorchLightning/pytorch-lightning/tree/master) | - | - | +| Linux py3.8 (with Conda | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml) | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml) | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-conda.yml) | +| Linux py3.{7,9} | - | - | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | +| OSX py3.{7,9} | - | - | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | +| Windows py3.{7,9} | - | - | [![Test](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml/badge.svg?branch=master&event=push)](https://github.com/PyTorchLightning/pytorch-lightning/actions/workflows/ci_test-full.yml) | - _\*\* tests run on two NVIDIA P100_ - _\*\*\* tests run on Google GKE TPUv2/3. TPU py3.7 means we support Colab and Kaggle env._ diff --git a/environment.yml b/environment.yml index cc5273f465..28feb0b083 100644 --- a/environment.yml +++ b/environment.yml @@ -29,7 +29,7 @@ dependencies: - python>=3.7 - pip>20.1 - numpy>=1.17.2 - - pytorch>=1.7.* + - pytorch>=1.8.* - future>=0.17.1 - PyYAML>=5.1 - tqdm>=4.41.0 @@ -41,10 +41,10 @@ dependencies: - scikit-learn>=0.20.0 - matplotlib>=3.1.1 - omegaconf>=2.0.5 - - torchtext>=0.8.* + - torchtext>=0.9.* # Examples - - torchvision>=0.8.* + - torchvision>=0.9.* - pip: - test-tube>=0.7.5 diff --git a/requirements.txt b/requirements.txt index 5cad90d9b9..6aa080fc7e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # the default package dependencies numpy>=1.17.2 -torch>=1.7.* +torch>=1.8.* tqdm>=4.41.0 PyYAML>=5.4 fsspec[http]>=2021.05.0, !=2021.06.0 diff --git a/requirements/examples.txt b/requirements/examples.txt index 0e00654a8e..501d413de9 100644 --- a/requirements/examples.txt +++ b/requirements/examples.txt @@ -1,3 +1,3 @@ -torchvision>=0.8.* +torchvision>=0.9.* gym[classic_control]>=0.17.0 ipython[all] diff --git a/requirements/extra.txt b/requirements/extra.txt index e70e3f6254..bafa62b9bf 100644 --- a/requirements/extra.txt +++ b/requirements/extra.txt @@ -2,7 +2,7 @@ matplotlib>3.1 horovod>=0.21.2,<0.24 # no need to install with [pytorch] as pytorch is already installed -torchtext>=0.8.* +torchtext>=0.9.* omegaconf>=2.0.5 hydra-core>=1.0.5 jsonargparse[signatures]>=4.3.0