From 9bd0844fa9fb2dba773eaba289c364f3743d721c Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 21:39:47 +0900 Subject: [PATCH 01/16] Update docker images to build --- .github/workflows/cicd-pytorch_dockers.yml | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/cicd-pytorch_dockers.yml b/.github/workflows/cicd-pytorch_dockers.yml index 4742f3579c274..170cd6258df4e 100644 --- a/.github/workflows/cicd-pytorch_dockers.yml +++ b/.github/workflows/cicd-pytorch_dockers.yml @@ -30,8 +30,8 @@ jobs: fail-fast: false matrix: # the config used in '.azure-pipelines/gpu-tests.yml' since the Dockerfile uses the cuda image - python_version: ["3.9"] - pytorch_version: ["1.10", "1.11"] + python_version: ["3.10"] + pytorch_version: ["1.11", "1.12"] steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 @@ -50,8 +50,8 @@ jobs: fail-fast: false matrix: # the config used in '.circleci/config.yml`' - python_version: ["3.7"] - xla_version: ["1.11"] + python_version: ["3.9", "3.10"] + xla_version: ["1.12"] steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 @@ -86,12 +86,11 @@ jobs: matrix: include: # the config used in '.azure-pipelines/gpu-tests.yml' - - {python_version: "3.7", pytorch_version: "1.10", cuda_version: "11.1", ubuntu_version: "20.04"} - - {python_version: "3.7", pytorch_version: "1.11", cuda_version: "11.3.1", ubuntu_version: "20.04"} - # latest (used in Tutorials) + # Some are used in different projects such as tutorials. - {python_version: "3.8", pytorch_version: "1.9", cuda_version: "11.1", ubuntu_version: "20.04"} - {python_version: "3.9", pytorch_version: "1.10", cuda_version: "11.1", ubuntu_version: "20.04"} - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1", ubuntu_version: "20.04"} + - {python_version: "3.10", pytorch_version: "1.12", cuda_version: "11.6.1", ubuntu_version: "20.04"} steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 @@ -130,8 +129,7 @@ jobs: - {python_version: "3.8", pytorch_version: "1.9", cuda_version: "11.1"} - {python_version: "3.8", pytorch_version: "1.10", cuda_version: "11.1"} - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1"} - # nightly: add when there's a release candidate - # - {python_version: "3.9", pytorch_version: "1.12"} + - {python_version: "3.10", pytorch_version: "1.12", cuda_version: "11.6.1"} steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 From e6ac87e96e3a756f067981dc7a3748810ccdb47e Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 21:48:51 +0900 Subject: [PATCH 02/16] Update full --- .github/workflows/ci-pytorch_test-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 972753f3d8f12..a9e46405c24c5 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false matrix: os: [ubuntu-20.04, windows-2019, macOS-11] - python-version: ["3.7", "3.9"] # minimum, maximum + python-version: ["3.7", "3.10"] # minimum, maximum requires: ["oldest", "latest"] release: ["stable"] # TODO: re-enable RC testing From 97c3a175972e0c3cfc8efcbf668bb91a5fbcb56a Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 21:54:17 +0900 Subject: [PATCH 03/16] revertme: run on draft --- .github/workflows/ci-pytorch_test-full.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index a9e46405c24c5..c94d94dc89c34 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -16,7 +16,7 @@ jobs: cpu: runs-on: ${{ matrix.os }} - if: github.event.pull_request.draft == false + # if: github.event.pull_request.draft == false # FIXME strategy: fail-fast: false matrix: From 2aabf6adee4097356bb0277626b363305599db10 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 22:15:44 +0900 Subject: [PATCH 04/16] Revert "Update docker images to build" This reverts commit 9bd0844fa9fb2dba773eaba289c364f3743d721c. --- .github/workflows/cicd-pytorch_dockers.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cicd-pytorch_dockers.yml b/.github/workflows/cicd-pytorch_dockers.yml index 170cd6258df4e..4742f3579c274 100644 --- a/.github/workflows/cicd-pytorch_dockers.yml +++ b/.github/workflows/cicd-pytorch_dockers.yml @@ -30,8 +30,8 @@ jobs: fail-fast: false matrix: # the config used in '.azure-pipelines/gpu-tests.yml' since the Dockerfile uses the cuda image - python_version: ["3.10"] - pytorch_version: ["1.11", "1.12"] + python_version: ["3.9"] + pytorch_version: ["1.10", "1.11"] steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 @@ -50,8 +50,8 @@ jobs: fail-fast: false matrix: # the config used in '.circleci/config.yml`' - python_version: ["3.9", "3.10"] - xla_version: ["1.12"] + python_version: ["3.7"] + xla_version: ["1.11"] steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 @@ -86,11 +86,12 @@ jobs: matrix: include: # the config used in '.azure-pipelines/gpu-tests.yml' - # Some are used in different projects such as tutorials. + - {python_version: "3.7", pytorch_version: "1.10", cuda_version: "11.1", ubuntu_version: "20.04"} + - {python_version: "3.7", pytorch_version: "1.11", cuda_version: "11.3.1", ubuntu_version: "20.04"} + # latest (used in Tutorials) - {python_version: "3.8", pytorch_version: "1.9", cuda_version: "11.1", ubuntu_version: "20.04"} - {python_version: "3.9", pytorch_version: "1.10", cuda_version: "11.1", ubuntu_version: "20.04"} - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1", ubuntu_version: "20.04"} - - {python_version: "3.10", pytorch_version: "1.12", cuda_version: "11.6.1", ubuntu_version: "20.04"} steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 @@ -129,7 +130,8 @@ jobs: - {python_version: "3.8", pytorch_version: "1.9", cuda_version: "11.1"} - {python_version: "3.8", pytorch_version: "1.10", cuda_version: "11.1"} - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1"} - - {python_version: "3.10", pytorch_version: "1.12", cuda_version: "11.6.1"} + # nightly: add when there's a release candidate + # - {python_version: "3.9", pytorch_version: "1.12"} steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 From dad0c07bd34b15b3e370a41a1825400b0f4c8a54 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 22:18:01 +0900 Subject: [PATCH 05/16] Update slow --- .github/workflows/ci-pytorch_test-conda.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pytorch_test-conda.yml b/.github/workflows/ci-pytorch_test-conda.yml index 65bee898a6345..1224ab73b97de 100644 --- a/.github/workflows/ci-pytorch_test-conda.yml +++ b/.github/workflows/ci-pytorch_test-conda.yml @@ -27,7 +27,7 @@ jobs: - {python-version: "3.8", pytorch-version: "1.9"} - {python-version: "3.8", pytorch-version: "1.10"} - {python-version: "3.9", pytorch-version: "1.11"} - - {python-version: "3.9", pytorch-version: "1.12"} + - {python-version: "3.10", pytorch-version: "1.12"} timeout-minutes: 30 From 282cbc5f46f74958697a4fd18f1af783e6ca6c5f Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 22:19:53 +0900 Subject: [PATCH 06/16] Always run cpu tests --- .github/workflows/ci-pytorch_test-conda.yml | 13 +------------ .github/workflows/ci-pytorch_test-full.yml | 13 +------------ .github/workflows/ci-pytorch_test-slow.yml | 13 +------------ 3 files changed, 3 insertions(+), 36 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-conda.yml b/.github/workflows/ci-pytorch_test-conda.yml index 1224ab73b97de..545fef9d8d2b6 100644 --- a/.github/workflows/ci-pytorch_test-conda.yml +++ b/.github/workflows/ci-pytorch_test-conda.yml @@ -44,18 +44,7 @@ jobs: - name: Decide if the test should be skipped id: skip shell: bash -l {0} - run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' - echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt - MATCHES=$(cat changed_files.txt | grep -E $FILTER) - echo $MATCHES - if [ -z "$MATCHES" ]; then - echo "Skip" - echo "::set-output name=continue::0" - else - echo "Continue" - echo "::set-output name=continue::1" - fi + run: echo "::set-output name=continue::1" - name: Update base dependencies if: ${{ (steps.skip.outputs.continue == '1') }} diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index c94d94dc89c34..5d5cf7ca436e9 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -40,18 +40,7 @@ jobs: - name: Decide if the test should be skipped id: skip shell: bash -l {0} - run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' - echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt - MATCHES=$(cat changed_files.txt | grep -E $FILTER) - echo $MATCHES - if [ -z "$MATCHES" ]; then - echo "Skip" - echo "::set-output name=continue::0" - else - echo "Continue" - echo "::set-output name=continue::1" - fi + run: echo "::set-output name=continue::1" - name: Set up Python ${{ matrix.python-version }} if: ${{ (steps.skip.outputs.continue == '1') }} diff --git a/.github/workflows/ci-pytorch_test-slow.yml b/.github/workflows/ci-pytorch_test-slow.yml index 47bf8f502573c..f429e4184e8e2 100644 --- a/.github/workflows/ci-pytorch_test-slow.yml +++ b/.github/workflows/ci-pytorch_test-slow.yml @@ -35,18 +35,7 @@ jobs: - name: Decide if the test should be skipped id: skip shell: bash -l {0} - run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' - echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt - MATCHES=$(cat changed_files.txt | grep -E $FILTER) - echo $MATCHES - if [ -z "$MATCHES" ]; then - echo "Skip" - echo "::set-output name=continue::0" - else - echo "Continue" - echo "::set-output name=continue::1" - fi + run: echo "::set-output name=continue::1" - uses: actions/setup-python@v2 if: ${{ (steps.skip.outputs.continue == '1') }} From 1c197f848e0b9ba3872adbe03f6064f327b6b521 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 22:29:42 +0900 Subject: [PATCH 07/16] Exclude Python 3.10 with oldest --- .github/workflows/ci-pytorch_test-full.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 5d5cf7ca436e9..b9469257679f5 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -24,6 +24,9 @@ jobs: python-version: ["3.7", "3.10"] # minimum, maximum requires: ["oldest", "latest"] release: ["stable"] + exclude: + # There's no distribution of PyTorch 1.11 or 1.12 for Python 3.10 + - {python-version: "3.10", requires: "oldest"} # TODO: re-enable RC testing # include: # - {os: ubuntu-20.04, python-version: "3.10", requires: "latest", release: "pre"} From c2ba1a3741f00822c90884bc37f9e05d0c4a4c6a Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 22:38:12 +0900 Subject: [PATCH 08/16] revertme: run on draft --- .github/workflows/ci-pytorch_test-slow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-pytorch_test-slow.yml b/.github/workflows/ci-pytorch_test-slow.yml index f429e4184e8e2..7393ffbcb7cd0 100644 --- a/.github/workflows/ci-pytorch_test-slow.yml +++ b/.github/workflows/ci-pytorch_test-slow.yml @@ -15,7 +15,7 @@ concurrency: jobs: slow: runs-on: ${{ matrix.os }} - if: github.event.pull_request.draft == false + # if: github.event.pull_request.draft == false # FIXME strategy: fail-fast: false matrix: From 1e445932b176816f2b5b58770ec19e24a6594cc1 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Mon, 25 Jul 2022 22:44:47 +0900 Subject: [PATCH 09/16] docker build base-conda 3.10 --- .github/workflows/cicd-pytorch_dockers.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/cicd-pytorch_dockers.yml b/.github/workflows/cicd-pytorch_dockers.yml index 4742f3579c274..309bf9154315b 100644 --- a/.github/workflows/cicd-pytorch_dockers.yml +++ b/.github/workflows/cicd-pytorch_dockers.yml @@ -130,6 +130,8 @@ jobs: - {python_version: "3.8", pytorch_version: "1.9", cuda_version: "11.1"} - {python_version: "3.8", pytorch_version: "1.10", cuda_version: "11.1"} - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1"} + - {python_version: "3.10", pytorch_version: "1.11", cuda_version: "11.3.1"} + - {python_version: "3.10", pytorch_version: "1.12", cuda_version: "11.6.0"} # nightly: add when there's a release candidate # - {python_version: "3.9", pytorch_version: "1.12"} steps: From 0d0840d003bcf9a1463bb0ce23da049c7f03dc72 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sat, 6 Aug 2022 08:53:13 +0900 Subject: [PATCH 10/16] Update conda docker images --- .github/workflows/cicd-pytorch_dockers.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/cicd-pytorch_dockers.yml b/.github/workflows/cicd-pytorch_dockers.yml index 61b7e871b3498..7fc2fbea19c57 100644 --- a/.github/workflows/cicd-pytorch_dockers.yml +++ b/.github/workflows/cicd-pytorch_dockers.yml @@ -129,10 +129,7 @@ jobs: - {python_version: "3.8", pytorch_version: "1.9", cuda_version: "11.1.1"} - {python_version: "3.8", pytorch_version: "1.10", cuda_version: "11.1.1"} - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1"} - - {python_version: "3.10", pytorch_version: "1.11", cuda_version: "11.3.1"} - - {python_version: "3.10", pytorch_version: "1.12", cuda_version: "11.6.0"} - # nightly: add when there's a release candidate - # - {python_version: "3.9", pytorch_version: "1.12"} + - {python_version: "3.10", pytorch_version: "1.12", cuda_version: "11.3.1"} steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 From a34844d24d1edaeaacafcd7e4799c6216decc5ca Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sat, 6 Aug 2022 09:01:41 +0900 Subject: [PATCH 11/16] revert --- .github/workflows/ci-pytorch_test-full.yml | 2 +- .github/workflows/ci-pytorch_test-slow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index a959852e6cae8..9ef4567bcbd44 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -16,7 +16,7 @@ jobs: cpu: runs-on: ${{ matrix.os }} - # if: github.event.pull_request.draft == false # FIXME + if: github.event.pull_request.draft == false strategy: fail-fast: false matrix: diff --git a/.github/workflows/ci-pytorch_test-slow.yml b/.github/workflows/ci-pytorch_test-slow.yml index ebd4fac0b257c..d8dc4702ddfcf 100644 --- a/.github/workflows/ci-pytorch_test-slow.yml +++ b/.github/workflows/ci-pytorch_test-slow.yml @@ -15,7 +15,7 @@ concurrency: jobs: slow: runs-on: ${{ matrix.os }} - # if: github.event.pull_request.draft == false # FIXME + if: github.event.pull_request.draft == false strategy: fail-fast: false matrix: From 9f428b0c76f4dfbb1e594c8bbd2f66a863cb6561 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sat, 6 Aug 2022 09:34:20 +0900 Subject: [PATCH 12/16] Revert "Always run cpu tests" This reverts commit 282cbc5f46f74958697a4fd18f1af783e6ca6c5f. --- .github/workflows/ci-pytorch_test-conda.yml | 13 ++++++++++++- .github/workflows/ci-pytorch_test-full.yml | 13 ++++++++++++- .github/workflows/ci-pytorch_test-slow.yml | 13 ++++++++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-conda.yml b/.github/workflows/ci-pytorch_test-conda.yml index e2ac14a6fa1f9..f9059c9ac64d2 100644 --- a/.github/workflows/ci-pytorch_test-conda.yml +++ b/.github/workflows/ci-pytorch_test-conda.yml @@ -44,7 +44,18 @@ jobs: - name: Decide if the test should be skipped id: skip shell: bash -l {0} - run: echo "::set-output name=continue::1" + run: | + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' + echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt + MATCHES=$(cat changed_files.txt | grep -E $FILTER) + echo $MATCHES + if [ -z "$MATCHES" ]; then + echo "Skip" + echo "::set-output name=continue::0" + else + echo "Continue" + echo "::set-output name=continue::1" + fi - name: Update base dependencies if: ${{ (steps.skip.outputs.continue == '1') }} diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 9ef4567bcbd44..aa89633eabb6e 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -43,7 +43,18 @@ jobs: - name: Decide if the test should be skipped id: skip shell: bash -l {0} - run: echo "::set-output name=continue::1" + run: | + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' + echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt + MATCHES=$(cat changed_files.txt | grep -E $FILTER) + echo $MATCHES + if [ -z "$MATCHES" ]; then + echo "Skip" + echo "::set-output name=continue::0" + else + echo "Continue" + echo "::set-output name=continue::1" + fi - name: Set up Python ${{ matrix.python-version }} if: ${{ (steps.skip.outputs.continue == '1') }} diff --git a/.github/workflows/ci-pytorch_test-slow.yml b/.github/workflows/ci-pytorch_test-slow.yml index d8dc4702ddfcf..905f60aa85699 100644 --- a/.github/workflows/ci-pytorch_test-slow.yml +++ b/.github/workflows/ci-pytorch_test-slow.yml @@ -35,7 +35,18 @@ jobs: - name: Decide if the test should be skipped id: skip shell: bash -l {0} - run: echo "::set-output name=continue::1" + run: | + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' + echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt + MATCHES=$(cat changed_files.txt | grep -E $FILTER) + echo $MATCHES + if [ -z "$MATCHES" ]; then + echo "Skip" + echo "::set-output name=continue::0" + else + echo "Continue" + echo "::set-output name=continue::1" + fi - uses: actions/setup-python@v4 if: ${{ (steps.skip.outputs.continue == '1') }} From 4a8a8ca376bd2263877fff7560330cbc83930042 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sat, 6 Aug 2022 09:36:55 +0900 Subject: [PATCH 13/16] Fix changed file detector --- .github/workflows/ci-pytorch_test-conda.yml | 2 +- .github/workflows/ci-pytorch_test-full.yml | 2 +- .github/workflows/ci-pytorch_test-slow.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-conda.yml b/.github/workflows/ci-pytorch_test-conda.yml index f9059c9ac64d2..23356890d2597 100644 --- a/.github/workflows/ci-pytorch_test-conda.yml +++ b/.github/workflows/ci-pytorch_test-conda.yml @@ -45,7 +45,7 @@ jobs: id: skip shell: bash -l {0} run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*|.github/workflows/ci-pytorch_test-conda.yml' echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index aa89633eabb6e..7c3a99a6b5237 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -44,7 +44,7 @@ jobs: id: skip shell: bash -l {0} run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*|.github/workflows/ci-pytorch_test-full.yml' echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES diff --git a/.github/workflows/ci-pytorch_test-slow.yml b/.github/workflows/ci-pytorch_test-slow.yml index 905f60aa85699..b3756bbe8c2f7 100644 --- a/.github/workflows/ci-pytorch_test-slow.yml +++ b/.github/workflows/ci-pytorch_test-slow.yml @@ -36,7 +36,7 @@ jobs: id: skip shell: bash -l {0} run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*|.github/workflows/ci-pytorch_test-slow.yml' echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES From 4db22272eb0e15898354563795e1010b64a6c5aa Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sat, 6 Aug 2022 09:39:23 +0900 Subject: [PATCH 14/16] Revert everything for conda jobs --- .github/workflows/ci-pytorch_test-conda.yml | 4 ++-- .github/workflows/cicd-pytorch_dockers.yml | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-pytorch_test-conda.yml b/.github/workflows/ci-pytorch_test-conda.yml index 23356890d2597..777ec2af759a0 100644 --- a/.github/workflows/ci-pytorch_test-conda.yml +++ b/.github/workflows/ci-pytorch_test-conda.yml @@ -27,7 +27,7 @@ jobs: - {python-version: "3.8", pytorch-version: "1.9"} - {python-version: "3.8", pytorch-version: "1.10"} - {python-version: "3.9", pytorch-version: "1.11"} - - {python-version: "3.10", pytorch-version: "1.12"} + - {python-version: "3.9", pytorch-version: "1.12"} timeout-minutes: 30 @@ -45,7 +45,7 @@ jobs: id: skip shell: bash -l {0} run: | - FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*|.github/workflows/ci-pytorch_test-conda.yml' + FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*' echo "${{ steps.changed-files.outputs.all_changed_files }}" | tr " " "\n" > changed_files.txt MATCHES=$(cat changed_files.txt | grep -E $FILTER) echo $MATCHES diff --git a/.github/workflows/cicd-pytorch_dockers.yml b/.github/workflows/cicd-pytorch_dockers.yml index 7fc2fbea19c57..a6ba2ac4aa5f4 100644 --- a/.github/workflows/cicd-pytorch_dockers.yml +++ b/.github/workflows/cicd-pytorch_dockers.yml @@ -129,7 +129,8 @@ jobs: - {python_version: "3.8", pytorch_version: "1.9", cuda_version: "11.1.1"} - {python_version: "3.8", pytorch_version: "1.10", cuda_version: "11.1.1"} - {python_version: "3.9", pytorch_version: "1.11", cuda_version: "11.3.1"} - - {python_version: "3.10", pytorch_version: "1.12", cuda_version: "11.3.1"} + # nightly: add when there's a release candidate + # - {python_version: "3.9", pytorch_version: "1.12"} steps: - uses: actions/checkout@v2 - uses: docker/setup-buildx-action@v2 From 6d23cbf78fafc2ae1f5a6c59d97485fe7d144189 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sat, 6 Aug 2022 09:41:07 +0900 Subject: [PATCH 15/16] Update ci docs --- .github/workflows/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 8b9e7d173b03c..f559551e1237f 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -6,7 +6,7 @@ | workflow name | workflow file | action | accelerator\* | (Python, PyTorch) | OS | | -------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- | ------------------------------------------------ | ------------------- | -| Test full | .github/workflows/ci_test-full.yml | Run all tests except for accelerator-specific, standalone and slow tests. | CPU | (3.7, 1.8), (3.7, 1.11), (3.9, 1.8), (3.9, 1.12) | linux, mac, windows | +| Test full | .github/workflows/ci_test-full.yml | Run all tests except for accelerator-specific, standalone and slow tests. | CPU | (3.7, 1.9), (3.7, 1.12), (3.10, 1.12) | linux, mac, windows | | Test with Conda | .github/workflows/ci_test-conda.yml | Same as ci_test-full.yml but with dependencies installed with conda. | CPU | (3.8, 1.8), (3.8, 1.9), (3.8, 1.10), (3.9, 1.12) | linux | | Test slow | .github/workflows/ci_test-slow.yml | Run only slow tests. Slow tests usually need to spawn threads and cannot be speed up or simplified. | CPU | (3.7, 1.8) | linux, mac, windows | | pytorch-lightning (IPUs) | .azure-pipelines/ipu-tests.yml | Run only IPU-specific tests. | IPU | (3.8, 1.9) | linux | From 79cfbd3676e69928d0236a314cc6ca40e35a0ed2 Mon Sep 17 00:00:00 2001 From: Akihiro Nitta Date: Sat, 6 Aug 2022 09:53:53 +0900 Subject: [PATCH 16/16] Update comment --- .github/workflows/ci-pytorch_test-full.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-pytorch_test-full.yml b/.github/workflows/ci-pytorch_test-full.yml index 7c3a99a6b5237..445707d340c4b 100644 --- a/.github/workflows/ci-pytorch_test-full.yml +++ b/.github/workflows/ci-pytorch_test-full.yml @@ -25,7 +25,8 @@ jobs: requires: ["oldest", "latest"] release: ["stable"] exclude: - # There's no distribution of PyTorch 1.11 or 1.12 for Python 3.10 + # There's no distribution of the oldest PyTorch 1.9 for Python 3.10. + # TODO: Remove the exclusion when dropping PyTorch 1.9 support. - {python-version: "3.10", requires: "oldest"} # TODO: re-enable RC testing # include: