Skip to content

Commit 7288ce6

Browse files
authored
Merge branch 'master' into comet-flush-experiment-after-checkpoint
2 parents 4f90bf9 + 6675932 commit 7288ce6

File tree

118 files changed

+4063
-3856
lines changed

Some content is hidden

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

118 files changed

+4063
-3856
lines changed

.azure/gpu-tests-fabric.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +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"
64-
PACKAGE_NAME: "fabric"
65-
"Fabric | future":
6663
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
6764
PACKAGE_NAME: "fabric"
65+
#"Fabric | future":
66+
# image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
67+
# PACKAGE_NAME: "fabric"
6868
"Lightning | latest":
69-
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"
7070
PACKAGE_NAME: "lightning"
7171
workspace:
7272
clean: all

.azure/gpu-tests-pytorch.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +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"
57-
PACKAGE_NAME: "pytorch"
58-
"PyTorch | future":
5956
image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
6057
PACKAGE_NAME: "pytorch"
58+
#"PyTorch | future":
59+
# image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.7-cuda12.6.3"
60+
# PACKAGE_NAME: "pytorch"
6161
"Lightning | latest":
62-
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"
6363
PACKAGE_NAME: "lightning"
6464
pool: lit-rtx-3090
6565
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/ISSUE_TEMPLATE/1_bug_report.yaml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,22 @@ body:
4646
attributes:
4747
value: "**Note: The rest of this form is optional, but filling it out may help us to provide better support.**"
4848

49+
- type: input
50+
attributes:
51+
label: Reproduced in studio
52+
description: >
53+
Create a new Lightning Studio with code that reproduces the issue and share the link.
54+
Also include all the relevant files and data required to reproduce shared issue.
55+
In case the code does not crash, please add assert statements to show what is the real and expected output.
56+
A simple guide on how to create such a studio can be found [here](https://www.youtube.com/watch?v=YcW-2Zt_bFg&ab_channel=LightningAI).
57+
placeholder: https://lightning.ai/live-session/...
58+
validations:
59+
required: false
4960
- type: textarea
5061
attributes:
5162
label: How to reproduce the bug
5263
description: >
53-
Provide steps and example code here.
54-
You can also paste a link to Google Colab (see our [Colab bug report template](https://colab.research.google.com/github/Lightning-AI/lightning/blob/master/examples/pytorch/bug_report/bug_report_model.ipynb)) or adapt this minimal [snippet](https://github.com/Lightning-AI/lightning/blob/master/examples/pytorch/bug_report/bug_report_model.py).
64+
In the special case when the issue can't be reproduced in a studio, provide steps and example code here.
5565
placeholder: |
5666
```python
5767
# Sample code to reproduce the problem

.github/checkgroup.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ subprojects:
134134
- "build-pl (3.11, 2.3, 12.1.1)"
135135
- "build-pl (3.11, 2.4, 12.1.1)"
136136
- "build-pl (3.12, 2.5, 12.1.1)"
137-
- "build-pl (3.12, 2.6, 12.4.1, true)"
137+
- "build-pl (3.12, 2.6, 12.4.1)"
138+
- "build-pl (3.12, 2.7, 12.6.3, true)"
138139

139140
# SECTION: lightning_fabric
140141

.github/dependabot.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ updates:
1919
separator: "-"
2020
# Allow up to 5 open pull requests for pip dependencies
2121
open-pull-requests-limit: 10
22-
reviewers:
23-
- "Lightning-AI/teams/core-lightning"
2422

2523
# Enable version updates for GitHub Actions
2624
- package-ecosystem: "github-actions"
@@ -37,5 +35,3 @@ updates:
3735
separator: "-"
3836
# Allow up to 5 open pull requests for GitHub Actions
3937
open-pull-requests-limit: 10
40-
reviewers:
41-
- "Lightning-AI/teams/core-lightning"

.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: 3 additions & 2 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:

0 commit comments

Comments
 (0)