From eee1a290247b566950330c8d555a5e2623deed02 Mon Sep 17 00:00:00 2001 From: awaelchli Date: Mon, 19 Dec 2022 19:46:53 +0100 Subject: [PATCH] CI: settle file names (#16098) * CI: settle file names * rename * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> --- .github/checkgroup.yml | 8 ++++---- .github/workflows/README.md | 8 ++++---- ...ytorch-dockers.yml => ci-dockers-pytorch.yml} | 0 .../{ci-app-examples.yml => ci-examples-app.yml} | 2 +- .../{ci-app-tests.yml => ci-tests-app.yml} | 2 +- .../{ci-lite-tests.yml => ci-tests-lite.yml} | 2 +- ...ci-pytorch-tests.yml => ci-tests-pytorch.yml} | 16 ++++++++-------- README.md | 6 +++--- src/pytorch_lightning/README.md | 6 +++--- 9 files changed, 25 insertions(+), 25 deletions(-) rename .github/workflows/{ci-pytorch-dockers.yml => ci-dockers-pytorch.yml} (100%) rename .github/workflows/{ci-app-examples.yml => ci-examples-app.yml} (99%) rename .github/workflows/{ci-app-tests.yml => ci-tests-app.yml} (99%) rename .github/workflows/{ci-lite-tests.yml => ci-tests-lite.yml} (99%) rename .github/workflows/{ci-pytorch-tests.yml => ci-tests-pytorch.yml} (95%) diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml index 5f251f86c204b..01e02b6a80869 100644 --- a/.github/checkgroup.yml +++ b/.github/checkgroup.yml @@ -6,7 +6,7 @@ subprojects: - id: "pytorch_lightning: Tests workflow" paths: - ".actions/**" - - ".github/workflows/ci-pytorch-tests.yml" + - ".github/workflows/ci-tests-pytorch.yml" - "requirements/fabric/**" - "src/lightning_fabric/**" - "requirements/pytorch/**" @@ -178,7 +178,7 @@ subprojects: - "src/lightning_fabric/**" - "tests/tests_fabric/**" - "setup.cfg" # includes pytest config - - ".github/workflows/ci-fabric-tests.yml" + - ".github/workflows/ci-tests-fabric.yml" - "!requirements/*/docs.txt" - "!*.md" - "!**/*.md" @@ -223,7 +223,7 @@ subprojects: - id: "lightning_app: Tests workflow" paths: - ".actions/**" - - ".github/workflows/ci-app-tests.yml" + - ".github/workflows/ci-tests-app.yml" - "src/lightning_app/**" - "tests/tests_app/**" - "requirements/app/**" @@ -245,7 +245,7 @@ subprojects: - id: "lightning_app: Examples" paths: - ".actions/**" - - ".github/workflows/ci-app-examples.yml" + - ".github/workflows/ci-examples-app.yml" - "src/lightning_app/**" - "tests/tests_examples_app/**" - "examples/app_*/**" diff --git a/.github/workflows/README.md b/.github/workflows/README.md index 3437dd03e6d50..9f3d7a05584b7 100644 --- a/.github/workflows/README.md +++ b/.github/workflows/README.md @@ -4,10 +4,10 @@ ## Unit and Integration Testing -| workflow name | workflow file | action | accelerator\* | -| -------------------------- | ------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- | -| Test PyTorch full | .github/workflows/ci-pytorch-tests.yml | Run all tests except for accelerator-specific, standalone and slow tests. | CPU | -| Test PyTorch slow | .github/workflows/ci-pytorch-tests-slow.yml | Run only slow tests. Slow tests usually need to spawn threads and cannot be speed up or simplified. | CPU | +| workflow name | workflow file | action | accelerator\* | +| ----------------- | -------------------------------------- | ------------------------------------------------------------------------- | ------------- | +| Test PyTorch full | .github/workflows/ci-tests-pytorch.yml | Run all tests except for accelerator-specific, standalone and slow tests. | CPU | + | pytorch-lightning (IPUs) | .azure-pipelines/ipu-tests.yml | Run only IPU-specific tests. | IPU | | pytorch-lightning (HPUs) | .azure-pipelines/hpu-tests.yml | Run only HPU-specific tests. | HPU | | pytorch-lightning (GPUs) | .azure-pipelines/gpu-tests-pytorch.yml | Run all CPU and GPU-specific tests, standalone, and examples. Each standalone test needs to be run in separate processes to avoid unwanted interactions between test cases. | GPU | diff --git a/.github/workflows/ci-pytorch-dockers.yml b/.github/workflows/ci-dockers-pytorch.yml similarity index 100% rename from .github/workflows/ci-pytorch-dockers.yml rename to .github/workflows/ci-dockers-pytorch.yml diff --git a/.github/workflows/ci-app-examples.yml b/.github/workflows/ci-examples-app.yml similarity index 99% rename from .github/workflows/ci-app-examples.yml rename to .github/workflows/ci-examples-app.yml index a78a9fe6a32d7..f68705a032b21 100644 --- a/.github/workflows/ci-app-examples.yml +++ b/.github/workflows/ci-examples-app.yml @@ -9,7 +9,7 @@ on: types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: - ".actions/**" - - ".github/workflows/ci-app-examples.yml" + - ".github/workflows/ci-examples-app.yml" - "src/lightning_app/**" - "tests/tests_examples_app/**" - "examples/app_*/**" diff --git a/.github/workflows/ci-app-tests.yml b/.github/workflows/ci-tests-app.yml similarity index 99% rename from .github/workflows/ci-app-tests.yml rename to .github/workflows/ci-tests-app.yml index 8a7cb314b0ff5..32f529e3475c4 100644 --- a/.github/workflows/ci-app-tests.yml +++ b/.github/workflows/ci-tests-app.yml @@ -9,7 +9,7 @@ on: types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: - ".actions/**" - - ".github/workflows/ci-app-tests.yml" + - ".github/workflows/ci-tests-app.yml" - "src/lightning_app/**" - "tests/tests_app/**" - "requirements/app/**" diff --git a/.github/workflows/ci-lite-tests.yml b/.github/workflows/ci-tests-lite.yml similarity index 99% rename from .github/workflows/ci-lite-tests.yml rename to .github/workflows/ci-tests-lite.yml index bc25b4982743d..64648b8b840c2 100644 --- a/.github/workflows/ci-lite-tests.yml +++ b/.github/workflows/ci-tests-lite.yml @@ -13,7 +13,7 @@ on: - "src/lightning_lite/**" - "tests/tests_lite/**" - "setup.cfg" # includes pytest config - - ".github/workflows/ci-lite-tests.yml" + - ".github/workflows/ci-tests-lite.yml" - "!requirements/*/docs.txt" - "!*.md" - "!**/*.md" diff --git a/.github/workflows/ci-pytorch-tests.yml b/.github/workflows/ci-tests-pytorch.yml similarity index 95% rename from .github/workflows/ci-pytorch-tests.yml rename to .github/workflows/ci-tests-pytorch.yml index a9286ba8b19e2..cfbf7fe8c5776 100644 --- a/.github/workflows/ci-pytorch-tests.yml +++ b/.github/workflows/ci-tests-pytorch.yml @@ -3,9 +3,9 @@ name: Test PyTorch # see: https://help.github.com/en/actions/reference/events-that-trigger-workflows on: push: - branches: [master, "release/*", "lite/debug"] + branches: [master, "release/*"] pull_request: - branches: [master, "release/*", "lite/debug"] + branches: [master, "release/*"] types: [opened, reopened, ready_for_review, synchronize] # added `ready_for_review` since draft is skipped paths: - ".actions/**" @@ -14,9 +14,9 @@ on: - "tests/tests_pytorch/**" - "tests/legacy/back-compatible-versions.txt" - "setup.cfg" # includes pytest config - - ".github/workflows/ci-pytorch-tests.yml" - - "requirements/fabric/**" - - "src/lightning_fabric/**" + - ".github/workflows/ci-tests-pytorch.yml" + - "requirements/lite/**" + - "src/lightning_lite/**" - "!requirements/pytorch/docs.txt" - "!*.md" - "!**/*.md" @@ -104,7 +104,7 @@ jobs: - name: Adjust PyTorch versions in requirements files if: ${{ matrix.requires != 'oldest' }} run: | - python ./requirements/pytorch/adjust-versions.py requirements/fabric/base.txt ${{ matrix.pytorch-version }} + python ./requirements/pytorch/adjust-versions.py requirements/lite/base.txt ${{ matrix.pytorch-version }} python ./requirements/pytorch/adjust-versions.py requirements/pytorch/base.txt ${{ matrix.pytorch-version }} python ./requirements/pytorch/adjust-versions.py requirements/pytorch/examples.txt ${{ matrix.pytorch-version }} cat requirements/pytorch/base.txt @@ -171,8 +171,8 @@ jobs: if: ${{ matrix.pkg-name == 'lightning' }} run: | python .actions/assistant.py copy_replace_imports --source_dir="./tests" \ - --source_import="pytorch_lightning,lightning_fabric" \ - --target_import="lightning.pytorch,lightning.fabric" + --source_import="pytorch_lightning,lightning_lite" \ + --target_import="lightning.pytorch,lightning.lite" - name: Testing Warnings # the stacklevel can only be set on >=3.7 diff --git a/README.md b/README.md index d1244ab1b5972..19c618122a8a8 100644 --- a/README.md +++ b/README.md @@ -96,9 +96,9 @@ Lightning is rigorously tested across multiple CPUs, GPUs, TPUs, IPUs, and HPUs | Linux py3.7 \[TPUs\*\*\*\] | - | - | | Linux py3.8 \[IPUs\] | - | - | | Linux py3.8 \[HPUs\] | [![Build Status]()](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=26&branchName=master) | - | -| Linux py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml) | -| OSX py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml) | -| Windows py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml) | +| Linux py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | +| OSX py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | +| Windows py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.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/src/pytorch_lightning/README.md b/src/pytorch_lightning/README.md index cd5698821b253..67ddf6eeca6a6 100644 --- a/src/pytorch_lightning/README.md +++ b/src/pytorch_lightning/README.md @@ -84,9 +84,9 @@ Lightning is rigorously tested across multiple CPUs, GPUs, TPUs, IPUs, and HPUs | Linux py3.7 \[TPUs\*\*\*\] | - | - | | Linux py3.8 \[IPUs\] | - | - | | Linux py3.8 \[HPUs\] | [![Build Status]()](https://dev.azure.com/Lightning-AI/lightning/_build/latest?definitionId=26&branchName=master) | - | -| Linux py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml) | -| OSX py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml) | -| Windows py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-pytorch-tests.yml) | +| Linux py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | +| OSX py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | +| Windows py3.{7,9} | - | [![Test](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml/badge.svg?branch=master&event=push)](https://github.com/Lightning-AI/lightning/actions/workflows/ci-tests-pytorch.yml) | - _\*\* tests run on two NVIDIA P100_ - _\*\*\* tests run on Google GKE TPUv2/3. TPU py3.7 means we support Colab and Kaggle env._