diff --git a/.azure/gpu-benchmarks.yml b/.azure/gpu-benchmarks.yml index ee22dd3a42afb..bae7babf69266 100644 --- a/.azure/gpu-benchmarks.yml +++ b/.azure/gpu-benchmarks.yml @@ -46,7 +46,8 @@ jobs: variables: DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' ) container: - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.0-cuda11.8.0" + # TODO: Upgrade to Python 3.11 + image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0" options: "--gpus=all --shm-size=32g" strategy: matrix: diff --git a/.azure/gpu-tests-fabric.yml b/.azure/gpu-tests-fabric.yml index 88dfe3b7f15cb..ba86449e92355 100644 --- a/.azure/gpu-tests-fabric.yml +++ b/.azure/gpu-tests-fabric.yml @@ -56,14 +56,12 @@ jobs: options: "--gpus=all --shm-size=2gb -v /var/tmp:/var/tmp" strategy: matrix: + # TODO: Upgrade to Python 3.11 "Fabric | latest": - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.0" - PACKAGE_NAME: "fabric" - "Fabric | future": - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.2-cuda12.1.0" + image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0" PACKAGE_NAME: "fabric" "Lightning | latest": - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.0" + image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0" PACKAGE_NAME: "lightning" workspace: clean: all diff --git a/.azure/gpu-tests-pytorch.yml b/.azure/gpu-tests-pytorch.yml index 21e68af90e0ed..10fb64f08c1b6 100644 --- a/.azure/gpu-tests-pytorch.yml +++ b/.azure/gpu-tests-pytorch.yml @@ -48,15 +48,12 @@ jobs: cancelTimeoutInMinutes: "2" strategy: matrix: + # TODO: Upgrade to Python 3.11 "PyTorch | latest": - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.0" - PACKAGE_NAME: "pytorch" - "PyTorch | future": - # todo: failed to install `pygame` with py3.11 image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0" PACKAGE_NAME: "pytorch" "Lightning | latest": - image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.0" + image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.2-cuda12.1.0" PACKAGE_NAME: "lightning" pool: lit-rtx-3090 variables: diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml index f1c09257a8703..d7f0da2042c9d 100644 --- a/.github/checkgroup.yml +++ b/.github/checkgroup.yml @@ -21,15 +21,12 @@ subprojects: 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.0)" - "pl-cpu (macOS-11, lightning, 3.10, 2.1)" - "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.0)" - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)" - "pl-cpu (windows-2022, lightning, 3.8, 1.13, oldest)" - "pl-cpu (windows-2022, lightning, 3.10, 1.13)" - - "pl-cpu (windows-2022, lightning, 3.10, 2.0)" - "pl-cpu (windows-2022, lightning, 3.10, 2.1)" - "pl-cpu (macOS-11, pytorch, 3.8, 1.13)" - "pl-cpu (ubuntu-20.04, pytorch, 3.8, 1.13)" @@ -190,15 +187,12 @@ subprojects: 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.10, 2.0)" - "fabric-cpu (macOS-11, lightning, 3.11, 2.1)" - "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.10, 2.0)" - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.1)" - "fabric-cpu (windows-2022, lightning, 3.8, 1.13, oldest)" - "fabric-cpu (windows-2022, lightning, 3.10, 1.13)" - - "fabric-cpu (windows-2022, lightning, 3.10, 2.0)" - "fabric-cpu (windows-2022, lightning, 3.11, 2.1)" - "fabric-cpu (macOS-11, fabric, 3.8, 1.13)" - "fabric-cpu (ubuntu-20.04, fabric, 3.8, 1.13)" diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml index f82add5d8e6a4..36ce5d4131a81 100644 --- a/.github/workflows/ci-tests-fabric.yml +++ b/.github/workflows/ci-tests-fabric.yml @@ -43,13 +43,9 @@ jobs: - { 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.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" } - { os: "macOS-11", 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" } - # only run PyTorch future - { os: "macOS-12", pkg-name: "lightning", python-version: "3.11", pytorch-version: "2.2" } - { os: "ubuntu-22.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" } diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml index 717aac509663b..40bd439255d70 100644 --- a/.github/workflows/ci-tests-pytorch.yml +++ b/.github/workflows/ci-tests-pytorch.yml @@ -47,13 +47,9 @@ jobs: - { 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.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" } - { os: "macOS-11", 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" } - # only run PyTorch future - { os: "macOS-12", pkg-name: "lightning", python-version: "3.10", pytorch-version: "2.2" } - { os: "ubuntu-22.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" }