From dbf6afcf6b00a60306fdb67eb45482850c81ed76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Wed, 7 Sep 2022 21:43:22 +0200 Subject: [PATCH 1/2] Update checkgroup config --- .github/checkgroup.yml | 59 +++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 9 deletions(-) diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml index e8892926f6e55..e97f9f888371f 100644 --- a/.github/checkgroup.yml +++ b/.github/checkgroup.yml @@ -6,6 +6,7 @@ subprojects: - id: "CI: CircleCI" paths: - ".circleci/**" + - ".github/workflows/ci-circleci.yml" checks: - "test-on-tpus" @@ -25,7 +26,6 @@ subprojects: - "src/pytorch_lightning/**" - "tests/tests_pytorch/**" - "setup.cfg" # includes pytest config - - ".github/workflows/ci-pytorch*.yml" - ".github/workflows/docs-*.yml" checks: - "pl-conda (3.8, 1.10)" @@ -41,6 +41,25 @@ subprojects: - "pl-cpu (windows-2022, 3.10, latest, stable)" - "pl-cpu (windows-2022, 3.7, latest, stable)" - "pl-cpu (windows-2022, 3.7, oldest, stable)" + - "make-doctest (pytorch)" + - "make-html (pytorch)" + - "mypy" + - "PR Gatekeeper (pytorch)" + - "pytorch-lightning (GPUs)" + - "pytorch-lightning (HPUs)" + - "pytorch-lightning (IPUs)" + - "pl-slow (macOS-11, 3.7, 1.11)" + - "pl-slow (ubuntu-20.04, 3.7, 1.11)" + - "pl-slow (windows-2022, 3.7, 1.11)" + - "test-on-tpus" + + - id: "lightning_lite" + paths: + - "requirements/lite/**" + - "src/lightning_lite/**" + - "tests/tests_lite/**" + - "setup.cfg" # includes pytest config + checks: - "lite-cpu (macOS-11, 3.10, latest, stable)" - "lite-cpu (macOS-11, 3.7, latest, stable)" - "lite-cpu (macOS-11, 3.7, oldest, stable)" @@ -50,17 +69,38 @@ subprojects: - "lite-cpu (windows-2022, 3.10, latest, stable)" - "lite-cpu (windows-2022, 3.7, latest, stable)" - "lite-cpu (windows-2022, 3.7, oldest, stable)" - - "make-doctest (pytorch)" - - "make-html (pytorch)" - "mypy" - - "PR Gatekeeper (pytorch)" - - "pytorch-lightning (GPUs)" - - "pytorch-lightning (HPUs)" - - "pytorch-lightning (IPUs)" + + - id: "pytorch_lightning: Conda" + paths: + - ".github/workflows/ci-pytorch-test-conda.yml" + checks: + - "pl-conda (3.8, 1.10)" + - "pl-conda (3.8, 1.9)" + - "pl-conda (3.9, 1.11)" + - "pl-conda (3.9, 1.12)" + + - id: "pytorch_lightning: CPU" + paths: + - ".github/workflows/ci-pytorch-test-full.yml" + checks: + - "pl-cpu (macOS-11, 3.10, latest, stable)" + - "pl-cpu (macOS-11, 3.7, latest, stable)" + - "pl-cpu (macOS-11, 3.7, oldest, stable)" + - "pl-cpu (ubuntu-20.04, 3.10, latest, stable)" + - "pl-cpu (ubuntu-20.04, 3.7, latest, stable)" + - "pl-cpu (ubuntu-20.04, 3.7, oldest, stable)" + - "pl-cpu (windows-2022, 3.10, latest, stable)" + - "pl-cpu (windows-2022, 3.7, latest, stable)" + - "pl-cpu (windows-2022, 3.7, oldest, stable)" + + - id: "pytorch_lightning: Slow" + paths: + - ".github/workflows/ci-pytorch-test-slow.yml" + checks: - "pl-slow (macOS-11, 3.7, 1.11)" - "pl-slow (ubuntu-20.04, 3.7, 1.11)" - "pl-slow (windows-2022, 3.7, 1.11)" - - "test-on-tpus" - id: "pytorch_lightning: Azure GPU" paths: @@ -101,6 +141,7 @@ subprojects: - id: "pytorch_lightning: Docker" paths: - "dockers/**" + - ".github/workflows/ci-pytorch-dockers.yml" - "requirements.txt" - "requirements/*.txt" - "requirements/pytorch/*" @@ -126,7 +167,7 @@ subprojects: - "build-pl (3.9, 1.9, 11.1.1)" - "build-xla (3.7, 1.12)" - - id: "pytorch_lightning: mypy" + - id: "mypy" paths: - ".github/workflows/code-checks.yml" - "pyproject.toml" # includes mypy config From 3a0728cfe57fc26ff312473135c90e7e2e753ed4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mochol=C3=AD?= Date: Wed, 7 Sep 2022 22:16:24 +0200 Subject: [PATCH 2/2] TODO and reorganize --- .github/checkgroup.yml | 66 ++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 28 deletions(-) diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml index e97f9f888371f..6acef1517738c 100644 --- a/.github/checkgroup.yml +++ b/.github/checkgroup.yml @@ -3,6 +3,9 @@ custom_service_name: "Lightning CI required checker" # changes made in pull requests from different branches or forks are ignored. This means that changes to this file # will only be used after they are merged. subprojects: + + # SECTION: pytorch_lightning + - id: "CI: CircleCI" paths: - ".circleci/**" @@ -53,24 +56,6 @@ subprojects: - "pl-slow (windows-2022, 3.7, 1.11)" - "test-on-tpus" - - id: "lightning_lite" - paths: - - "requirements/lite/**" - - "src/lightning_lite/**" - - "tests/tests_lite/**" - - "setup.cfg" # includes pytest config - checks: - - "lite-cpu (macOS-11, 3.10, latest, stable)" - - "lite-cpu (macOS-11, 3.7, latest, stable)" - - "lite-cpu (macOS-11, 3.7, oldest, stable)" - - "lite-cpu (ubuntu-20.04, 3.10, latest, stable)" - - "lite-cpu (ubuntu-20.04, 3.7, latest, stable)" - - "lite-cpu (ubuntu-20.04, 3.7, oldest, stable)" - - "lite-cpu (windows-2022, 3.10, latest, stable)" - - "lite-cpu (windows-2022, 3.7, latest, stable)" - - "lite-cpu (windows-2022, 3.7, oldest, stable)" - - "mypy" - - id: "pytorch_lightning: Conda" paths: - ".github/workflows/ci-pytorch-test-conda.yml" @@ -109,13 +94,6 @@ subprojects: checks: - "pytorch-lightning (GPUs)" - - id: "lightning_lite: Azure GPU" - paths: - - ".azure/gpu-tests-lite.yml" - - "tests/tests_lite/run_standalone_*.sh" - checks: - - "lightning-lite (GPUs)" - - id: "pytorch_lightning: Azure HPU" paths: - ".azure/hpu-tests.yml" @@ -167,12 +145,35 @@ subprojects: - "build-pl (3.9, 1.9, 11.1.1)" - "build-xla (3.7, 1.12)" - - id: "mypy" + # SECTION: lightning_lite + + - id: "lightning_lite" paths: - - ".github/workflows/code-checks.yml" - - "pyproject.toml" # includes mypy config + - "requirements/lite/**" + - "src/lightning_lite/**" + - "tests/tests_lite/**" + - "setup.cfg" # includes pytest config checks: + - "lite-cpu (macOS-11, 3.10, latest, stable)" + - "lite-cpu (macOS-11, 3.7, latest, stable)" + - "lite-cpu (macOS-11, 3.7, oldest, stable)" + - "lite-cpu (ubuntu-20.04, 3.10, latest, stable)" + - "lite-cpu (ubuntu-20.04, 3.7, latest, stable)" + - "lite-cpu (ubuntu-20.04, 3.7, oldest, stable)" + - "lite-cpu (windows-2022, 3.10, latest, stable)" + - "lite-cpu (windows-2022, 3.7, latest, stable)" + - "lite-cpu (windows-2022, 3.7, oldest, stable)" - "mypy" + # TODO: lite should also require (some?) pl checks. this also requires that the path filters are modified + + - id: "lightning_lite: Azure GPU" + paths: + - ".azure/gpu-tests-lite.yml" + - "tests/tests_lite/run_standalone_*.sh" + checks: + - "lightning-lite (GPUs)" + + # SECTION: lightning_app - id: "lightning_app" paths: @@ -215,6 +216,15 @@ subprojects: - "make-doctest (app)" - "make-html (app)" + # SECTION: common + + - id: "mypy" + paths: + - ".github/workflows/code-checks.yml" + - "pyproject.toml" # includes mypy config + checks: + - "mypy" + - id: "install" paths: - ".actions/setup_tools.py"