From 164789da35aaad10ea07b5dfdcc557d4d89415ea Mon Sep 17 00:00:00 2001 From: Jirka B Date: Tue, 11 Mar 2025 13:38:30 +0100 Subject: [PATCH 1/3] ci: aggregate checks with guardian --- .github/workflows/ci-pkg-install.yml | 15 +++++++++++++++ .github/workflows/ci-tests-fabric.yml | 15 +++++++++++++++ .github/workflows/ci-tests-pytorch.yml | 15 +++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/.github/workflows/ci-pkg-install.yml b/.github/workflows/ci-pkg-install.yml index 61055c9b5ac3d..35b369ad69ba3 100644 --- a/.github/workflows/ci-pkg-install.yml +++ b/.github/workflows/ci-pkg-install.yml @@ -103,3 +103,18 @@ jobs: LIGHTING_TESTING: 1 # path for require wrapper PY_IGNORE_IMPORTMISMATCH: 1 run: python -m pytest src/lit/${PKG_NAME} --ignore-glob="**/cli/*-template/**" --doctest-plus + + + install-pkg-guardian: + runs-on: ubuntu-latest + needs: install-pkg + if: always() + steps: + - run: echo "${{ needs.install-pkg.result }}" + - name: failing... + if: needs.install-pkg.result == 'failure' + run: exit 1 + - name: cancelled or skipped... + if: contains(fromJSON('["cancelled", "skipped"]'), needs.install-pkg.result) + timeout-minutes: 1 + run: sleep 90 diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml index c6d1dbf5b5ff2..8225628bb2548 100644 --- a/.github/workflows/ci-tests-fabric.yml +++ b/.github/workflows/ci-tests-fabric.yml @@ -186,3 +186,18 @@ jobs: flags: ${{ env.COVERAGE_SCOPE }},cpu,pytest,python${{ matrix.python-version }} name: CPU-coverage fail_ci_if_error: false + + + fabric-cpu-guardian: + runs-on: ubuntu-latest + needs: fabric-cpu + if: always() + steps: + - run: echo "${{ needs.fabric-cpu.result }}" + - name: failing... + if: needs.fabric-cpu.result == 'failure' + run: exit 1 + - name: cancelled or skipped... + if: contains(fromJSON('["cancelled", "skipped"]'), needs.fabric-cpu.result) + timeout-minutes: 1 + run: sleep 90 diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml index 0112d21d33a5c..0de3d9f4b7df6 100644 --- a/.github/workflows/ci-tests-pytorch.yml +++ b/.github/workflows/ci-tests-pytorch.yml @@ -223,3 +223,18 @@ jobs: flags: ${{ env.COVERAGE_SCOPE }},cpu,pytest-full,python${{ matrix.python-version }},pytorch${{ matrix.pytorch-version }} name: CPU-coverage fail_ci_if_error: false + + + pl-cpu-guardian: + runs-on: ubuntu-latest + needs: pl-cpu + if: always() + steps: + - run: echo "${{ needs.pl-cpu.result }}" + - name: failing... + if: needs.pl-cpu.result == 'failure' + run: exit 1 + - name: cancelled or skipped... + if: contains(fromJSON('["cancelled", "skipped"]'), needs.pl-cpu.result) + timeout-minutes: 1 + run: sleep 90 From c28cf75420468779dcc2a228273687e6d8fabb56 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 12:41:12 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- .github/workflows/ci-pkg-install.yml | 1 - .github/workflows/ci-tests-fabric.yml | 1 - .github/workflows/ci-tests-pytorch.yml | 1 - 3 files changed, 3 deletions(-) diff --git a/.github/workflows/ci-pkg-install.yml b/.github/workflows/ci-pkg-install.yml index 35b369ad69ba3..6e38c26f4174e 100644 --- a/.github/workflows/ci-pkg-install.yml +++ b/.github/workflows/ci-pkg-install.yml @@ -104,7 +104,6 @@ jobs: PY_IGNORE_IMPORTMISMATCH: 1 run: python -m pytest src/lit/${PKG_NAME} --ignore-glob="**/cli/*-template/**" --doctest-plus - install-pkg-guardian: runs-on: ubuntu-latest needs: install-pkg diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml index 8225628bb2548..fb8d4db43f0e4 100644 --- a/.github/workflows/ci-tests-fabric.yml +++ b/.github/workflows/ci-tests-fabric.yml @@ -187,7 +187,6 @@ jobs: name: CPU-coverage fail_ci_if_error: false - fabric-cpu-guardian: runs-on: ubuntu-latest needs: fabric-cpu diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml index 0de3d9f4b7df6..20049c725293e 100644 --- a/.github/workflows/ci-tests-pytorch.yml +++ b/.github/workflows/ci-tests-pytorch.yml @@ -224,7 +224,6 @@ jobs: name: CPU-coverage fail_ci_if_error: false - pl-cpu-guardian: runs-on: ubuntu-latest needs: pl-cpu From e8f71f3e266505b420bf5b13d7cd3c0042d98da3 Mon Sep 17 00:00:00 2001 From: Jirka B Date: Tue, 11 Mar 2025 13:55:54 +0100 Subject: [PATCH 3/3] gc --- .github/checkgroup.yml | 75 ++---------------------------------------- 1 file changed, 3 insertions(+), 72 deletions(-) diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml index 742d748ed00c6..271284635b638 100644 --- a/.github/checkgroup.yml +++ b/.github/checkgroup.yml @@ -19,30 +19,7 @@ subprojects: - "!*.md" - "!**/*.md" checks: - - "pl-cpu (macOS-14, lightning, 3.9, 2.1, oldest)" - - "pl-cpu (macOS-14, lightning, 3.10, 2.1)" - - "pl-cpu (macOS-14, lightning, 3.11, 2.2.2)" - - "pl-cpu (macOS-14, lightning, 3.11, 2.3)" - - "pl-cpu (macOS-14, lightning, 3.12.7, 2.4.1)" - - "pl-cpu (macOS-14, lightning, 3.12.7, 2.5.1)" - - "pl-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)" - - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)" - - "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.2.2)" - - "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.3)" - - "pl-cpu (ubuntu-22.04, lightning, 3.12.7, 2.4.1)" - - "pl-cpu (ubuntu-22.04, lightning, 3.12.7, 2.5.1)" - - "pl-cpu (windows-2022, lightning, 3.9, 2.1, oldest)" - - "pl-cpu (windows-2022, lightning, 3.10, 2.1)" - - "pl-cpu (windows-2022, lightning, 3.11, 2.2.2)" - - "pl-cpu (windows-2022, lightning, 3.11, 2.3)" - - "pl-cpu (windows-2022, lightning, 3.12.7, 2.4.1)" - - "pl-cpu (windows-2022, lightning, 3.12.7, 2.5.1)" - - "pl-cpu (macOS-14, pytorch, 3.9, 2.1)" - - "pl-cpu (ubuntu-20.04, pytorch, 3.9, 2.1)" - - "pl-cpu (windows-2022, pytorch, 3.9, 2.1)" - - "pl-cpu (macOS-14, pytorch, 3.12.7, 2.5.1)" - - "pl-cpu (ubuntu-22.04, pytorch, 3.12.7, 2.5.1)" - - "pl-cpu (windows-2022, pytorch, 3.12.7, 2.5.1)" + - "pl-cpu-guardian" # aggregated check for all cases - id: "pytorch_lightning: Azure GPU" paths: @@ -172,30 +149,7 @@ subprojects: - "!*.md" - "!**/*.md" checks: - - "fabric-cpu (macOS-14, lightning, 3.9, 2.1, oldest)" - - "fabric-cpu (macOS-14, lightning, 3.10, 2.1)" - - "fabric-cpu (macOS-14, lightning, 3.11, 2.2.2)" - - "fabric-cpu (macOS-14, lightning, 3.11, 2.3)" - - "fabric-cpu (macOS-14, lightning, 3.12.7, 2.4.1)" - - "fabric-cpu (macOS-14, lightning, 3.12.7, 2.5.1)" - - "fabric-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)" - - "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.1)" - - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2.2)" - - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.3)" - - "fabric-cpu (ubuntu-22.04, lightning, 3.12.7, 2.4.1)" - - "fabric-cpu (ubuntu-22.04, lightning, 3.12.7, 2.5.1)" - - "fabric-cpu (windows-2022, lightning, 3.9, 2.1, oldest)" - - "fabric-cpu (windows-2022, lightning, 3.10, 2.1)" - - "fabric-cpu (windows-2022, lightning, 3.11, 2.2.2)" - - "fabric-cpu (windows-2022, lightning, 3.11, 2.3)" - - "fabric-cpu (windows-2022, lightning, 3.12.7, 2.4.1)" - - "fabric-cpu (windows-2022, lightning, 3.12.7, 2.5.1)" - - "fabric-cpu (macOS-14, fabric, 3.9, 2.1)" - - "fabric-cpu (ubuntu-20.04, fabric, 3.9, 2.1)" - - "fabric-cpu (windows-2022, fabric, 3.9, 2.1)" - - "fabric-cpu (macOS-14, fabric, 3.12.7, 2.5.1)" - - "fabric-cpu (ubuntu-22.04, fabric, 3.12.7, 2.5.1)" - - "fabric-cpu (windows-2022, fabric, 3.12.7, 2.5.1)" + - "fabric-cpu-guardian" # aggregated check for all cases - id: "lightning_fabric: Azure GPU" paths: @@ -259,27 +213,4 @@ subprojects: - "!*.md" - "!**/*.md" checks: - - "install-pkg (ubuntu-22.04, fabric, 3.9)" - - "install-pkg (ubuntu-22.04, fabric, 3.11)" - - "install-pkg (ubuntu-22.04, pytorch, 3.9)" - - "install-pkg (ubuntu-22.04, pytorch, 3.11)" - - "install-pkg (ubuntu-22.04, lightning, 3.9)" - - "install-pkg (ubuntu-22.04, lightning, 3.11)" - - "install-pkg (ubuntu-22.04, notset, 3.9)" - - "install-pkg (ubuntu-22.04, notset, 3.11)" - - "install-pkg (macOS-14, fabric, 3.9)" - - "install-pkg (macOS-14, fabric, 3.11)" - - "install-pkg (macOS-14, pytorch, 3.9)" - - "install-pkg (macOS-14, pytorch, 3.11)" - - "install-pkg (macOS-14, lightning, 3.9)" - - "install-pkg (macOS-14, lightning, 3.11)" - - "install-pkg (macOS-14, notset, 3.9)" - - "install-pkg (macOS-14, notset, 3.11)" - - "install-pkg (windows-2022, fabric, 3.9)" - - "install-pkg (windows-2022, fabric, 3.11)" - - "install-pkg (windows-2022, pytorch, 3.9)" - - "install-pkg (windows-2022, pytorch, 3.11)" - - "install-pkg (windows-2022, lightning, 3.9)" - - "install-pkg (windows-2022, lightning, 3.11)" - - "install-pkg (windows-2022, notset, 3.9)" - - "install-pkg (windows-2022, notset, 3.11)" + - "install-pkg-guardian" # aggregated check for all cases