From b04a762d987f10e55a19e7a636002fa80ff5c06a Mon Sep 17 00:00:00 2001 From: Jirka Date: Fri, 26 Aug 2022 10:09:14 +0200 Subject: [PATCH 1/5] update CJ job names --- .github/workflows/ci-app-examples.yml | 2 +- .github/workflows/ci-app-tests.yml | 2 +- .github/workflows/ci-pytorch-test-conda.yml | 2 +- .github/workflows/ci-pytorch-test-full.yml | 2 +- .github/workflows/ci-pytorch-test-slow.yml | 2 +- .github/workflows/docs-checks.yml | 4 ++-- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci-app-examples.yml b/.github/workflows/ci-app-examples.yml index 8af5a2fc5a39e..737cf0c782456 100644 --- a/.github/workflows/ci-app-examples.yml +++ b/.github/workflows/ci-app-examples.yml @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} jobs: - pytest: + app-examples: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/ci-app-tests.yml b/.github/workflows/ci-app-tests.yml index 8d9c538eb665b..bbfe59ff6a3d3 100644 --- a/.github/workflows/ci-app-tests.yml +++ b/.github/workflows/ci-app-tests.yml @@ -16,7 +16,7 @@ concurrency: cancel-in-progress: ${{ github.ref != 'refs/heads/master' }} jobs: - pytest: + app-pytest: runs-on: ${{ matrix.os }} strategy: fail-fast: false diff --git a/.github/workflows/ci-pytorch-test-conda.yml b/.github/workflows/ci-pytorch-test-conda.yml index 2a63189caa019..79933a0268de7 100644 --- a/.github/workflows/ci-pytorch-test-conda.yml +++ b/.github/workflows/ci-pytorch-test-conda.yml @@ -16,7 +16,7 @@ defaults: shell: bash -l {0} jobs: - conda: + pl-conda: runs-on: ubuntu-20.04 container: pytorchlightning/pytorch_lightning:base-conda-py${{ matrix.python-version }}-torch${{ matrix.pytorch-version }} strategy: diff --git a/.github/workflows/ci-pytorch-test-full.yml b/.github/workflows/ci-pytorch-test-full.yml index 6f246e62e35fb..e1a95e4af10ae 100644 --- a/.github/workflows/ci-pytorch-test-full.yml +++ b/.github/workflows/ci-pytorch-test-full.yml @@ -14,7 +14,7 @@ concurrency: jobs: - cpu: + pl-cpu: runs-on: ${{ matrix.os }} if: github.event.pull_request.draft == false strategy: diff --git a/.github/workflows/ci-pytorch-test-slow.yml b/.github/workflows/ci-pytorch-test-slow.yml index 194a0bd910010..76748e365286c 100644 --- a/.github/workflows/ci-pytorch-test-slow.yml +++ b/.github/workflows/ci-pytorch-test-slow.yml @@ -13,7 +13,7 @@ concurrency: cancel-in-progress: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }} jobs: - slow: + pl-slow: runs-on: ${{ matrix.os }} if: github.event.pull_request.draft == false strategy: diff --git a/.github/workflows/docs-checks.yml b/.github/workflows/docs-checks.yml index 5b5a9aec778be..a91f216af963f 100644 --- a/.github/workflows/docs-checks.yml +++ b/.github/workflows/docs-checks.yml @@ -12,7 +12,7 @@ concurrency: cancel-in-progress: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }} jobs: - doctest: + make-doctest: runs-on: ubuntu-20.04 strategy: fail-fast: false @@ -63,7 +63,7 @@ jobs: make doctest make coverage - make-docs: + make-html: runs-on: ubuntu-20.04 strategy: fail-fast: false From c10f67c3e0386a4cf197ccd5321f9ae8dd605d58 Mon Sep 17 00:00:00 2001 From: Jirka Date: Fri, 26 Aug 2022 12:14:51 +0200 Subject: [PATCH 2/5] groups --- .github/checkgroup.yml | 66 +++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 30 deletions(-) diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml index ace786f8ac40a..531df1ebeaea8 100644 --- a/.github/checkgroup.yml +++ b/.github/checkgroup.yml @@ -28,29 +28,29 @@ subprojects: - ".github/workflows/ci-pytorch*.yml" - ".github/workflows/docs-*.yml" checks: - - "conda (3.8, 1.10)" - - "conda (3.8, 1.9)" - - "conda (3.9, 1.11)" - - "conda (3.9, 1.12)" - - "cpu (macOS-11, 3.10, latest, stable)" - - "cpu (macOS-11, 3.7, latest, stable)" - - "cpu (macOS-11, 3.7, oldest, stable)" - - "cpu (ubuntu-20.04, 3.10, latest, stable)" - - "cpu (ubuntu-20.04, 3.7, latest, stable)" - - "cpu (ubuntu-20.04, 3.7, oldest, stable)" - - "cpu (windows-2022, 3.10, latest, stable)" - - "cpu (windows-2022, 3.7, latest, stable)" - - "cpu (windows-2022, 3.7, oldest, stable)" - - "doctest (pytorch)" - - "make-docs (pytorch)" + - "pl-conda (3.8, 1.10)" + - "pl-conda (3.8, 1.9)" + - "pl-conda (3.9, 1.11)" + - "pl-conda (3.9, 1.12)" + - "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)" + - "make-doctest (pytorch)" + - "make-html (pytorch)" - "mypy" - "PR Gatekeeper (pytorch)" - "pytorch-lightning (GPUs)" - "pytorch-lightning (HPUs)" - "pytorch-lightning (IPUs)" - - "slow (macOS-11, 3.7, 1.11)" - - "slow (ubuntu-20.04, 3.7, 1.11)" - - "slow (windows-2022, 3.7, 1.11)" + - "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" @@ -79,8 +79,8 @@ subprojects: - "requirements/docs.txt" - "requirements/pytorch/**" checks: - - "doctest (pytorch)" - - "make-docs (pytorch)" + - "make-doctest (pytorch)" + - "make-html (pytorch)" - id: "pytorch_lightning: Docker" paths: @@ -127,14 +127,20 @@ subprojects: - "examples/app_*" checks: - "App.cloud-e2e" - - "doctest (app)" - - "make-docs (app)" - - "pytest (macOS-11, 3.8, latest)" - - "pytest (macOS-11, 3.8, oldest)" - - "pytest (ubuntu-20.04, 3.8, latest)" - - "pytest (ubuntu-20.04, 3.8, oldest)" - - "pytest (windows-2022, 3.8, latest)" - - "pytest (windows-2022, 3.8, oldest)" + - "make-doctest (app)" + - "make-html (app)" + - "app-examples (macOS-11, 3.8, latest)" + - "app-examples (macOS-11, 3.8, oldest)" + - "app-examples (ubuntu-20.04, 3.8, latest)" + - "app-examples (ubuntu-20.04, 3.8, oldest)" + - "app-examples (windows-2022, 3.8, latest)" + - "app-examples (windows-2022, 3.8, oldest)" + - "app-pytest (macOS-11, 3.8, latest)" + - "app-pytest (macOS-11, 3.8, oldest)" + - "app-pytest (ubuntu-20.04, 3.8, latest)" + - "app-pytest (ubuntu-20.04, 3.8, oldest)" + - "app-pytest (windows-2022, 3.8, latest)" + - "app-pytest (windows-2022, 3.8, oldest)" - id: "lightning_app: Azure" paths: @@ -149,8 +155,8 @@ subprojects: - "requirements/docs.txt" - "requirements/app/**" checks: - - "doctest (app)" - - "make-docs (app)" + - "make-doctest (app)" + - "make-html (app)" - id: "install" paths: From fb8d865d09347f36a97fd06545576b52aa7385dc Mon Sep 17 00:00:00 2001 From: Jirka Date: Fri, 26 Aug 2022 14:38:57 +0200 Subject: [PATCH 3/5] filter --- .github/workflows/ci-app-examples.yml | 7 +++++++ .github/workflows/ci-app-tests.yml | 2 ++ .github/workflows/ci-pytorch-test-slow.yml | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci-app-examples.yml b/.github/workflows/ci-app-examples.yml index 737cf0c782456..6bf195751265c 100644 --- a/.github/workflows/ci-app-examples.yml +++ b/.github/workflows/ci-app-examples.yml @@ -6,6 +6,13 @@ on: # Trigger the workflow on push or pull request, but only for the master bran branches: [master, "release/*"] pull_request: branches: [master, "release/*"] + paths: + - ".github/workflows/ci-app-examples.yml" + - "src/lightning_app/**" + - "tests/tests_app/**" + - "tests/tests_app_examples/**" + - "requirements/app/**" + - "setup.py" concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }} diff --git a/.github/workflows/ci-app-tests.yml b/.github/workflows/ci-app-tests.yml index bbfe59ff6a3d3..85629b205eee0 100644 --- a/.github/workflows/ci-app-tests.yml +++ b/.github/workflows/ci-app-tests.yml @@ -6,8 +6,10 @@ on: # Trigger the workflow on push or pull request, but only for the master bran branches: [master, "release/*"] pull_request: paths: + - ".github/workflows/ci-app-tests.yml" - "src/lightning_app/**" - "tests/tests_app/**" + - "tests/tests_app_examples/**" - "requirements/app/**" - "setup.py" diff --git a/.github/workflows/ci-pytorch-test-slow.yml b/.github/workflows/ci-pytorch-test-slow.yml index 76748e365286c..e54da79cbd38b 100644 --- a/.github/workflows/ci-pytorch-test-slow.yml +++ b/.github/workflows/ci-pytorch-test-slow.yml @@ -1,4 +1,4 @@ -name: Test PyTorch slow +name: Test PyTorch slowaccidnetal # see: https://help.github.com/en/actions/reference/events-that-trigger-workflows on: # Trigger the workflow on push or pull request, but only for the master branch From 81173598756eb4390f6f21fb158b126dc9c0bd5e Mon Sep 17 00:00:00 2001 From: Jirka Borovec Date: Fri, 26 Aug 2022 16:34:07 +0200 Subject: [PATCH 4/5] typo Co-authored-by: Akihiro Nitta --- .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 e54da79cbd38b..76748e365286c 100644 --- a/.github/workflows/ci-pytorch-test-slow.yml +++ b/.github/workflows/ci-pytorch-test-slow.yml @@ -1,4 +1,4 @@ -name: Test PyTorch slowaccidnetal +name: Test PyTorch slow # see: https://help.github.com/en/actions/reference/events-that-trigger-workflows on: # Trigger the workflow on push or pull request, but only for the master branch From 7475ad10cebb548013a8907deb688900f18b1fc7 Mon Sep 17 00:00:00 2001 From: Jirka Borovec Date: Fri, 26 Aug 2022 19:25:50 +0200 Subject: [PATCH 5/5] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Carlos Mocholí --- .github/workflows/ci-app-examples.yml | 2 +- .github/workflows/ci-app-tests.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci-app-examples.yml b/.github/workflows/ci-app-examples.yml index 6bf195751265c..ecd2a746412f1 100644 --- a/.github/workflows/ci-app-examples.yml +++ b/.github/workflows/ci-app-examples.yml @@ -9,8 +9,8 @@ on: # Trigger the workflow on push or pull request, but only for the master bran paths: - ".github/workflows/ci-app-examples.yml" - "src/lightning_app/**" - - "tests/tests_app/**" - "tests/tests_app_examples/**" + - "examples/app_*" - "requirements/app/**" - "setup.py" diff --git a/.github/workflows/ci-app-tests.yml b/.github/workflows/ci-app-tests.yml index 85629b205eee0..91299fdc4e16b 100644 --- a/.github/workflows/ci-app-tests.yml +++ b/.github/workflows/ci-app-tests.yml @@ -9,7 +9,6 @@ on: # Trigger the workflow on push or pull request, but only for the master bran - ".github/workflows/ci-app-tests.yml" - "src/lightning_app/**" - "tests/tests_app/**" - - "tests/tests_app_examples/**" - "requirements/app/**" - "setup.py"