Skip to content

Commit 10bd4f5

Browse files
authored
Merge branch 'master' into master
2 parents 03a252f + e040ef2 commit 10bd4f5

File tree

152 files changed

+2429
-1148
lines changed

Some content is hidden

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

152 files changed

+2429
-1148
lines changed

.actions/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
jsonargparse>=4.16.0
1+
jsonargparse >=4.16.0, <4.28.0
22
requests

.azure/gpu-tests-fabric.yml

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ pr:
2323
- ".azure/gpu-tests-fabric.yml"
2424
- "examples/fabric/**"
2525
- "examples/run_fabric_examples.sh"
26-
- "tests/tests_fabric/run_standalone_*.sh"
27-
- "tests/tests_pytorch/run_standalone_tests.sh" # used by fabric through a symlink
26+
- "tests/run_standalone_*.sh"
2827
- "requirements/fabric/**"
2928
- "src/lightning/__init__.py"
3029
- "src/lightning/__setup__.py"
@@ -49,6 +48,7 @@ jobs:
4948
DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )
5049
FREEZE_REQUIREMENTS: "1"
5150
PIP_CACHE_DIR: "/var/tmp/pip"
51+
PL_RUN_CUDA_TESTS: "1"
5252
container:
5353
image: $(image)
5454
# default shm size is 64m. Increase it to avoid:
@@ -126,19 +126,16 @@ jobs:
126126
condition: and(succeeded(), eq(variables['PACKAGE_NAME'], 'fabric'))
127127
displayName: "Adjust tests & examples"
128128
129-
- bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest -v --durations=50
130-
workingDirectory: tests/tests_fabric
131-
env:
132-
PL_RUN_CUDA_TESTS: "1"
129+
- bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest . -v --durations=50
130+
workingDirectory: tests/tests_fabric/
133131
displayName: "Testing: fabric standard"
134132
timeoutInMinutes: "10"
135133

136-
- bash: bash run_standalone_tests.sh
137-
workingDirectory: tests/tests_fabric
134+
- bash: bash ../run_standalone_tests.sh "."
135+
workingDirectory: tests/tests_fabric/
138136
env:
139-
PL_RUN_CUDA_TESTS: "1"
140137
PL_STANDALONE_TESTS_SOURCE: $(COVERAGE_SOURCE)
141-
displayName: "Testing: fabric standalone tests"
138+
displayName: "Testing: fabric standalone"
142139
timeoutInMinutes: "10"
143140

144141
- bash: |
@@ -152,12 +149,12 @@ jobs:
152149
./codecov --token=$(CODECOV_TOKEN) --commit=$(Build.SourceVersion) \
153150
--flags=gpu,pytest,${COVERAGE_SOURCE} --name="GPU-coverage" --env=linux,azure
154151
ls -l
155-
workingDirectory: tests/tests_fabric
152+
workingDirectory: tests/tests_fabric/
156153
displayName: "Statistics"
157154
158155
- script: |
159156
set -e
160157
bash run_fabric_examples.sh --accelerator=cuda --devices=1
161158
bash run_fabric_examples.sh --accelerator=cuda --devices=2 --strategy ddp
162-
workingDirectory: examples
159+
workingDirectory: examples/
163160
displayName: "Testing: fabric examples"

.azure/gpu-tests-pytorch.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ jobs:
5959
DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )
6060
FREEZE_REQUIREMENTS: "1"
6161
PIP_CACHE_DIR: "/var/tmp/pip"
62+
PL_RUN_CUDA_TESTS: "1"
6263
container:
6364
image: $(image)
6465
# default shm size is 64m. Increase it to avoid:
@@ -154,16 +155,13 @@ jobs:
154155
155156
- bash: python -m coverage run --source ${COVERAGE_SOURCE} -m pytest -v --durations=50
156157
workingDirectory: tests/tests_pytorch
157-
env:
158-
PL_RUN_CUDA_TESTS: "1"
159158
displayName: "Testing: PyTorch standard"
160159
timeoutInMinutes: "35"
161160

162-
- bash: bash run_standalone_tests.sh
161+
- bash: bash ../run_standalone_tests.sh "."
163162
workingDirectory: tests/tests_pytorch
164163
env:
165164
PL_USE_MOCKED_MNIST: "1"
166-
PL_RUN_CUDA_TESTS: "1"
167165
PL_STANDALONE_TESTS_SOURCE: $(COVERAGE_SOURCE)
168166
displayName: "Testing: PyTorch standalone tests"
169167
timeoutInMinutes: "35"
@@ -172,7 +170,6 @@ jobs:
172170
workingDirectory: tests/tests_pytorch
173171
env:
174172
PL_USE_MOCKED_MNIST: "1"
175-
PL_RUN_CUDA_TESTS: "1"
176173
displayName: "Testing: PyTorch standalone tasks"
177174
timeoutInMinutes: "10"
178175

.github/actions/pip-wheels/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ runs:
1919
using: "composite"
2020
steps:
2121
- name: install dev. env
22-
run: pip install setuptools wheel
22+
run: pip install -r requirements/ci.txt
2323
shell: bash
2424

2525
- name: Freeze local emv.

.github/actions/pkg-check/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ runs:
1414
using: "composite"
1515
steps:
1616
- name: install dev. env
17-
run: pip install "twine==4.0.1" setuptools wheel flake8
17+
run: pip install -r requirements/ci.txt
1818
shell: bash
1919

2020
- name: Set PACKAGE_NAME envvar

.github/checkgroup.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,7 @@ subprojects:
225225
- ".azure/gpu-tests-fabric.yml"
226226
- "examples/fabric/**"
227227
- "examples/run_fabric_examples.sh"
228-
- "tests/tests_fabric/run_standalone_*.sh"
229-
- "tests/tests_pytorch/run_standalone_tests.sh" # used by Fabric through a symlink
228+
- "tests/run_standalone_*.sh"
230229
- "requirements/fabric/**"
231230
- "src/lightning/__init__.py"
232231
- "src/lightning/__setup__.py"

.github/label-change.yml

Lines changed: 72 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,91 @@
11
app:
2-
- "src/lightning/app/**"
3-
- "src/lightning_app/*"
4-
- "tests/tests_app/**"
5-
- "tests/integrations_app/**"
6-
- "tests/integrations_app_examples/**"
7-
- "examples/app/**"
8-
- "docs/source-app/**"
9-
- "requirements/app/**"
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- "src/lightning/app/**"
5+
- "src/lightning_app/*"
6+
- "tests/tests_app/**"
7+
- "tests/integrations_app/**"
8+
- "tests/integrations_app_examples/**"
9+
- "examples/app/**"
10+
- "docs/source-app/**"
11+
- "requirements/app/**"
1012

1113
data:
12-
- "src/lightning/data/**"
13-
- "tests/tests_data/**"
14-
- "requirements/data/**"
14+
- changed-files:
15+
- any-glob-to-any-file:
16+
- "src/lightning/data/**"
17+
- "tests/tests_data/**"
18+
- "requirements/data/**"
1519

1620
store:
17-
- "src/lightning/store/**"
18-
- "tests/tests_store/**"
19-
- "requirements/store/**"
21+
- changed-files:
22+
- any-glob-to-any-file:
23+
- "src/lightning/store/**"
24+
- "tests/tests_store/**"
25+
- "requirements/store/**"
2026

2127
pl:
22-
- "src/lightning/pytorch/**"
23-
- "src/pytorch_lightning/*"
24-
- "tests/tests_pytorch/**"
25-
- "tests/legacy/**"
26-
- "examples/pytorch/**"
27-
- "docs/source-pytorch/**"
28-
- "requirements/pytorch/**"
28+
- changed-files:
29+
- any-glob-to-any-file:
30+
- "src/lightning/pytorch/**"
31+
- "src/pytorch_lightning/*"
32+
- "tests/tests_pytorch/**"
33+
- "tests/legacy/**"
34+
- "examples/pytorch/**"
35+
- "docs/source-pytorch/**"
36+
- "requirements/pytorch/**"
2937

3038
fabric:
31-
- "src/lightning/fabric/**"
32-
- "src/lightning_fabric/*"
33-
- "tests/tests_fabric/**"
34-
- "examples/fabric/**"
35-
- "docs/source-fabric/**"
36-
- "requirements/fabric/**"
39+
- changed-files:
40+
- any-glob-to-any-file:
41+
- "src/lightning/fabric/**"
42+
- "src/lightning_fabric/*"
43+
- "tests/tests_fabric/**"
44+
- "examples/fabric/**"
45+
- "docs/source-fabric/**"
46+
- "requirements/fabric/**"
3747

3848
ci:
39-
- ".actions/**"
40-
- ".azure/**"
41-
- ".github/**"
42-
- "dockers/**"
43-
- ".pre-commit-config.yml"
49+
- changed-files:
50+
- any-glob-to-any-file:
51+
- ".actions/**"
52+
- ".azure/**"
53+
- ".github/**"
54+
- "dockers/**"
55+
- ".pre-commit-config.yml"
4456

4557
docs:
46-
- ".github/workflows/docs-build.yml"
47-
- "docs/**"
48-
- "requirements/docs.txt"
49-
- "requirements/*/docs.txt"
58+
- changed-files:
59+
- any-glob-to-any-file:
60+
- ".github/workflows/docs-build.yml"
61+
- "docs/**"
62+
- "requirements/docs.txt"
63+
- "requirements/*/docs.txt"
5064

5165
package:
52-
- ".github/workflows/ci-pkg-install.yml"
53-
- "setup.py"
54-
- "pyproject.toml"
55-
- "src/version.info"
56-
- "src/lightning/*/__setup__.py"
57-
- "src/lightning/*/__version__.py"
58-
- "src/lightning_app/*"
59-
- "src/lightning_fabric/*"
60-
- "src/pytorch_lightning/*"
66+
- changed-files:
67+
- any-glob-to-any-file:
68+
- ".github/workflows/ci-pkg-install.yml"
69+
- "setup.py"
70+
- "pyproject.toml"
71+
- "src/version.info"
72+
- "src/lightning/*/__setup__.py"
73+
- "src/lightning/*/__version__.py"
74+
- "src/lightning_app/*"
75+
- "src/lightning_fabric/*"
76+
- "src/pytorch_lightning/*"
6177

6278
dockers:
63-
- "dockers/**"
64-
- ".github/workflows/docker-build.yml"
79+
- changed-files:
80+
- any-glob-to-any-file:
81+
- "dockers/**"
82+
- ".github/workflows/docker-build.yml"
6583

6684
dependencies:
67-
- "requirements.txt"
68-
- "requirements/**"
85+
- changed-files:
86+
- any-glob-to-any-file:
87+
- "requirements.txt"
88+
- "requirements/**"
89+
90+
release:
91+
- base-branch: "release/*"

.github/workflows/_legacy-checkpoints.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,14 @@ jobs:
110110
path: ${{ env.legacy_dir }}/checkpoints/
111111
retention-days: ${{ env.KEEP_DAYS }}
112112

113+
- run: pip install -r requirements/ci.txt
113114
- name: Upload checkpoints to S3
114115
working-directory: ${{ env.legacy_dir }}
115116
env:
116117
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_PUB_ACCESS_KEY }}
117118
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_PUB_SECRET_KEY }}
118119
AWS_DEFAULT_REGION: ${{ secrets.AWS_REGION }}
119120
run: |
120-
pip install -q awscli
121121
aws s3 sync $AWS_RUN checkpoints/ s3://pl-public-data/legacy/checkpoints/
122122
zip -r checkpoints.zip checkpoints
123123
aws s3 cp $AWS_RUN checkpoints.zip s3://pl-public-data/legacy/ --acl public-read

.github/workflows/call-clear-cache.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ on:
1212
jobs:
1313
cron-clear:
1414
if: github.event_name == 'schedule'
15-
uses: Lightning-AI/utilities/.github/workflows/[email protected].0
15+
uses: Lightning-AI/utilities/.github/workflows/[email protected].1
1616
with:
1717
pattern: "latest|docs"
1818

1919
direct-clear:
2020
if: github.event_name == 'workflow_dispatch'
21-
uses: Lightning-AI/utilities/.github/workflows/[email protected].0
21+
uses: Lightning-AI/utilities/.github/workflows/[email protected].1
2222
with:
2323
pattern: ${{ inputs.pattern }}

.github/workflows/ci-check-md-links.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ on:
1414

1515
jobs:
1616
check-md-links:
17-
uses: Lightning-AI/utilities/.github/workflows/[email protected].0
17+
uses: Lightning-AI/utilities/.github/workflows/[email protected].1
1818
with:
1919
config-file: ".github/markdown-links-config.json"

0 commit comments

Comments
 (0)