Skip to content

Commit 708dca5

Browse files
committed
Merge branch 'master' into bug/prof_missing_hooks
2 parents abd46f5 + e53c4e8 commit 708dca5

File tree

154 files changed

+2845
-1191
lines changed

Some content is hidden

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

154 files changed

+2845
-1191
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: 3 additions & 3 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
@@ -75,7 +75,7 @@ jobs:
7575
CUDA_VERSION_MM=$(python -c "import torch ; print(''.join(map(str, torch.version.cuda.split('.')[:2])))")
7676
pip install "bagua-cuda$CUDA_VERSION_MM>=0.9.0"
7777
pip install -e .[strategies]
78-
pip install deepspeed>0.6.4 # TODO: remove when docker images are upgraded
78+
pip install -U deepspeed # TODO: remove when docker images are upgraded
7979
pip install --requirement requirements/pytorch/devel.txt
8080
pip list
8181
env:

.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: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# the repo. Unless a later match takes precedence,
66
# @global-owner1 and @global-owner2 will be requested for
77
# review when someone opens a pull request.
8-
* @williamfalcon @borda @tchaton @SeanNaren @carmocca @awaelchli @justusschock @kaushikb11 @rohitgr7
8+
* @williamfalcon @borda @tchaton @awaelchli @kaushikb11 @rohitgr7
99

1010
# CI/CD and configs
1111
/.github/ @borda @carmocca @akihironitta @tchaton
@@ -26,50 +26,52 @@
2626
/docs/source-app/expertise_levels @williamfalcon @Felonious-Spellfire @RobertLaurella
2727

2828
# Packages
29+
/src/pytorch_lightning @carmocca @justusschock
2930
/src/pytorch_lightning/accelerators @williamfalcon @tchaton @SeanNaren @awaelchli @justusschock @kaushikb11
3031
/src/pytorch_lightning/callbacks @williamfalcon @tchaton @carmocca @borda @kaushikb11
31-
/src/pytorch_lightning/core @tchaton @SeanNaren @borda @carmocca @justusschock @kaushikb11
32+
/src/pytorch_lightning/core @tchaton @borda @carmocca @justusschock @kaushikb11
3233
/src/pytorch_lightning/distributed @williamfalcon @tchaton @awaelchli @kaushikb11
3334
/src/pytorch_lightning/lite @tchaton @awaelchli @carmocca
3435
/src/pytorch_lightning/loggers @tchaton @awaelchli @borda
35-
/src/pytorch_lightning/loggers/wandb.py @borisdayma
36+
/src/pytorch_lightning/loggers/wandb.py @borisdayma @borda
3637
/src/pytorch_lightning/loggers/neptune.py @shnela @HubertJaworski @pkasprzyk @pitercl @Raalsky @aniezurawski @kamil-kaczmarek
3738
/src/pytorch_lightning/loops @tchaton @awaelchli @justusschock @carmocca
38-
/src/pytorch_lightning/overrides @tchaton @SeanNaren @borda
39-
/src/pytorch_lightning/plugins @tchaton @SeanNaren @awaelchli @justusschock
39+
/src/pytorch_lightning/overrides @tchaton @borda
40+
/src/pytorch_lightning/plugins @tchaton @awaelchli @justusschock
4041
/src/pytorch_lightning/profilers @williamfalcon @tchaton @borda @carmocca
4142
/src/pytorch_lightning/profilers/pytorch.py @nbcsm @guotuofeng
4243
/src/pytorch_lightning/strategies @tchaton @SeanNaren @awaelchli @justusschock @kaushikb11
43-
/src/pytorch_lightning/trainer @williamfalcon @borda @tchaton @SeanNaren @carmocca @awaelchli @justusschock @kaushikb11
44-
/src/pytorch_lightning/trainer/connectors @tchaton @SeanNaren @carmocca @borda
44+
/src/pytorch_lightning/trainer @williamfalcon @borda @tchaton @carmocca @awaelchli @justusschock @kaushikb11
45+
/src/pytorch_lightning/trainer/connectors @tchaton @carmocca @borda
4546
/src/pytorch_lightning/tuner @SkafteNicki @borda @awaelchli
46-
/src/pytorch_lightning/utilities @borda @tchaton @SeanNaren @carmocca
47+
/src/pytorch_lightning/utilities @borda @tchaton @carmocca
4748

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

5057
# Examples
51-
/examples/app_* @tchaton @awaelchli @manskx @hhsecond
58+
/examples/app_* @tchaton @awaelchli @manskx @hhsecond
5259
# App tests
53-
/tests/tests_app @tchaton @awaelchli @manskx @hhsecond
54-
/tests/tests_app_examples @tchaton @awaelchli @manskx @hhsecond
60+
/tests/tests_app @tchaton @awaelchli @manskx @hhsecond
61+
/tests/tests_app_examples @tchaton @awaelchli @manskx @hhsecond
5562

5663
# Specifics
57-
/src/pytorch_lightning/trainer/connectors/logger_connector @tchaton @carmocca
58-
/src/pytorch_lightning/trainer/progress.py @tchaton @awaelchli @carmocca
59-
64+
/src/pytorch_lightning/trainer/connectors/logger_connector @tchaton @carmocca
65+
/src/pytorch_lightning/trainer/progress.py @tchaton @awaelchli @carmocca
6066
# API
61-
/src/pytorch_lightning/callbacks/base.py @williamfalcon @awaelchli @ananthsub @carmocca
62-
/src/pytorch_lightning/core/datamodule.py @williamFalcon @awaelchli @ananthsub @carmocca
63-
/src/pytorch_lightning/trainer/trainer.py @williamfalcon @tchaton @awaelchli
64-
/src/pytorch_lightning/core/hooks.py @williamfalcon @tchaton @awaelchli @ananthsub @carmocca
65-
/src/pytorch_lightning/core/lightning.py @williamfalcon @tchaton @awaelchli
66-
67-
# Testing
68-
/tests/helpers/boring_model.py @williamfalcon @tchaton @borda
67+
/src/pytorch_lightning/callbacks/callback.py @williamfalcon @awaelchli @ananthsub @carmocca
68+
/src/pytorch_lightning/core/datamodule.py @williamFalcon @awaelchli @ananthsub @carmocca
69+
/src/pytorch_lightning/trainer/trainer.py @williamfalcon @tchaton @awaelchli
70+
/src/pytorch_lightning/core/hooks.py @williamfalcon @tchaton @awaelchli @ananthsub @carmocca
71+
/src/pytorch_lightning/core/module.py @williamfalcon @tchaton @awaelchli
6972

70-
/.github/CODEOWNERS @williamfalcon
71-
/.github/approve_config.yml @williamfalcon
72-
/SECURITY.md @williamfalcon
73-
/README.md @williamfalcon @edenlightning @borda
74-
/setup.py @williamfalcon @borda @carmocca
73+
/.github/CODEOWNERS @williamfalcon
74+
/SECURITY.md @williamfalcon
75+
/README.md @williamfalcon @edenlightning @borda
76+
/setup.py @williamfalcon @borda @carmocca
7577
/src/pytorch_lightning/__about__.py @williamfalcon @borda @carmocca

.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/checkgroup.yml

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
custom_service_name: "Lightning CI required checker"
2+
subprojects:
3+
- id: "CI: CircleCI"
4+
paths:
5+
- ".circleci/**"
6+
checks:
7+
- "test-on-tpus"
8+
9+
- id: "CI: Azure"
10+
paths:
11+
- ".azure/**"
12+
checks:
13+
- "pytorch-lightning (GPUs)"
14+
- "pytorch-lightning (GPUs) (testing PyTorch - stable)"
15+
- "pytorch-lightning (HPUs)"
16+
- "pytorch-lightning (IPUs)"
17+
18+
- id: "pytorch_lightning"
19+
paths:
20+
# all examples don't need to be added because they aren't used in CI, but these are
21+
- "examples/run_ddp_examples.sh"
22+
- "examples/convert_from_pt_to_pl/**"
23+
- "examples/run_pl_examples.sh"
24+
- "examples/pl_basics/backbone_image_classifier.py"
25+
- "examples/pl_basics/autoencoder.py"
26+
- "examples/pl_loops/mnist_lite.py"
27+
- "examples/pl_fault_tolerant/automatic.py"
28+
- "examples/test_pl_examples.py"
29+
- "examples/pl_integrations/dali_image_classifier.py"
30+
- "requirements/pytorch/**"
31+
- "src/pytorch_lightning/**"
32+
- "tests/tests_pytorch/**"
33+
- "setup.cfg" # includes pytest config
34+
- ".github/workflows/ci-pytorch*.yml"
35+
- ".github/workflows/docs-*.yml"
36+
checks:
37+
- "conda (3.8, 1.10)"
38+
- "conda (3.8, 1.9)"
39+
- "conda (3.9, 1.11)"
40+
- "conda (3.9, 1.12)"
41+
- "cpu (macOS-11, 3.10, latest, stable)"
42+
- "cpu (macOS-11, 3.7, latest, stable)"
43+
- "cpu (macOS-11, 3.7, oldest, stable)"
44+
- "cpu (ubuntu-20.04, 3.10, latest, stable)"
45+
- "cpu (ubuntu-20.04, 3.7, latest, stable)"
46+
- "cpu (ubuntu-20.04, 3.7, oldest, stable)"
47+
- "cpu (windows-2022, 3.10, latest, stable)"
48+
- "cpu (windows-2022, 3.7, latest, stable)"
49+
- "cpu (windows-2022, 3.7, oldest, stable)"
50+
- "doctest (pytorch)"
51+
- "make-docs (pytorch)"
52+
- "mypy"
53+
- "PR Gatekeeper (pytorch)"
54+
- "pytorch-lightning (GPUs)"
55+
- "pytorch-lightning (GPUs) (testing PyTorch - stable)"
56+
- "pytorch-lightning (HPUs)"
57+
- "pytorch-lightning (IPUs)"
58+
- "slow (macOS-11, 3.7, 1.11)"
59+
- "slow (ubuntu-20.04, 3.7, 1.11)"
60+
- "slow (windows-2022, 3.7, 1.11)"
61+
- "test-on-tpus"
62+
63+
- id: "pytorch_lightning: Docs"
64+
paths:
65+
- "docs/source-pytorch/**"
66+
- ".github/workflows/docs-*.yml"
67+
- "requirements/pytorch/**"
68+
checks:
69+
- "doctest (pytorch)"
70+
- "make-docs (pytorch)"
71+
72+
- id: "pytorch_lightning: Docker"
73+
paths:
74+
- "dockers/**"
75+
checks:
76+
- "build-conda (3.8, 1.10)"
77+
- "build-conda (3.8, 1.9)"
78+
- "build-conda (3.9, 1.11)"
79+
- "build-conda (3.9, 1.12)"
80+
- "build-cuda (3.8, 1.9, 11.1.1)"
81+
- "build-cuda (3.9, 1.10, 11.3.1)"
82+
- "build-cuda (3.9, 1.11, 11.3.1)"
83+
- "build-cuda (3.9, 1.12, 11.3.1)"
84+
- "build-cuda (3.9, 1.9, 11.1.1)"
85+
- "build-hpu (1.5.0, 1.11.0)"
86+
- "build-ipu (3.9, 1.9)"
87+
- "build-NGC"
88+
- "build-pl (3.9, 1.10, 11.3.1)"
89+
- "build-pl (3.9, 1.11, 11.3.1)"
90+
- "build-pl (3.9, 1.12, 11.3.1)"
91+
- "build-pl (3.9, 1.9, 11.1.1)"
92+
- "build-xla (3.7, 1.12)"
93+
94+
- id: "pytorch_lightning: mypy"
95+
paths:
96+
- ".github/workflows/code-checks.yml"
97+
- "pyproject.toml" # includes mypy config
98+
checks:
99+
- "mypy"
100+
101+
- id: "lightning_app"
102+
paths:
103+
- ".github/workflows/ci-app*.yml"
104+
- "examples/app_**"
105+
- "requirements/app/**"
106+
- "src/lightning_app/**"
107+
- "tests/tests_app/**"
108+
- "tests/tests_app_examples/**"
109+
- "tests/tests_clusters/**"
110+
# the examples are used in the app CI
111+
- "examples/app_*"
112+
checks:
113+
- "Cloud Test (boring_app)"
114+
- "Cloud Test (collect_failures)"
115+
- "Cloud Test (commands_and_api)"
116+
- "Cloud Test (custom_work_dependencies)"
117+
- "Cloud Test (drive)"
118+
- "Cloud Test (idle_timeout)"
119+
- "Cloud Test (payload)"
120+
- "Cloud Test (template_jupyterlab)"
121+
- "Cloud Test (template_react_ui)"
122+
- "Cloud Test (template_streamlit_ui)"
123+
- "Cloud Test (v0_app)"
124+
- "doctest (app)"
125+
- "make-docs (app)"
126+
- "pytest (macOS-11, 3.8, latest)"
127+
- "pytest (macOS-11, 3.8, oldest)"
128+
- "pytest (ubuntu-20.04, 3.8, latest)"
129+
- "pytest (ubuntu-20.04, 3.8, oldest)"
130+
- "pytest (windows-2022, 3.8, latest)"
131+
- "pytest (windows-2022, 3.8, oldest)"
132+
133+
- id: "lightning_app: Docs"
134+
paths:
135+
- "docs/source-app/**"
136+
- ".github/workflows/docs-*.yml"
137+
- "requirements/app/**"
138+
checks:
139+
- "doctest (app)"
140+
- "make-docs (app)"
141+
142+
- id: "install"
143+
paths:
144+
- ".actions/setup_tools.py"
145+
- ".github/workflows/ci-pkg-install.yml"
146+
- "setup.py"
147+
- "src/lightning/**"
148+
# all __about__, __version__, __setup__
149+
- "src/*/__*.py"
150+
checks:
151+
- "install-meta-pypi (macOS-11, 3.8)"
152+
- "install-meta-pypi (ubuntu-20.04, 3.8)"
153+
- "install-meta-pypi (windows-2022, 3.8)"
154+
- "install-meta-src (macOS-11, 3.8)"
155+
- "install-meta-src (macOS-11, lightning, 3.8)"
156+
- "install-meta-src (ubuntu-20.04, 3.8)"
157+
- "install-meta-src (ubuntu-20.04, lightning, 3.8)"
158+
- "install-meta-src (windows-2022, 3.8)"
159+
- "install-meta-src (windows-2022, lightning, 3.8)"
160+
- "install-standalone (macOS-11, app, 3.8)"
161+
- "install-standalone (macOS-11, pytorch, 3.8)"
162+
- "install-standalone (ubuntu-20.04, app, 3.8)"
163+
- "install-standalone (ubuntu-20.04, pytorch, 3.8)"
164+
- "install-standalone (windows-2022, app, 3.8)"
165+
- "install-standalone (windows-2022, pytorch, 3.8)"

0 commit comments

Comments
 (0)