Skip to content

Commit a5abecb

Browse files
BordaBorda
authored
Merge branch 'master' into ch/issue-template
2 parents 90de2de + 6da480d commit a5abecb

Some content is hidden

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

57 files changed

+3531
-3579
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/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: 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/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/docker-build.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ jobs:
4848
- { python_version: "3.11", pytorch_version: "2.3", cuda_version: "12.1.1" }
4949
- { python_version: "3.11", pytorch_version: "2.4", cuda_version: "12.1.1" }
5050
- { python_version: "3.12", pytorch_version: "2.5", cuda_version: "12.1.1" }
51-
- { python_version: "3.12", pytorch_version: "2.6", cuda_version: "12.4.1", latest: "true" }
51+
- { python_version: "3.12", pytorch_version: "2.6", cuda_version: "12.4.1" }
52+
- { python_version: "3.12", pytorch_version: "2.7", cuda_version: "12.6.3", latest: "true" }
5253
steps:
5354
- uses: actions/checkout@v4
5455
with:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
lfs: ${{ matrix.pkg-name == 'pytorch' }}
7373
- uses: actions/setup-python@v5
7474
with:
75-
python-version: "3.9"
75+
python-version: "3.10"
7676

7777
- name: List notebooks
7878
if: ${{ matrix.pkg-name == 'pytorch' }}

‎.github/workflows/label-conflicts.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Label conflicts
2+
3+
on:
4+
push:
5+
branches: ["main"]
6+
pull_request_target:
7+
types: ["synchronize", "reopened", "opened"]
8+
9+
concurrency:
10+
group: ${{ github.workflow }}
11+
cancel-in-progress: false
12+
13+
jobs:
14+
triage-conflicts:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # Oct 25, 2021
18+
with:
19+
CONFLICT_LABEL_NAME: "has conflicts"
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
MAX_RETRIES: 3
22+
WAIT_MS: 5000

‎docs/source-fabric/conf.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,8 @@
292292
("py:.*", "torch_xla.*"),
293293
("py:class", "transformer_engine.*"),
294294
("py:class", "bitsandbytes.*"),
295+
# loggers
296+
('py:class', 'tensorboardX.SummaryWriter'), # todo: this is unexpected as the imports locally works
295297
]
296298

297299
# -- Options for todo extension ----------------------------------------------

0 commit comments

Comments
 (0)