Skip to content

Commit fd1177f

Browse files
justusschockjustusschock
authored
Merge branch 'master' into fix/atomic-save-local-tmpdir-21253
2 parents 051497b + 1120456 commit fd1177f

17 files changed

Lines changed: 307 additions & 126 deletions

File tree

‎.github/checkgroup.yml‎

Lines changed: 90 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -21,62 +21,63 @@ subprojects:
2121
checks:
2222
- "pl-cpu-guardian" # aggregated check for all cases
2323

24-
- id: "pytorch_lightning: lit GPU"
25-
paths:
26-
- ".actions/*"
27-
- ".lightning/workflows/pytorch.yml"
28-
# only the azure GPU workflow runs the examples
29-
# all examples don't need to be added because they aren't used in CI, but these are
30-
- "examples/run_pl_examples.sh"
31-
- "examples/pytorch/basics/backbone_image_classifier.py"
32-
- "examples/pytorch/basics/autoencoder.py"
33-
- "requirements/pytorch/**"
34-
- "src/lightning/__init__.py"
35-
- "src/lightning/__setup__.py"
36-
- "src/lightning/__version__.py"
37-
- "src/lightning/pytorch/**"
38-
- "src/pytorch_lightning/*"
39-
- "tests/tests_pytorch/**"
40-
- "tests/run_standalone_*.sh"
41-
- "pyproject.toml" # includes pytest config
42-
- "requirements/fabric/**"
43-
- "src/lightning/fabric/**"
44-
- "src/lightning_fabric/*"
45-
- "!requirements/docs.txt"
46-
- "!requirements/*/docs.txt"
47-
- "!*.md"
48-
- "!**/*.md"
49-
checks:
50-
- "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-devel-ubuntu22.04, pytorch, 3.10)"
51-
- "pytorch.yml / Lit Job (lightning, 3.12)"
52-
- "pytorch.yml / Lit Job (pytorch, 3.12)"
24+
# Temporarily Disabled until LitBot is available again
25+
# - id: "pytorch_lightning: lit GPU"
26+
# paths:
27+
# - ".actions/*"
28+
# - ".lightning/workflows/pytorch.yml"
29+
# # only the azure GPU workflow runs the examples
30+
# # all examples don't need to be added because they aren't used in CI, but these are
31+
# - "examples/run_pl_examples.sh"
32+
# - "examples/pytorch/basics/backbone_image_classifier.py"
33+
# - "examples/pytorch/basics/autoencoder.py"
34+
# - "requirements/pytorch/**"
35+
# - "src/lightning/__init__.py"
36+
# - "src/lightning/__setup__.py"
37+
# - "src/lightning/__version__.py"
38+
# - "src/lightning/pytorch/**"
39+
# - "src/pytorch_lightning/*"
40+
# - "tests/tests_pytorch/**"
41+
# - "tests/run_standalone_*.sh"
42+
# - "pyproject.toml" # includes pytest config
43+
# - "requirements/fabric/**"
44+
# - "src/lightning/fabric/**"
45+
# - "src/lightning_fabric/*"
46+
# - "!requirements/docs.txt"
47+
# - "!requirements/*/docs.txt"
48+
# - "!*.md"
49+
# - "!**/*.md"
50+
# checks:
51+
# - "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-devel-ubuntu22.04, pytorch, 3.10)"
52+
# - "pytorch.yml / Lit Job (lightning, 3.12)"
53+
# - "pytorch.yml / Lit Job (pytorch, 3.12)"
5354

54-
- id: "Benchmarks"
55-
paths:
56-
- ".lightning/workflows/benchmark.yml"
57-
- "requirements/fabric/**"
58-
- "requirements/pytorch/**"
59-
- "src/lightning/fabric/**"
60-
- "src/lightning/pytorch/**"
61-
- "tests/parity_fabric/**"
62-
- "tests/parity_pytorch/**"
63-
- "!requirements/fabric/docs.txt"
64-
- "!requirements/pytorch/docs.txt"
65-
- "!*.md"
66-
- "!**/*.md"
67-
checks:
68-
- "benchmark.yml / Lit Job (fabric)"
69-
- "benchmark.yml / Lit Job (pytorch)"
70-
71-
# Temporarily disabled
72-
# - id: "pytorch-lightning: TPU workflow"
73-
# paths:
74-
# # tpu CI availability is very limited, so we only require tpu tests
75-
# # to pass when their configurations are modified
76-
# - ".github/workflows/tpu-tests.yml.disabled"
77-
# - "tests/tests_pytorch/run_tpu_tests.sh"
78-
# checks:
79-
# - "test-on-tpus (pytorch, pjrt, v4-8)"
55+
# - id: "Benchmarks"
56+
# paths:
57+
# - ".lightning/workflows/benchmark.yml"
58+
# - "requirements/fabric/**"
59+
# - "requirements/pytorch/**"
60+
# - "src/lightning/fabric/**"
61+
# - "src/lightning/pytorch/**"
62+
# - "tests/parity_fabric/**"
63+
# - "tests/parity_pytorch/**"
64+
# - "!requirements/fabric/docs.txt"
65+
# - "!requirements/pytorch/docs.txt"
66+
# - "!*.md"
67+
# - "!**/*.md"
68+
# checks:
69+
# - "benchmark.yml / Lit Job (fabric)"
70+
# - "benchmark.yml / Lit Job (pytorch)"
71+
#
72+
# # Temporarily disabled
73+
# # - id: "pytorch-lightning: TPU workflow"
74+
# # paths:
75+
# # # tpu CI availability is very limited, so we only require tpu tests
76+
# # # to pass when their configurations are modified
77+
# # - ".github/workflows/tpu-tests.yml.disabled"
78+
# # - "tests/tests_pytorch/run_tpu_tests.sh"
79+
# # checks:
80+
# # - "test-on-tpus (pytorch, pjrt, v4-8)"
8081

8182
- id: "fabric: Docs"
8283
paths:
@@ -129,40 +130,40 @@ subprojects:
129130
checks:
130131
- "fabric-cpu-guardian" # aggregated check for all cases
131132

132-
- id: "lightning_fabric: lit GPU"
133-
paths:
134-
- ".actions/*"
135-
- ".lightning/workflows/fabric.yml"
136-
- "examples/fabric/**"
137-
- "examples/run_fabric_examples.sh"
138-
- "requirements/fabric/**"
139-
- "src/lightning/__init__.py"
140-
- "src/lightning/__setup__.py"
141-
- "src/lightning/__version__.py"
142-
- "src/lightning/fabric/**"
143-
- "src/lightning_fabric/*"
144-
- "tests/tests_fabric/**"
145-
- "tests/run_standalone_*.sh"
146-
- "pyproject.toml" # includes pytest config
147-
- "!requirements/*/docs.txt"
148-
- "!*.md"
149-
- "!**/*.md"
150-
checks:
151-
- "fabric.yml / Lit Job (nvidia/cuda:12.1.1-devel-ubuntu22.04, fabric, 3.10)"
152-
- "fabric.yml / Lit Job (fabric, 3.12)"
153-
- "fabric.yml / Lit Job (lightning, 3.12)"
154-
155-
# Temporarily disabled
156-
# - id: "lightning_fabric: TPU workflow"
157-
# paths:
158-
# # tpu CI availability is very limited, so we only require tpu tests
159-
# # to pass when their configurations are modified
160-
# - ".github/workflows/tpu-tests.yml.disabled"
161-
# - "tests/tests_fabric/run_tpu_tests.sh"
162-
# checks:
163-
# - "test-on-tpus (pytorch, pjrt, v4-8)"
164-
165-
# SECTION: common
133+
# - id: "lightning_fabric: lit GPU"
134+
# paths:
135+
# - ".actions/*"
136+
# - ".lightning/workflows/fabric.yml"
137+
# - "examples/fabric/**"
138+
# - "examples/run_fabric_examples.sh"
139+
# - "requirements/fabric/**"
140+
# - "src/lightning/__init__.py"
141+
# - "src/lightning/__setup__.py"
142+
# - "src/lightning/__version__.py"
143+
# - "src/lightning/fabric/**"
144+
# - "src/lightning_fabric/*"
145+
# - "tests/tests_fabric/**"
146+
# - "tests/run_standalone_*.sh"
147+
# - "pyproject.toml" # includes pytest config
148+
# - "!requirements/*/docs.txt"
149+
# - "!*.md"
150+
# - "!**/*.md"
151+
# checks:
152+
# - "fabric.yml / Lit Job (nvidia/cuda:12.1.1-devel-ubuntu22.04, fabric, 3.10)"
153+
# - "fabric.yml / Lit Job (fabric, 3.12)"
154+
# - "fabric.yml / Lit Job (lightning, 3.12)"
155+
#
156+
# # Temporarily disabled
157+
# # - id: "lightning_fabric: TPU workflow"
158+
# # paths:
159+
# # # tpu CI availability is very limited, so we only require tpu tests
160+
# # # to pass when their configurations are modified
161+
# # - ".github/workflows/tpu-tests.yml.disabled"
162+
# # - "tests/tests_fabric/run_tpu_tests.sh"
163+
# # checks:
164+
# # - "test-on-tpus (pytorch, pjrt, v4-8)"
165+
#
166+
# # SECTION: common
166167

167168
- id: "mypy"
168169
paths:

‎.github/workflows/_legacy-checkpoints.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
6161

6262
- name: Install uv and set Python version
63-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
63+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
6464
with:
6565
python-version: "3.10"
6666
# TODO: Avoid activating environment like this

‎.github/workflows/ci-tests-fabric.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7575

7676
- name: Install uv and set Python version
77-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
77+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
7878
with:
7979
python-version: ${{ matrix.config.python-version || '3.10' }}
8080
# TODO: Avoid activating environment like this

‎.github/workflows/ci-tests-pytorch.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ jobs:
7979
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8080

8181
- name: Install uv and set Python version
82-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
82+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
8383
with:
8484
python-version: ${{ matrix.config.python-version || '3.10' }}
8585
# TODO: Avoid activating environment like this

‎.github/workflows/code-checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3535

3636
- name: Install uv and set Python version
37-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
37+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
3838
with:
3939
python-version: "3.11"
4040
# TODO: Avoid activating environment like this

‎.github/workflows/docs-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
lfs: ${{ matrix.pkg-name == 'pytorch' }}
7575

7676
- name: Install uv and set Python version
77-
uses: astral-sh/setup-uv@37802adc94f370d6bfd71619e3f0bf239e1f3b78 # v7.6.0
77+
uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b # v8.1.0
7878
with:
7979
python-version: "3.10"
8080
# TODO: Avoid activating environment like this

‎.github/workflows/probot-check-group.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ on:
66

77
permissions:
88
pull-requests: write
9+
issues: write
910
contents: read
10-
checks: write
11+
checks: read
1112
statuses: write
1213

1314
concurrency:
@@ -16,7 +17,6 @@ concurrency:
1617

1718
jobs:
1819
required-jobs:
19-
permissions: write-all
2020
runs-on: ubuntu-latest
2121
if: github.event.pull_request.draft == false
2222
timeout-minutes: 71 # in case something is wrong with the internal timeout

‎.github/workflows/release-pkg.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ jobs:
154154
155155
- name: Publish distribution 📦 to PyPI
156156
# pypa/gh-action-pypi-publish v1.13.0
157-
uses: pypa/gh-action-pypi-publish@ed0c53931b1dc9bd32cbe73a98c7f6766f8a527e
157+
uses: pypa/gh-action-pypi-publish@cef221092ed1bacb1cc03d23a2d87d1d172e277b
158158
with:
159159
packages_dir: dist/${{ steps.folder.outputs.pkg }}
160160
verbose: true

‎docs/source-pytorch/_static/paramlinks.css‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/* Keep sphinx_paramlinks anchors inline under the Lightning API theme. */
2+
article.pytorch-article .field-list .anchorjs-link {
3+
display: inline;
4+
position: static;
5+
right: auto;
6+
font-size: 1em !important;
7+
padding-left: 0.25em;
8+
vertical-align: baseline;
9+
}

0 commit comments

Comments
 (0)