Skip to content

Commit 16edd93

Browse files
matsumotosanmatsumotosan
authored
Merge branch 'master' into fix-ret-rules
2 parents 85d5492 + 932b7e3 commit 16edd93

169 files changed

Lines changed: 4132 additions & 1861 deletions

File tree

Some content is hidden

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

‎.github/CODEOWNERS‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
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-
* @lantiga @borda @tchaton @justusschock @ethanwharris
8+
* @lantiga @tchaton @justusschock @ethanwharris
99

1010
# Docs
11-
/.github/*.md @williamfalcon @lantiga @borda
11+
/.github/*.md @williamfalcon @lantiga
1212
/docs/source-fabric/index.rst @williamfalcon @lantiga
1313
/docs/source-pytorch/index.rst @williamfalcon @lantiga
1414
/docs/source-pytorch/levels @williamfalcon @lantiga
1515

1616
/.github/CODEOWNERS @williamfalcon
1717
/SECURITY.md @williamfalcon @lantiga
1818
/README.md @williamfalcon @lantiga
19-
/src/pytorch_lightning/__about__.py @williamfalcon @lantiga @borda
20-
/src/lightning_fabric/__about__.py @williamfalcon @lantiga @borda
19+
/src/pytorch_lightning/__about__.py @williamfalcon @lantiga
20+
/src/lightning_fabric/__about__.py @williamfalcon @lantiga
2121

2222
/src/lightning/fabric/loggers @williamfalcon
2323
/src/lightning/pytorch/loggers @williamfalcon

‎.github/CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,8 @@ We welcome any useful contribution! For your convenience here's a recommended wo
212212
- [Test README](https://github.com/Lightning-AI/pytorch-lightning/blob/master/tests/README.md)
213213
- [CI/CD README](https://github.com/Lightning-AI/pytorch-lightning/tree/master/.github/workflows#readme)
214214

215+
1. Once you have a PR opened (and thereby a PR number), please update the respective changelog for [fabric](https://github.com/Lightning-AI/pytorch-lightning/blob/master/src/lightning/fabric/CHANGELOG.md) or [pytorch](https://github.com/Lightning-AI/pytorch-lightning/blob/master/src/lightning/pytorch/CHANGELOG.md) subpackage depending on where you made your changes.
216+
215217
1. When you feel ready for integrating your work, mark your PR "Ready for review".
216218

217219
- Your code should be readable and follow the project's design principles.

‎.github/ISSUE_TEMPLATE/1_bug_report.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ body:
3838
- "v2.3"
3939
- "v2.4"
4040
- "v2.5"
41+
- "v2.6"
4142
- "master"
4243
validations:
4344
required: true
@@ -102,7 +103,7 @@ body:
102103
<summary>Current environment</summary>
103104
104105
```
105-
#- PyTorch Lightning Version (e.g., 2.5.0):
106+
#- PyTorch Lightning Version (e.g., 2.6.0):
106107
#- PyTorch Version (e.g., 2.5):
107108
#- Python version (e.g., 3.12):
108109
#- OS (e.g., Linux):

‎.github/actions/pkg-publish/action.yml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎.github/advanced-issue-labeler.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,7 @@ policy:
1818
keys: ["v2_4", "v2.4", "2.4.x"]
1919
- name: "ver: 2.5.x"
2020
keys: ["v2_5", "v2.5", "2.5.x"]
21-
- name: "ver: 2.5.x"
21+
- name: "ver: 2.6.x"
22+
keys: ["v2_6", "v2.6", "2.6.x"]
23+
- name: "ver: 2.7.x"
2224
keys: ["master"]

‎.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/stale.yml‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎.github/workflows/README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ The published Docker Hub project is https://hub.docker.com/r/pytorchlightning/py
6767
| workflow file | action |
6868
| ---------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
6969
| .github/mergify.yml | Label PRs as conflicts or ready, and request reviews if needed. |
70-
| .github/stale.yml | Close inactive issues/PRs sometimes after adding the "won't fix" label to them. |
7170
| .github/workflows/probot-auto-cc.yml <br> .github/lightning-probot.yml | Notify maintainers of interest depending on labels added to an issue We utilize lightning-probot forked from PyTorch’s probot. |
7271
| .github/workflows/probot-check-group.yml <br> .github/checkgroup.yml | Checks whether the relevant jobs were successfully run based on the changed files in the PR |
7372
| .pre-commit-config.yaml | It applies a set of linters and formatters and can be registered with your local dev. If needed [bot](https://pre-commit.ci/) pushc changes to each PRs. |

‎.github/workflows/_build-packages.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ jobs:
2525
matrix:
2626
pkg-name: ${{ fromJSON(inputs.pkg-names) }}
2727
steps:
28-
- uses: actions/checkout@v5
29-
- uses: actions/setup-python@v6
28+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
29+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3030
with:
3131
python-version: "3.x"
3232

@@ -41,7 +41,7 @@ jobs:
4141
mkdir -p pypi/${{ matrix.pkg-name }}
4242
cp dist/* pypi/${{ matrix.pkg-name }}/
4343
44-
- uses: actions/upload-artifact@v5
44+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
4545
with:
4646
name: ${{ inputs.artifact-name }}-${{ matrix.pkg-name }}
4747
path: pypi
@@ -51,7 +51,7 @@ jobs:
5151
needs: build-packages
5252
runs-on: ubuntu-22.04
5353
steps:
54-
- uses: actions/download-artifact@v6
54+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
5555
with: # download all build artifacts
5656
pattern: ${{ inputs.artifact-name }}-*
5757
merge-multiple: true
@@ -62,7 +62,7 @@ jobs:
6262
6363
- name: Keep artifact
6464
run: python -c "print('DAYS=' + str(5 if '${{ github.event_name }}'.startswith('pull_request') else 0))" >> $GITHUB_ENV
65-
- uses: actions/upload-artifact@v5
65+
- uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
6666
with:
6767
name: ${{ inputs.artifact-name }}
6868
path: pypi

0 commit comments

Comments
 (0)