From 8137b65d4135152f8f2d9b4b48589c339b1e8c0a Mon Sep 17 00:00:00 2001 From: awaelchli Date: Sun, 30 Jun 2024 18:52:32 +0200 Subject: [PATCH 1/2] Replace macOS-11 with macOS-14 --- .github/checkgroup.yml | 22 +++++++++++----------- .github/workflows/ci-tests-fabric.yml | 10 +++++----- .github/workflows/ci-tests-pytorch.yml | 10 +++++----- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml index 720cb47b4bb07..8527f923ae72a 100644 --- a/.github/checkgroup.yml +++ b/.github/checkgroup.yml @@ -19,10 +19,10 @@ subprojects: - "!*.md" - "!**/*.md" checks: - - "pl-cpu (macOS-11, lightning, 3.8, 2.0, oldest)" - - "pl-cpu (macOS-11, lightning, 3.10, 2.0)" - - "pl-cpu (macOS-11, lightning, 3.10, 2.1)" - - "pl-cpu (macOS-11, lightning, 3.10, 2.2)" + - "pl-cpu (macOS-14, lightning, 3.8, 2.0, oldest)" + - "pl-cpu (macOS-14, lightning, 3.10, 2.0)" + - "pl-cpu (macOS-14, lightning, 3.10, 2.1)" + - "pl-cpu (macOS-14, lightning, 3.10, 2.2)" - "pl-cpu (macOS-14, lightning, 3.10, 2.3)" - "pl-cpu (ubuntu-20.04, lightning, 3.8, 2.0, oldest)" - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.0)" @@ -34,7 +34,7 @@ subprojects: - "pl-cpu (windows-2022, lightning, 3.10, 2.1)" - "pl-cpu (windows-2022, lightning, 3.10, 2.2)" - "pl-cpu (windows-2022, lightning, 3.10, 2.3)" - - "pl-cpu (macOS-11, pytorch, 3.8, 2.0)" + - "pl-cpu (macOS-14, pytorch, 3.8, 2.0)" - "pl-cpu (ubuntu-20.04, pytorch, 3.8, 2.0)" - "pl-cpu (windows-2022, pytorch, 3.8, 2.0)" - "pl-cpu (macOS-12, pytorch, 3.11, 2.0)" @@ -171,10 +171,10 @@ subprojects: - "!*.md" - "!**/*.md" checks: - - "fabric-cpu (macOS-11, lightning, 3.8, 2.0, oldest)" - - "fabric-cpu (macOS-11, lightning, 3.10, 2.0)" - - "fabric-cpu (macOS-11, lightning, 3.11, 2.1)" - - "fabric-cpu (macOS-11, lightning, 3.11, 2.2)" + - "fabric-cpu (macOS-14, lightning, 3.8, 2.0, oldest)" + - "fabric-cpu (macOS-14, lightning, 3.10, 2.0)" + - "fabric-cpu (macOS-14, lightning, 3.11, 2.1)" + - "fabric-cpu (macOS-14, lightning, 3.11, 2.2)" - "fabric-cpu (macOS-14, lightning, 3.10, 2.3)" - "fabric-cpu (ubuntu-20.04, lightning, 3.8, 2.0, oldest)" - "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.0)" @@ -186,7 +186,7 @@ subprojects: - "fabric-cpu (windows-2022, lightning, 3.11, 2.1)" - "fabric-cpu (windows-2022, lightning, 3.11, 2.2)" - "fabric-cpu (windows-2022, lightning, 3.11, 2.3)" - - "fabric-cpu (macOS-11, fabric, 3.8, 2.0)" + - "fabric-cpu (macOS-14, fabric, 3.8, 2.0)" - "fabric-cpu (ubuntu-20.04, fabric, 3.8, 2.0)" - "fabric-cpu (windows-2022, fabric, 3.8, 2.0)" - "fabric-cpu (macOS-12, fabric, 3.11, 2.0)" @@ -298,7 +298,7 @@ subprojects: - "src/lightning/store/**" - "tests/tests_store/**" checks: - - "store-cpu (macOS-11, lightning, 3.10, 2.0)" + - "store-cpu (macOS-14, lightning, 3.10, 2.0)" - "store-cpu (ubuntu-20.04, lightning, 3.10, 2.0)" - "store-cpu (windows-2022, lightning, 3.10, 2.0)" diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml index 082636a617227..6358bf6681707 100644 --- a/.github/workflows/ci-tests-fabric.yml +++ b/.github/workflows/ci-tests-fabric.yml @@ -39,14 +39,14 @@ jobs: fail-fast: false matrix: include: - - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" } + - { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" } - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" } - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" } # only run PyTorch latest - - { os: "macOS-11", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" } + - { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" } - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" } - { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" } - - { os: "macOS-11", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" } + - { os: "macOS-14", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" } - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" } - { os: "windows-2022", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" } - { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.3" } @@ -60,7 +60,7 @@ jobs: - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" } - { os: "windows-2022", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" } # "oldest" versions tests, only on minimum Python - - { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" } + - { os: "macOS-14", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" } - { os: "ubuntu-20.04", pkg-name: "lightning", @@ -76,7 +76,7 @@ jobs: requires: "oldest", } # "fabric" installs the standalone package - - { os: "macOS-11", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" } + - { os: "macOS-14", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" } - { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" } - { os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "2.0" } timeout-minutes: 25 # because of building grpcio on Mac diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml index b0b10ef4acea8..b4a8002428e8d 100644 --- a/.github/workflows/ci-tests-pytorch.yml +++ b/.github/workflows/ci-tests-pytorch.yml @@ -43,14 +43,14 @@ jobs: fail-fast: false matrix: include: - - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" } + - { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" } - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" } - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.0" } # only run PyTorch latest - - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" } + - { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" } - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" } - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" } - - { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.2" } + - { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.2" } - { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.2" } - { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.2" } - { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.3" } @@ -64,7 +64,7 @@ jobs: - { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" } - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" } # "oldest" versions tests, only on minimum Python - - { os: "macOS-11", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" } + - { os: "macOS-14", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" } - { os: "ubuntu-20.04", pkg-name: "lightning", @@ -80,7 +80,7 @@ jobs: requires: "oldest", } # "pytorch" installs the standalone package - - { os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" } + - { os: "macOS-14", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" } - { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" } - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "2.0" } timeout-minutes: 50 From bff2b6ac042341b19376a1e292b5d318360d3adc Mon Sep 17 00:00:00 2001 From: awaelchli Date: Sun, 30 Jun 2024 19:05:06 +0200 Subject: [PATCH 2/2] oldest --- .github/checkgroup.yml | 4 ++-- .github/workflows/ci-tests-fabric.yml | 2 +- .github/workflows/ci-tests-pytorch.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml index 8527f923ae72a..22b2dee5dd059 100644 --- a/.github/checkgroup.yml +++ b/.github/checkgroup.yml @@ -19,7 +19,7 @@ subprojects: - "!*.md" - "!**/*.md" checks: - - "pl-cpu (macOS-14, lightning, 3.8, 2.0, oldest)" + - "pl-cpu (macOS-13, lightning, 3.8, 2.0, oldest)" - "pl-cpu (macOS-14, lightning, 3.10, 2.0)" - "pl-cpu (macOS-14, lightning, 3.10, 2.1)" - "pl-cpu (macOS-14, lightning, 3.10, 2.2)" @@ -171,7 +171,7 @@ subprojects: - "!*.md" - "!**/*.md" checks: - - "fabric-cpu (macOS-14, lightning, 3.8, 2.0, oldest)" + - "fabric-cpu (macOS-13, lightning, 3.8, 2.0, oldest)" - "fabric-cpu (macOS-14, lightning, 3.10, 2.0)" - "fabric-cpu (macOS-14, lightning, 3.11, 2.1)" - "fabric-cpu (macOS-14, lightning, 3.11, 2.2)" diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml index 6358bf6681707..009e03f38c7bd 100644 --- a/.github/workflows/ci-tests-fabric.yml +++ b/.github/workflows/ci-tests-fabric.yml @@ -60,7 +60,7 @@ jobs: - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" } - { os: "windows-2022", pkg-name: "fabric", python-version: "3.11", pytorch-version: "2.1" } # "oldest" versions tests, only on minimum Python - - { os: "macOS-14", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" } + - { os: "macOS-13", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" } - { os: "ubuntu-20.04", pkg-name: "lightning", diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml index b4a8002428e8d..967369976ed23 100644 --- a/.github/workflows/ci-tests-pytorch.yml +++ b/.github/workflows/ci-tests-pytorch.yml @@ -64,7 +64,7 @@ jobs: - { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" } - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.11", pytorch-version: "2.1" } # "oldest" versions tests, only on minimum Python - - { os: "macOS-14", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" } + - { os: "macOS-13", pkg-name: "lightning", python-version: "3.8", pytorch-version: "2.0", requires: "oldest" } - { os: "ubuntu-20.04", pkg-name: "lightning",