Skip to content

Commit c69b69e

Browse files
authored
Merge branch 'master' into cli-ckpt-hparams-subclass-mode
2 parents d809b42 + 3726e54 commit c69b69e

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

.github/checkgroup.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ subprojects:
4747
- "!*.md"
4848
- "!**/*.md"
4949
checks:
50-
- "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, pytorch, 3.10, L4_X_2)"
51-
- "pytorch.yml / Lit Job (nvidia/cuda:12.6.3-runtime-ubuntu22.04, lightning, 3.12, L4_X_2)"
52-
- "pytorch.yml / Lit Job (nvidia/cuda:12.6.3-runtime-ubuntu22.04, pytorch, 3.12, L4_X_2)"
50+
- "pytorch.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, pytorch, 3.10)"
51+
- "pytorch.yml / Lit Job (lightning, 3.12)"
52+
- "pytorch.yml / Lit Job (pytorch, 3.12)"
5353

5454
- id: "Benchmarks"
5555
paths:
@@ -148,9 +148,9 @@ subprojects:
148148
- "!*.md"
149149
- "!**/*.md"
150150
checks:
151-
- "fabric.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, fabric, 3.10, L4_X_2)"
152-
- "fabric.yml / Lit Job (nvidia/cuda:12.6.3-runtime-ubuntu22.04, fabric, 3.12, L4_X_2)"
153-
- "fabric.yml / Lit Job (nvidia/cuda:12.6.3-runtime-ubuntu22.04, lightning, 3.12, L4_X_2)"
151+
- "fabric.yml / Lit Job (nvidia/cuda:12.1.1-runtime-ubuntu22.04, fabric, 3.10)"
152+
- "fabric.yml / Lit Job (fabric, 3.12)"
153+
- "fabric.yml / Lit Job (lightning, 3.12)"
154154

155155
# Temporarily disabled
156156
# - id: "lightning_fabric: TPU workflow"

.lightning/workflows/fabric.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@ trigger:
55
branches: ["master", "release/stable"]
66

77
timeout: "60" # minutes
8+
machine: "L4_X_2"
9+
image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
810
parametrize:
911
matrix: {}
1012
include:
1113
# note that this is setting also all oldest requirements which is linked to python == 3.10
1214
- image: "nvidia/cuda:12.1.1-runtime-ubuntu22.04"
1315
PACKAGE_NAME: "fabric"
1416
python_version: "3.10"
15-
machine: "L4_X_2"
16-
- image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
17-
PACKAGE_NAME: "fabric"
17+
- PACKAGE_NAME: "fabric"
1818
python_version: "3.12"
19-
machine: "L4_X_2"
2019
# - image: "nvidia/cuda:12.6-runtime-ubuntu22.04"
2120
# PACKAGE_NAME: "fabric"
22-
- image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
23-
PACKAGE_NAME: "lightning"
21+
- PACKAGE_NAME: "lightning"
2422
python_version: "3.12"
25-
machine: "L4_X_2"
2623
exclude: []
2724

2825
env:

.lightning/workflows/pytorch.yml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,21 @@ trigger:
55
branches: ["master", "release/stable"]
66

77
timeout: "60" # minutes
8+
machine: "L4_X_2"
9+
image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
810
parametrize:
911
matrix: {}
1012
include:
1113
# note that this also sets oldest requirements which are linked to Python == 3.10
1214
- image: "nvidia/cuda:12.1.1-runtime-ubuntu22.04"
1315
PACKAGE_NAME: "pytorch"
1416
python_version: "3.10"
15-
machine: "L4_X_2"
16-
- image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
17-
PACKAGE_NAME: "pytorch"
17+
- PACKAGE_NAME: "pytorch"
1818
python_version: "3.12"
19-
machine: "L4_X_2"
2019
# - image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
2120
# PACKAGE_NAME: "pytorch"
22-
- image: "nvidia/cuda:12.6.3-runtime-ubuntu22.04"
23-
PACKAGE_NAME: "lightning"
21+
- PACKAGE_NAME: "lightning"
2422
python_version: "3.12"
25-
machine: "L4_X_2"
2623
exclude: []
2724

2825
env:

docs/source-pytorch/conf.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@ def package_list_from_file(file):
645645
r"installation.html$",
646646
r"starter/installation.html$",
647647
r"^../common/trainer.html#trainer-flags$",
648+
"https://medium.com/pytorch-lightning/quick-contribution-guide-86d977171b3a",
648649
"https://deepgenerativemodels.github.io/assets/slides/cs236_lecture11.pdf",
649650
"https://developer.habana.ai", # returns 403 error but redirects to intel.com documentation
650651
"https://www.intel.com/content/www/us/en/products/docs/processors/what-is-a-gpu.html",

docs/source-pytorch/data/alternatives.rst

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,12 @@ The webdataset library contains a small wrapper (``WebLoader``) that adds a flui
9999
import lightning as L
100100
import webdataset as wds
101101
102-
dataset = wds.WebDataset(urls)
102+
dataset = wds.WebDataset(
103+
urls,
104+
# needed for multi-gpu or multi-node training
105+
workersplitter=wds.shardlists.split_by_worker,
106+
nodesplitter=wds.shardlists.split_by_node,
107+
)
103108
train_dataloader = wds.WebLoader(dataset)
104109
105110
model = ...

0 commit comments

Comments
 (0)