Switch to PyTorch 2.4 stable testing (#20126)

Lightning-AI · Jul 25, 2024 · 2064887 · 2064887
1 parent 6c70dd7
commit 2064887
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 25 deletions.
diff --git a/.azure/gpu-benchmarks.yml b/.azure/gpu-benchmarks.yml
@@ -46,7 +46,7 @@ jobs:
  variables:
  DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )
  container:
- image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
+ image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.4-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
@@ -60,10 +60,7 @@ jobs:
  image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
  PACKAGE_NAME: "fabric"
  "Lightning | latest":
- image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
- PACKAGE_NAME: "lightning"
- "Lightning | future":
- image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.4-cuda12.1.0"
+ image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.4-cuda12.1.0"
  PACKAGE_NAME: "lightning"
  workspace:
  clean: all

diff --git a/.azure/gpu-tests-pytorch.yml b/.azure/gpu-tests-pytorch.yml
@@ -53,10 +53,7 @@ jobs:
  image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
  PACKAGE_NAME: "pytorch"
  "Lightning | latest":
- image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
- PACKAGE_NAME: "lightning"
- "Lightning | future":
- image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.4-cuda12.1.0"
+ image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.4-cuda12.1.0"
  PACKAGE_NAME: "lightning"
  pool: lit-rtx-3090
  variables:

diff --git a/.github/checkgroup.yml b/.github/checkgroup.yml
@@ -23,14 +23,17 @@ subprojects:
  - "pl-cpu (macOS-14, lightning, 3.10, 2.1)"
  - "pl-cpu (macOS-14, lightning, 3.11, 2.2)"
  - "pl-cpu (macOS-14, lightning, 3.11, 2.3)"
+ - "pl-cpu (macOS-14, lightning, 3.12, 2.4)"
  - "pl-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)"
  - "pl-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
  - "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
  - "pl-cpu (ubuntu-20.04, lightning, 3.11, 2.3)"
+ - "pl-cpu (ubuntu-20.04, lightning, 3.12, 2.4)"
  - "pl-cpu (windows-2022, lightning, 3.9, 2.1, oldest)"
  - "pl-cpu (windows-2022, lightning, 3.10, 2.1)"
  - "pl-cpu (windows-2022, lightning, 3.11, 2.2)"
  - "pl-cpu (windows-2022, lightning, 3.11, 2.3)"
+ - "pl-cpu (windows-2022, lightning, 3.12, 2.4)"
  - "pl-cpu (macOS-14, pytorch, 3.9, 2.1)"
  - "pl-cpu (ubuntu-20.04, pytorch, 3.9, 2.1)"
  - "pl-cpu (windows-2022, pytorch, 3.9, 2.1)"
@@ -138,19 +141,15 @@ subprojects:
  - "!*.md"
  - "!**/*.md"
  checks:
- - "build-cuda (3.10, 2.1, 12.1.0)"
- - "build-cuda (3.10, 2.2, 12.1.0)"
  - "build-cuda (3.11, 2.1, 12.1.0)"
  - "build-cuda (3.11, 2.2, 12.1.0)"
  - "build-cuda (3.11, 2.3, 12.1.0)"
- - "build-cuda (3.11, 2.4, 12.1.0)"
+ - "build-cuda (3.12, 2.4, 12.1.0)"
  #- "build-NGC"
- - "build-pl (3.10, 2.1, 12.1.0)"
- - "build-pl (3.10, 2.2, 12.1.0)"
  - "build-pl (3.11, 2.1, 12.1.0)"
  - "build-pl (3.11, 2.2, 12.1.0)"
  - "build-pl (3.11, 2.3, 12.1.0)"
- - "build-pl (3.11, 2.4, 12.1.0)"
+ - "build-pl (3.12, 2.4, 12.1.0)"
 
  # SECTION: lightning_fabric
 
@@ -171,14 +170,17 @@ subprojects:
  - "fabric-cpu (macOS-14, lightning, 3.10, 2.1)"
  - "fabric-cpu (macOS-14, lightning, 3.11, 2.2)"
  - "fabric-cpu (macOS-14, lightning, 3.11, 2.3)"
+ - "fabric-cpu (macOS-14, lightning, 3.12, 2.4)"
  - "fabric-cpu (ubuntu-20.04, lightning, 3.9, 2.1, oldest)"
  - "fabric-cpu (ubuntu-20.04, lightning, 3.10, 2.1)"
  - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.2)"
  - "fabric-cpu (ubuntu-20.04, lightning, 3.11, 2.3)"
+ - "fabric-cpu (ubuntu-20.04, lightning, 3.12, 2.4)"
  - "fabric-cpu (windows-2022, lightning, 3.9, 2.1, oldest)"
  - "fabric-cpu (windows-2022, lightning, 3.10, 2.1)"
  - "fabric-cpu (windows-2022, lightning, 3.11, 2.2)"
  - "fabric-cpu (windows-2022, lightning, 3.11, 2.3)"
+ - "fabric-cpu (windows-2022, lightning, 3.12, 2.4)"
  - "fabric-cpu (macOS-14, fabric, 3.9, 2.1)"
  - "fabric-cpu (ubuntu-20.04, fabric, 3.9, 2.1)"
  - "fabric-cpu (windows-2022, fabric, 3.9, 2.1)"

diff --git a/.github/workflows/ci-tests-fabric.yml b/.github/workflows/ci-tests-fabric.yml
@@ -121,7 +121,7 @@ jobs:
  - name: Env. variables
  run: |
  # Switch PyTorch URL
- python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.4' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
+ python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.5' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
  # Switch coverage scope
  python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'lightning_fabric'))" >> $GITHUB_ENV
  # if you install mono-package set dependency only for this subpackage

diff --git a/.github/workflows/ci-tests-pytorch.yml b/.github/workflows/ci-tests-pytorch.yml
@@ -127,7 +127,7 @@ jobs:
  - name: Env. variables
  run: |
  # Switch PyTorch URL
- python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.4' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
+ python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.5' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
  # Switch coverage scope
  python -c "print('COVERAGE_SCOPE=' + str('lightning' if '${{matrix.pkg-name}}' == 'lightning' else 'pytorch_lightning'))" >> $GITHUB_ENV
  # if you install mono-package set dependency only for this subpackage

diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
@@ -43,12 +43,10 @@ jobs:
  include:
  # We only release one docker image per PyTorch version.
  # Make sure the matrix here matches the one below.
- - { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
- - { python_version: "3.10", pytorch_version: "2.2", cuda_version: "12.1.0" }
  - { python_version: "3.11", pytorch_version: "2.1", cuda_version: "12.1.0" }
  - { python_version: "3.11", pytorch_version: "2.2", cuda_version: "12.1.0" }
  - { python_version: "3.11", pytorch_version: "2.3", cuda_version: "12.1.0" }
- - { python_version: "3.11", pytorch_version: "2.4", cuda_version: "12.1.0" }
+ - { python_version: "3.12", pytorch_version: "2.4", cuda_version: "12.1.0" }
  steps:
  - uses: actions/checkout@v4
  with:
@@ -105,13 +103,10 @@ jobs:
  include:
  # These are the base images for PL release docker images.
  # Make sure the matrix here matches the one above.
- - { python_version: "3.10", pytorch_version: "2.1", cuda_version: "12.1.0" }
- - { python_version: "3.10", pytorch_version: "2.2", cuda_version: "12.1.0" }
  - { python_version: "3.11", pytorch_version: "2.1", cuda_version: "12.1.0" }
  - { python_version: "3.11", pytorch_version: "2.2", cuda_version: "12.1.0" }
  - { python_version: "3.11", pytorch_version: "2.3", cuda_version: "12.1.0" }
- - { python_version: "3.11", pytorch_version: "2.4", cuda_version: "12.1.0" }
- # - { python_version: "3.12", pytorch_version: "2.2", cuda_version: "12.1.0" } # todo: pending on `onnxruntime`
+ - { python_version: "3.12", pytorch_version: "2.4", cuda_version: "12.1.0" }
  steps:
  - uses: actions/checkout@v4
  - uses: docker/setup-buildx-action@v3

diff --git a/dockers/release/Dockerfile b/dockers/release/Dockerfile
@@ -39,7 +39,7 @@ RUN \
  fi && \
  # otherwise there is collision with folder name and pkg name on Pypi
  cd pytorch-lightning && \
- pip install setuptools==59.5.0 && \
+ pip install setuptools && \
  PACKAGE_NAME=lightning pip install '.[extra,loggers,strategies]' --no-cache-dir && \
  PACKAGE_NAME=pytorch pip install '.[extra,loggers,strategies]' --no-cache-dir && \
  cd .. && \