Skip to content

Commit 1cd61d1

Browse files
committed
Merge branch 'master' into bump/pt-2.5
2 parents 5496f3e + 3627c5b commit 1cd61d1

File tree

5 files changed

+14
-14
lines changed

5 files changed

+14
-14
lines changed

.github/checkgroup.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ subprojects:
4040
- "pl-cpu (macOS-14, pytorch, 3.9, 2.1)"
4141
- "pl-cpu (ubuntu-20.04, pytorch, 3.9, 2.1)"
4242
- "pl-cpu (windows-2022, pytorch, 3.9, 2.1)"
43-
- "pl-cpu (macOS-12, pytorch, 3.10, 2.1)"
43+
- "pl-cpu (macOS-13, pytorch, 3.10, 2.1)"
4444
- "pl-cpu (ubuntu-22.04, pytorch, 3.10, 2.1)"
4545
- "pl-cpu (windows-2022, pytorch, 3.10, 2.1)"
4646

@@ -192,7 +192,7 @@ subprojects:
192192
- "fabric-cpu (macOS-14, fabric, 3.9, 2.1)"
193193
- "fabric-cpu (ubuntu-20.04, fabric, 3.9, 2.1)"
194194
- "fabric-cpu (windows-2022, fabric, 3.9, 2.1)"
195-
- "fabric-cpu (macOS-12, fabric, 3.10, 2.1)"
195+
- "fabric-cpu (macOS-13, fabric, 3.10, 2.1)"
196196
- "fabric-cpu (ubuntu-22.04, fabric, 3.10, 2.1)"
197197
- "fabric-cpu (windows-2022, fabric, 3.10, 2.1)"
198198

@@ -266,14 +266,14 @@ subprojects:
266266
- "install-pkg (ubuntu-22.04, lightning, 3.11)"
267267
- "install-pkg (ubuntu-22.04, notset, 3.9)"
268268
- "install-pkg (ubuntu-22.04, notset, 3.11)"
269-
- "install-pkg (macOS-12, fabric, 3.9)"
270-
- "install-pkg (macOS-12, fabric, 3.11)"
271-
- "install-pkg (macOS-12, pytorch, 3.9)"
272-
- "install-pkg (macOS-12, pytorch, 3.11)"
273-
- "install-pkg (macOS-12, lightning, 3.9)"
274-
- "install-pkg (macOS-12, lightning, 3.11)"
275-
- "install-pkg (macOS-12, notset, 3.9)"
276-
- "install-pkg (macOS-12, notset, 3.11)"
269+
- "install-pkg (macOS-13, fabric, 3.9)"
270+
- "install-pkg (macOS-13, fabric, 3.11)"
271+
- "install-pkg (macOS-13, pytorch, 3.9)"
272+
- "install-pkg (macOS-13, pytorch, 3.11)"
273+
- "install-pkg (macOS-13, lightning, 3.9)"
274+
- "install-pkg (macOS-13, lightning, 3.11)"
275+
- "install-pkg (macOS-13, notset, 3.9)"
276+
- "install-pkg (macOS-13, notset, 3.11)"
277277
- "install-pkg (windows-2022, fabric, 3.9)"
278278
- "install-pkg (windows-2022, fabric, 3.11)"
279279
- "install-pkg (windows-2022, pytorch, 3.9)"

.github/workflows/ci-pkg-install.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
strategy:
4343
fail-fast: false
4444
matrix:
45-
os: ["ubuntu-22.04", "macOS-12", "windows-2022"]
45+
os: ["ubuntu-22.04", "macOS-13", "windows-2022"]
4646
pkg-name: ["fabric", "pytorch", "lightning", "notset"]
4747
python-version: ["3.9", "3.11"]
4848
steps:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
5757
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
5858
# only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
59-
- { os: "macOS-12", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.1" }
59+
- { os: "macOS-13", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.1" }
6060
- { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.1" }
6161
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.1" }
6262
# "oldest" versions tests, only on minimum Python

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
6161
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.12", pytorch-version: "2.5" }
6262
# only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
63-
- { os: "macOS-12", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.1" }
63+
- { os: "macOS-13", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.1" }
6464
- { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.1" }
6565
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.1" }
6666
# "oldest" versions tests, only on minimum Python

_notebooks

0 commit comments

Comments
 (0)