Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: adding testing with M1 [1/2: without Fabric] [wip] #19477

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+37 −28
Open

ci: adding testing with M1 [1/2: without Fabric] [wip] #19477

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
12b32ec
ci: adding testing with M1
Borda Feb 15, 2024
375bd01
Merge branch 'master' into ci/m1
Borda Feb 15, 2024
1cda5fa
Merge branch 'master' into ci/m1
Borda Feb 26, 2024
0f7aa1b
Merge branch 'master' into ci/m1
Borda Mar 4, 2024
c02929a
skip fabric
Borda Mar 7, 2024
832e504
Merge branch 'master' into ci/m1
Borda Mar 7, 2024
ed28091
skip fabric
Borda Mar 7, 2024
bd92bbe
Merge branch 'ci/m1' of https://github.com/PyTorchLightning/pytorch-l…
Borda Mar 7, 2024
b2377ab
app + PL
Borda Mar 7, 2024
6385e02
Merge branch 'master' into ci/m1
Borda Apr 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions .github/checkgroup.yml
View file
Open in desktop
Expand Up @@ -20,9 +20,9 @@ subprojects:
- "!**/*.md"
checks:
- "pl-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
- "pl-cpu (macOS-11, lightning, 3.10, 1.13)"
- "pl-cpu (macOS-11, lightning, 3.10, 2.1)"
- "pl-cpu (macOS-11, lightning, 3.10, 2.2)"
- "pl-cpu (macOS-12, lightning, 3.10, 1.13)"
- "pl-cpu (macOS-12, lightning, 3.10, 2.1)"
- "pl-cpu (macOS-12, lightning, 3.10, 2.2)"
- "pl-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest)"
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
- "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
Expand All @@ -31,7 +31,7 @@ subprojects:
- "pl-cpu (windows-2022, lightning, 3.10, 1.13)"
- "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
- "pl-cpu (windows-2022, lightning, 3.10, 2.2)"
- "pl-cpu (macOS-11, pytorch, 3.8, 1.13)"
- "pl-cpu (macOS-12, pytorch, 3.8, 1.13)"
- "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13)"
- "pl-cpu (windows-2022, pytorch, 3.8, 1.13)"
- "pl-cpu (macOS-12, pytorch, 3.11, 2.0)"
Expand Down Expand Up @@ -166,9 +166,9 @@ subprojects:
- "!**/*.md"
checks:
- "fabric-cpu (macOS-11, lightning, 3.8, 1.13, oldest)"
- "fabric-cpu (macOS-11, lightning, 3.10, 1.13)"
- "fabric-cpu (macOS-11, lightning, 3.11, 2.1)"
- "fabric-cpu (macOS-11, lightning, 3.11, 2.2)"
- "fabric-cpu (macOS-12, lightning, 3.10, 1.13)"
- "fabric-cpu (macOS-12, lightning, 3.11, 2.1)"
- "fabric-cpu (macOS-12, lightning, 3.11, 2.2)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.8, 1.13, oldest)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.10, 1.13)"
- "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1)"
Expand All @@ -177,7 +177,7 @@ subprojects:
- "fabric-cpu (windows-2022, lightning, 3.10, 1.13)"
- "fabric-cpu (windows-2022, lightning, 3.11, 2.1)"
- "fabric-cpu (windows-2022, lightning, 3.11, 2.2)"
- "fabric-cpu (macOS-11, fabric, 3.8, 1.13)"
- "fabric-cpu (macOS-12, fabric, 3.8, 1.13)"
- "fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13)"
- "fabric-cpu (windows-2022, fabric, 3.8, 1.13)"
- "fabric-cpu (macOS-12, fabric, 3.11, 2.0)"
Expand Down Expand Up @@ -233,9 +233,9 @@ subprojects:
- "!*.md"
- "!**/*.md"
checks:
- "app-pytest (macOS-11, lightning, 3.8, latest)"
- "app-pytest (macOS-11, lightning, 3.8, oldest)"
- "app-pytest (macOS-11, app, 3.9, latest)"
- "app-pytest (macOS-12, lightning, 3.8, latest)"
- "app-pytest (macOS-12, lightning, 3.8, oldest)"
- "app-pytest (macOS-12, app, 3.9, latest)"
- "app-pytest (macOS-12, app, 3.11, latest)"
- "app-pytest (ubuntu-20.04, lightning, 3.8, latest)"
- "app-pytest (ubuntu-20.04, lightning, 3.8, oldest)"
Expand All @@ -261,9 +261,9 @@ subprojects:
- "!*.md"
- "!**/*.md"
checks:
- "app-examples (macOS-11, lightning, 3.9, latest)"
- "app-examples (macOS-11, lightning, 3.9, oldest)"
- "app-examples (macOS-11, app, 3.9, latest)"
- "app-examples (macOS-12, lightning, 3.9, latest)"
- "app-examples (macOS-12, lightning, 3.9, oldest)"
- "app-examples (macOS-12, app, 3.9, latest)"
- "app-examples (ubuntu-20.04, lightning, 3.9, latest)"
- "app-examples (ubuntu-20.04, lightning, 3.9, oldest)"
- "app-examples (ubuntu-20.04, app, 3.9, latest)"
Expand All @@ -289,7 +289,7 @@ subprojects:
- "src/lightning/store/**"
- "tests/tests_store/**"
checks:
- "store-cpu (macOS-11, lightning, 3.10, 2.0)"
- "store-cpu (macOS-12, lightning, 3.10, 2.0)"
- "store-cpu (ubuntu-20.04, lightning, 3.10, 2.0)"
- "store-cpu (windows-2022, lightning, 3.10, 2.0)"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-examples-app.yml
View file
Open in desktop
Expand Up @@ -36,13 +36,13 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-20.04, macOS-11, windows-2022]
os: [ubuntu-20.04, macOS-12, windows-2022]
pkg-name: ["lightning"]
python-version: ["3.9"]
requires: ["oldest", "latest"]
include:
# "app" installs the standalone package
- { os: "macOS-11", pkg-name: "app", python-version: "3.9", requires: "latest" }
- { os: "macOS-12", pkg-name: "app", python-version: "3.9", requires: "latest" }
- { os: "ubuntu-20.04", pkg-name: "app", python-version: "3.9", requires: "latest" }
- { os: "windows-2022", pkg-name: "app", python-version: "3.9", requires: "latest" }
# Timeout: https://stackoverflow.com/a/59076067/4521646
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-tests-app.yml
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-20.04", "macOS-11", "windows-2022"]
os: ["ubuntu-20.04", "macOS-12", "windows-2022"]
pkg-name: ["lightning"]
python-version: ["3.8"]
requires: ["oldest", "latest"]
Expand All @@ -48,7 +48,7 @@ jobs:
- { os: "ubuntu-22.04", pkg-name: "app", python-version: "3.11", requires: "latest" }
- { os: "windows-2022", pkg-name: "app", python-version: "3.11", requires: "latest" }
# "app" installs the standalone package
- { os: "macOS-11", pkg-name: "app", python-version: "3.9", requires: "latest" }
- { os: "macOS-12", pkg-name: "app", python-version: "3.9", requires: "latest" }
- { os: "ubuntu-20.04", pkg-name: "app", python-version: "3.9", requires: "latest" }
- { os: "windows-2022", pkg-name: "app", python-version: "3.8", requires: "latest" }
# Timeout: https://stackoverflow.com/a/59076067/4521646
Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/ci-tests-fabric.yml
View file
Open in desktop
Expand Up @@ -39,14 +39,17 @@ jobs:
fail-fast: false
matrix:
include:
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "macOS-12", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
# - { os: "macOS-14", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" } # todo
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
# only run PyTorch latest
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.1" }
- { os: "macOS-12", 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" } # todo
- { 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-12", 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" } # todo
- { 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" }
# only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
Expand Down Expand Up @@ -79,7 +82,8 @@ jobs:
requires: "oldest",
}
# "fabric" installs the standalone package
- { os: "macOS-11", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
- { os: "macOS-12", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
# - { os: "macOS-14", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" } # todo
- { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
- { os: "windows-2022", pkg-name: "fabric", python-version: "3.8", pytorch-version: "1.13" }
timeout-minutes: 25 # because of building grpcio on Mac
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci-tests-pytorch.yml
View file
Open in desktop
Expand Up @@ -43,14 +43,14 @@ jobs:
fail-fast: false
matrix:
include:
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "macOS-12", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "ubuntu-20.04", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
- { os: "windows-2022", pkg-name: "lightning", python-version: "3.10", pytorch-version: "1.13" }
# only run PyTorch latest
- { os: "macOS-11", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.1" }
- { os: "macOS-12", 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-12", 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" }
# only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
Expand Down Expand Up @@ -83,7 +83,7 @@ jobs:
requires: "oldest",
}
# "pytorch" installs the standalone package
- { os: "macOS-11", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
- { os: "macOS-12", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
- { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
- { os: "windows-2022", pkg-name: "pytorch", python-version: "3.8", pytorch-version: "1.13" }
timeout-minutes: 50
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci-tests-store.yml
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["macOS-11", "ubuntu-20.04", "windows-2022"]
os: ["macOS-12", "ubuntu-20.04", "windows-2022"]
pkg-name: ["lightning"]
python-version: ["3.10"]
pytorch-version: ["2.0"]
Expand Down