Skip to content

Commit df2f6df

Browse files
SkafteNickiSkafteNicki
authored
Merge branch 'master' into bugfix_model_checkpoint_save_last_not_exists
2 parents 292bca9 + c943c05 commit df2f6df

File tree

33 files changed

+308
-101
lines changed

33 files changed

+308
-101
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"

‎.github/workflows/_legacy-checkpoints.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- uses: actions/checkout@v5
5959

6060
- name: Install uv and set Python version
61-
uses: astral-sh/setup-uv@v6
61+
uses: astral-sh/setup-uv@v7
6262
with:
6363
python-version: "3.9"
6464
# TODO: Avoid activating environment like this

‎.github/workflows/ci-tests-fabric.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
- uses: actions/checkout@v5
7272

7373
- name: Install uv and set Python version
74-
uses: astral-sh/setup-uv@v6
74+
uses: astral-sh/setup-uv@v7
7575
with:
7676
python-version: ${{ matrix.config.python-version || '3.9' }}
7777
# TODO: Avoid activating environment like this

‎.github/workflows/ci-tests-pytorch.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
- uses: actions/checkout@v5
7777

7878
- name: Install uv and set Python version
79-
uses: astral-sh/setup-uv@v6
79+
uses: astral-sh/setup-uv@v7
8080
with:
8181
python-version: ${{ matrix.config.python-version || '3.9' }}
8282
# TODO: Avoid activating environment like this

‎.github/workflows/code-checks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: actions/checkout@v5
3232

3333
- name: Install uv and set Python version
34-
uses: astral-sh/setup-uv@v6
34+
uses: astral-sh/setup-uv@v7
3535
with:
3636
python-version: "3.11"
3737
# TODO: Avoid activating environment like this

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
lfs: ${{ matrix.pkg-name == 'pytorch' }}
7474

7575
- name: Install uv and set Python version
76-
uses: astral-sh/setup-uv@v6
76+
uses: astral-sh/setup-uv@v7
7777
with:
7878
python-version: "3.10"
7979
# TODO: Avoid activating environment like this

‎.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:

‎.pre-commit-config.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ci:
2323

2424
repos:
2525
- repo: https://github.com/pre-commit/pre-commit-hooks
26-
rev: v5.0.0
26+
rev: v6.0.0
2727
hooks:
2828
- id: end-of-file-fixer
2929
- id: trailing-whitespace
@@ -70,7 +70,7 @@ repos:
7070
- id: sphinx-lint
7171

7272
- repo: https://github.com/astral-sh/ruff-pre-commit
73-
rev: v0.12.2
73+
rev: v0.13.3
7474
hooks:
7575
# try to fix what is possible
7676
- id: ruff
@@ -95,8 +95,8 @@ repos:
9595
README.md
9696
)$
9797
98-
- repo: https://github.com/pre-commit/mirrors-prettier
99-
rev: v3.1.0
98+
- repo: https://github.com/JoC0de/pre-commit-prettier
99+
rev: v3.6.2
100100
hooks:
101101
- id: prettier
102102
# https://prettier.io/docs/en/options.html#print-width

‎Makefile‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ export SPHINX_MOCK_REQUIREMENTS=1
77
# install only Lightning Trainer packages
88
export PACKAGE_NAME=pytorch
99

10+
11+
# In Lightning Studio, the `lightning` package comes pre-installed.
12+
# Uninstall it first to ensure the editable install works correctly.
1013
setup:
14+
uv pip uninstall lightning pytorch-lightning lightning-fabric || true
1115
uv pip install -r requirements.txt \
1216
-r requirements/pytorch/base.txt \
1317
-r requirements/pytorch/test.txt \

0 commit comments

Comments
 (0)