Skip to content

Commit cb2ba76

Browse files
BordaBorda
authored
Merge branch 'master' into mypy_sharded_spawn
2 parents 5e22aef + 9b61b1c commit cb2ba76

File tree

84 files changed

+1141
-356
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1141
-356
lines changed

‎.actions/setup_tools.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,10 @@ def load_readme_description(path_dir: str, homepage: str, version: str) -> str:
9494
text = text.replace("pytorch-lightning.readthedocs.io/en/stable/", f"pytorch-lightning.readthedocs.io/en/{version}")
9595
# codecov badge
9696
text = text.replace("/branch/master/graph/badge.svg", f"/release/{version}/graph/badge.svg")
97-
# replace github badges for release ones
97+
# github actions badge
9898
text = text.replace("badge.svg?branch=master&event=push", f"badge.svg?tag={version}")
99-
# Azure...
99+
# azure pipelines badge
100100
text = text.replace("?branchName=master", f"?branchName=refs%2Ftags%2F{version}")
101-
text = re.sub(r"\?definitionId=\d+&branchName=master", f"?definitionId=2&branchName=refs%2Ftags%2F{version}", text)
102101

103102
skip_begin = r"<!-- following section will be skipped from PyPI description -->"
104103
skip_end = r"<!-- end skipping PyPI description -->"

‎.azure/gpu-benchmark.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
cancelTimeoutInMinutes: "2"
2929
pool: azure-jirka-spot
3030
container:
31-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.12"
31+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.12-cuda11.3.1"
3232
options: "--runtime=nvidia -e NVIDIA_VISIBLE_DEVICES=all --shm-size=32g"
3333
workspace:
3434
clean: all

‎.azure/gpu-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
strategy:
2727
matrix:
2828
'PyTorch - stable':
29-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.12"
29+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.9-torch1.12-cuda11.3.1"
3030
# how long to run the job before automatically cancelling
3131
timeoutInMinutes: "80"
3232
# how much time to give 'run always even if cancelled tasks' before stopping them
@@ -44,7 +44,7 @@ jobs:
4444

4545
- bash: |
4646
CHANGED_FILES=$(git diff --name-status origin/master -- . | awk '{print $2}')
47-
FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*|.azure/*'
47+
FILTER='src/pytorch_lightning|requirements/pytorch|tests/tests_pytorch|examples/pl_*|.azure/gpu-tests.yml'
4848
echo $CHANGED_FILES > changed_files.txt
4949
MATCHES=$(cat changed_files.txt | grep -E $FILTER)
5050
echo $MATCHES

‎.github/BECOMING_A_CORE_CONTRIBUTOR.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ We are on the lookout for new people to join, however, if you feel like you meet
6262

6363
## Employment
6464

65-
You can also become a [Grid.ai](https://www.grid.ai) employee or intern and work on Lightning. To get started, you can email `careers@grid.ai` with your resume or check out our [open job postings](https://boards.greenhouse.io/gridai).
65+
You can also become a [Lightning AI](https://lightning.ai/) employee or intern and work on Lightning. To get started, you can email `careers@lightning.ai` with your resume or check out our [open job postings](https://boards.greenhouse.io/lightningai).

‎.github/CODEOWNERS‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,13 @@
4545
/src/pytorch_lightning/tuner @SkafteNicki @borda @awaelchli
4646
/src/pytorch_lightning/utilities @borda @tchaton @carmocca
4747

48-
/src/lightning_app @tchaton @awaelchli @manskx @hhsecond
48+
/src/lightning_app @tchaton @manskx
49+
/src/lightning_app/cli/pl-app-template @awaelchli @tchaton @Borda
50+
/src/lightning_app/core @tchaton @awaelchli @manskx
51+
/src/lightning_app/core/queues.py @tchaton @hhsecond @manskx
52+
/src/lightning_app/runners/cloud.py @tchaton @hhsecond
53+
/src/lightning_app/testing @tchaton @manskx
54+
/src/lightning_app/__about__.py @nohalon @edenlightning @lantiga
4955

5056
# Examples
5157
/examples/app_* @tchaton @awaelchli @manskx @hhsecond

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,16 @@ You can get the script and run it with:
4141
```bash
4242
wget https://raw.githubusercontent.com/Lightning-AI/lightning/master/requirements/collect_env_details.py
4343
python collect_env_details.py
44+
4445
```
4546
47+
48+
<details>
49+
<summary>Details</summary>
50+
Paste the output here and move this toggle outside of the comment block.
51+
</details>
52+
53+
4654
You can also fill out the list below manually.
4755
-->
4856

‎.github/workflows/README.md‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
## Unit and Integration Testing
66

7-
| workflow name | workflow file | action | accelerator\* | (Python, PyTorch) | OS |
8-
| -------------------------- | ----------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- | ------------------------------------------------ | ------------------- |
9-
| 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 |
10-
| 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 |
11-
| 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 |
12-
| pytorch-lightning (IPUs) | .azure-pipelines/ipu-tests.yml | Run only IPU-specific tests. | IPU | (3.8, 1.9) | linux |
13-
| pytorch-lightning (HPUs) | .azure-pipelines/hpu-tests.yml | Run only HPU-specific tests. | HPU | (3.8, 1.10) | linux |
14-
| pytorch-lightning (GPUs) | .azure-pipelines/gpu-tests.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 | (3.9, 1.12) | linux |
15-
| PyTorchLightning.Benchmark | .azure-pipelines/gpu-benchmark.yml | Run speed/memory benchmarks for parity with pure PyTorch. | GPU | (3.9, 1.12) | linux |
16-
| test-on-tpus | .circleci/config.yml | Run only TPU-specific tests. | TPU | (3.7, 1.12) | linux |
7+
| workflow name | workflow file | action | accelerator\* | (Python, PyTorch) | OS |
8+
| -------------------------- | ------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------- | ------------------------------------------------- | ------------------- |
9+
| Test PyTorch full | .github/workflows/ci-pytorch-test-full.yml | Run all tests except for accelerator-specific, standalone and slow tests. | CPU | (3.7, 1.9), (3.7, 1.12), (3.9, 1.9), (3.9, 1.12) | linux, mac, windows |
10+
| Test PyTorch with Conda | .github/workflows/ci-pytorch-test-conda.yml | Same as ci-pytorch-test-full.yml but with dependencies installed with conda. | CPU | (3.8, 1.9), (3.8, 1.10), (3.8, 1.11), (3.9, 1.12) | linux |
11+
| Test slow | .github/workflows/ci-pytorch-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.11) | linux, mac, windows |
12+
| pytorch-lightning (IPUs) | .azure-pipelines/ipu-tests.yml | Run only IPU-specific tests. | IPU | (3.8, 1.9) | linux |
13+
| pytorch-lightning (HPUs) | .azure-pipelines/hpu-tests.yml | Run only HPU-specific tests. | HPU | (3.8, 1.10) | linux |
14+
| pytorch-lightning (GPUs) | .azure-pipelines/gpu-tests.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 | (3.9, 1.12) | linux |
15+
| PyTorchLightning.Benchmark | .azure-pipelines/gpu-benchmark.yml | Run speed/memory benchmarks for parity with pure PyTorch. | GPU | (3.9, 1.12) | linux |
16+
| test-on-tpus | .circleci/config.yml | Run only TPU-specific tests. | TPU | (3.7, 1.12) | linux |
1717

1818
- \*Accelerators used in CI
1919
- GPU: 2 x NVIDIA Tesla V100
@@ -33,15 +33,15 @@
3333
| --------------------------------- | ----------------------------------------------------------------------------------------- |
3434
| .codecov.yml | Measure test coverage with [codecov.io](https://app.codecov.io/gh/Lightning-AI/lightning) |
3535
| .github/workflows/code-checks.yml | Check Python typing with [MyPy](https://mypy.readthedocs.io/en/stable/). |
36-
| .github/workflows/ci_schema.yml | Validate the syntax of workflow files. |
36+
| .github/workflows/ci-schema.yml | Validate the syntax of workflow files. |
3737

3838
## Others
3939

40-
| workflow file | action |
41-
| -------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
42-
| .github/workflows/ci_dockers.yml | Build docker images used for testing in CI without pushing to the [Docker Hub](https://hub.docker.com/r/pytorchlightning/pytorch_lightning). Publishing these built images takes place in `.github/workflows/release-docker.yml` which only runs in master. |
43-
| .github/workflows/ci_pkg-install.yml | Test if pytorch-lightning is successfully installed using pip. |
44-
| .github/workflows/events-recurrent.yml | Terminate TPU jobs that live more than one hour to avoid possible resource exhaustion due to hangs. |
40+
| workflow file | action |
41+
| ------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
42+
| .github/workflows/cicd-pytorch-dockers.yml | Build docker images used for testing in CI. If run on nightly schedule, push to the [Docker Hub](https://hub.docker.com/r/pytorchlightning/pytorch_lightning). |
43+
| .github/workflows/ci-pkg-install.yml | Test if pytorch-lightning is successfully installed using pip. |
44+
| .github/workflows/events-recurrent.yml | Terminate TPU jobs that live more than one hour to avoid possible resource exhaustion due to hangs. |
4545

4646
## Deployment
4747

@@ -60,4 +60,4 @@
6060
| .github/stale.yml | Close inactive issues/PRs sometimes after adding the "won't fix" label to them. |
6161
| .github/workflows/probot-auto-cc.yml, .github/lightning-probot.yml | Notify maintainers of interest depending on labels added to an issue We utilize lightning-probot forked from PyTorch’s probot. |
6262
| .pre-commit-config.yaml | pre-commit.ci runs a set of linters and formatters, such as black, flake8 and isort. When formatting is applied, the bot pushes a commit with its change. This configuration is also used for running pre-commit locally. |
63-
| .github/workflows/ci_pr-gatekeeper.yml | Prevent PRs from merging into master without any Grid.ai employees’ approval. |
63+
| .github/workflows/ci-pr-gatekeeper.yml | Prevent PRs from merging into master without any Grid.ai employees’ approval. |

‎.github/workflows/ci-app_cloud_e2e_test.yml‎ renamed to ‎.github/workflows/ci-app-cloud-e2e-test.yml‎

File renamed without changes.

‎.github/workflows/ci-app_examples.yml‎ renamed to ‎.github/workflows/ci-app-examples.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
os: [ubuntu-20.04, macOS-11, windows-2019]
20+
os: [ubuntu-20.04, macOS-11, windows-2022]
2121
python-version: [3.8]
2222
requires: ["oldest", "latest"]
2323

‎.github/workflows/ci-app_tests.yml‎ renamed to ‎.github/workflows/ci-app-tests.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
strategy:
2222
fail-fast: false
2323
matrix:
24-
os: [ubuntu-20.04, macOS-11, windows-2019]
24+
os: [ubuntu-20.04, macOS-11, windows-2022]
2525
python-version: [3.8]
2626
requires: ["oldest", "latest"]
2727

@@ -126,14 +126,14 @@ jobs:
126126
# - name: Clone Quick Start Example Repo
127127
# uses: actions/checkout@v3
128128
# # TODO: this needs to be git submodule
129-
# if: matrix.os == 'windows-2019' # because the install doesn't work on windows
129+
# if: matrix.os == 'windows-2022' # because the install doesn't work on windows
130130
# with:
131131
# repository: Lightning-AI/lightning-quick-start
132132
# ref: 'main'
133133
# path: lightning-quick-start
134134
#
135135
# - name: Lightning Install quick-start
136136
# shell: bash
137-
# if: matrix.os != 'windows-2019' # because the install doesn't work on windows
137+
# if: matrix.os != 'windows-2022' # because the install doesn't work on windows
138138
# run: |
139139
# python -m lightning install app lightning/quick-start -y

0 commit comments

Comments
 (0)