Skip to content

Commit 0096755

Browse files
authored
Merge branch 'master' into feature/trainer-compile-fn
2 parents 20c5353 + d5208f7 commit 0096755

File tree

108 files changed

+4109
-3816
lines changed

Some content is hidden

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

108 files changed

+4109
-3816
lines changed

.azure/gpu-tests-fabric.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,13 @@ jobs:
6060
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
6161
PACKAGE_NAME: "fabric"
6262
"Fabric | latest":
63-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
63+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
6464
PACKAGE_NAME: "fabric"
65+
#"Fabric | future":
66+
# image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
67+
# PACKAGE_NAME: "fabric"
6568
"Lightning | latest":
66-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
69+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
6770
PACKAGE_NAME: "lightning"
6871
workspace:
6972
clean: all

.azure/gpu-tests-pytorch.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,13 @@ jobs:
5353
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
5454
PACKAGE_NAME: "pytorch"
5555
"PyTorch | latest":
56-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
56+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
5757
PACKAGE_NAME: "pytorch"
58+
#"PyTorch | future":
59+
# image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
60+
# PACKAGE_NAME: "pytorch"
5861
"Lightning | latest":
59-
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
62+
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
6063
PACKAGE_NAME: "lightning"
6164
pool: lit-rtx-3090
6265
variables:

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@
1818
/README.md @williamfalcon @lantiga
1919
/src/pytorch_lightning/__about__.py @williamfalcon @lantiga @borda
2020
/src/lightning_fabric/__about__.py @williamfalcon @lantiga @borda
21+
22+
/src/lightning/fabric/loggers @williamfalcon
23+
/src/lightning/pytorch/loggers @williamfalcon

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ _**Note**, even if you do not find the solution, sending a PR with a test coveri
9797

9898
1. Add/update the relevant tests!
9999

100-
- [This PR](https://github.com/Lightning-AI/lightning/pull/2671) is a good example for adding a new metric, and [this one for a new logger](https://github.com/Lightning-AI/lightning/pull/2721).
100+
- [This PR](https://github.com/Lightning-AI/pytorch-lightning/pull/2671) is a good example for adding a new metric, and [this one for a new logger](https://github.com/Lightning-AI/pytorch-lightning/pull/2721).
101101

102102
### Test cases:
103103

.github/checkgroup.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,15 @@ subprojects:
127127
- "build-cuda (3.11, 2.3.1, 12.1.1)"
128128
- "build-cuda (3.11, 2.4.1, 12.1.1)"
129129
- "build-cuda (3.12, 2.5.1, 12.1.1)"
130+
- "build-cuda (3.12, 2.6.0, 12.4.1)"
130131
#- "build-NGC"
131132
- "build-pl (3.10, 2.1, 12.1.1)"
132133
- "build-pl (3.11, 2.2, 12.1.1)"
133134
- "build-pl (3.11, 2.3, 12.1.1)"
134135
- "build-pl (3.11, 2.4, 12.1.1)"
135-
- "build-pl (3.12, 2.5, 12.1.1, true)"
136+
- "build-pl (3.12, 2.5, 12.1.1)"
137+
- "build-pl (3.12, 2.6, 12.4.1)"
138+
- "build-pl (3.12, 2.7, 12.6.3, true)"
136139

137140
# SECTION: lightning_fabric
138141

.github/markdown-links-config.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
{
22
"ignorePatterns": [
33
{
4-
"pattern": "^https://github.com/Lightning-AI/lightning/pull/.*"
5-
},
6-
{
7-
"pattern": "^https://dev.azure.com/Lightning-AI/lightning/_apis/build/status.*"
4+
"pattern": "^https://github.com/Lightning-AI/pytorch-lightning/pull/"
85
}
96
],
107
"httpHeaders": [

.github/mergify.yml

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

.github/workflows/_legacy-checkpoints.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ defaults:
5151

5252
jobs:
5353
create-legacy-ckpts:
54-
runs-on: ubuntu-20.04
54+
runs-on: ubuntu-22.04
5555
outputs:
5656
pl-version: ${{ steps.decide-version.outputs.pl-version }}
5757
steps:
@@ -113,6 +113,7 @@ jobs:
113113

114114
- run: pip install -r requirements/ci.txt
115115
- name: Upload checkpoints to S3
116+
if: secrets.AWS_REGION != ''
116117
working-directory: ${{ env.LEGACY_FOLDER }}
117118
env:
118119
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY }}
@@ -124,7 +125,7 @@ jobs:
124125
aws s3 cp $AWS_RUN checkpoints.zip s3://pl-public-data/legacy/ --acl public-read
125126
126127
add-ckpt-test:
127-
runs-on: ubuntu-20.04
128+
runs-on: ubuntu-22.04
128129
if: inputs.create_pr
129130
needs: create-legacy-ckpts
130131
env:
@@ -144,7 +145,7 @@ jobs:
144145
title: Adding test for legacy checkpoint created with ${{ env.PL_VERSION }}
145146
committer: GitHub <[email protected]>
146147
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
147-
commit-message: "update tutorials to `${{ env.PL_VERSION }}`"
148+
commit-message: "adding `${{ env.PL_VERSION }}` checkpoint"
148149
body: "**This is automated addition of created checkpoints with the latest `lightning` release!**"
149150
delete-branch: true
150151
token: ${{ secrets.PAT_GHOST }}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@ on:
2323
jobs:
2424
cron-clear:
2525
if: github.event_name == 'schedule' || github.event_name == 'pull_request'
26-
uses: Lightning-AI/utilities/.github/workflows/[email protected].0
26+
uses: Lightning-AI/utilities/.github/workflows/[email protected].3
2727
with:
28-
scripts-ref: v0.14.0
28+
scripts-ref: v0.14.3
2929
dry-run: ${{ github.event_name == 'pull_request' }}
3030
pattern: "latest|docs"
3131
age-days: 7
3232

3333
direct-clear:
3434
if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
35-
uses: Lightning-AI/utilities/.github/workflows/[email protected].0
35+
uses: Lightning-AI/utilities/.github/workflows/[email protected].3
3636
with:
37-
scripts-ref: v0.14.0
37+
scripts-ref: v0.14.3
3838
dry-run: ${{ github.event_name == 'pull_request' }}
3939
pattern: ${{ inputs.pattern || 'pypi_wheels' }} # setting str in case of PR / debugging
4040
age-days: ${{ fromJSON(inputs.age-days) || 0 }} # setting 0 in case of PR / debugging

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ 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].3
1818
with:
1919
config-file: ".github/markdown-links-config.json"
2020
base-branch: "master"

0 commit comments

Comments
 (0)