bump: testing with latest torch 2.6

.azure/gpu-tests-fabric.yml

@@ -49,18 +49,22 @@ jobs:
       FREEZE_REQUIREMENTS: "1"
       PIP_CACHE_DIR: "/var/tmp/pip"
       PL_RUN_CUDA_TESTS: "1"
+      PL_STANDALONE_TESTS_BATCH_SIZE: "1" # todo
     container:
       image: $(image)
       # default shm size is 64m. Increase it to avoid:
       # 'Error while creating shared memory: unhandled system error, NCCL version 2.7.8'
       options: "--gpus=all --shm-size=2gb  -v /var/tmp:/var/tmp"
     strategy:
       matrix:
+        "Fabric | oldest":
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
+          PACKAGE_NAME: "fabric"
         "Fabric | latest":
-          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
           PACKAGE_NAME: "fabric"
         "Lightning | latest":
-          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.0"
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
           PACKAGE_NAME: "lightning"
     workspace:
       clean: all
@@ -77,9 +81,8 @@ jobs:
         displayName: "set env. vars"
       - bash: |
           echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM}"
-          echo "##vso[task.setvariable variable=TORCHVISION_URL]https://download.pytorch.org/whl/test/cu124/torchvision-0.19.0%2Bcu124-cp${PYTHON_VERSION_MM}-cp${PYTHON_VERSION_MM}-linux_x86_64.whl"
         condition: endsWith(variables['Agent.JobName'], 'future')
-        displayName: "set env. vars 4 future"
+        displayName: "extend env. vars 4 future"
 
       - bash: |
           echo $(DEVICES)
@@ -105,15 +108,17 @@ jobs:
         displayName: "Adjust dependencies"
 
       - bash: |
+          set -e
           extra=$(python -c "print({'lightning': 'fabric-'}.get('$(PACKAGE_NAME)', ''))")
-          pip install -e ".[${extra}dev]" pytest-timeout -U --find-links="${TORCH_URL}" --find-links="${TORCHVISION_URL}"
+          pip install -e ".[${extra}dev]" pytest-timeout -U --extra-index-url="${TORCH_URL}"
           pip install setuptools==75.6.0 jsonargparse==4.35.0
         displayName: "Install package & dependencies"
 
       - bash: |
           set -e
           python requirements/collect_env_details.py
           python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu == 2, f'GPU: {mgpu}'"
+          python requirements/pytorch/check-avail-extras.py
           python -c "import bitsandbytes"
         displayName: "Env details"
 
@@ -140,10 +145,11 @@ jobs:
         displayName: "Testing: fabric standard"
         timeoutInMinutes: "10"
 
-      - bash: bash ./run_standalone_tests.sh "tests_fabric"
+      - bash: |
+          wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/run_standalone_tests.sh
+          bash ./run_standalone_tests.sh "tests_fabric"
         workingDirectory: tests/
         env:
-          PL_STANDALONE_TESTS_SOURCE: $(COVERAGE_SOURCE)
           PL_RUN_STANDALONE_TESTS: "1"
         displayName: "Testing: fabric standalone"
         timeoutInMinutes: "10"

.azure/gpu-tests-pytorch.yml

@@ -49,18 +49,22 @@ jobs:
     cancelTimeoutInMinutes: "2"
     strategy:
       matrix:
+        "PyTorch | oldest":
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.10-torch2.1-cuda12.1.1"
+          PACKAGE_NAME: "pytorch"
         "PyTorch | latest":
-          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.11-torch2.3-cuda12.1.0"
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
           PACKAGE_NAME: "pytorch"
         "Lightning | latest":
-          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.5-cuda12.1.0"
+          image: "pytorchlightning/pytorch_lightning:base-cuda-py3.12-torch2.6-cuda12.4.1"
           PACKAGE_NAME: "lightning"
     pool: lit-rtx-3090
     variables:
       DEVICES: $( python -c 'print("$(Agent.Name)".split("_")[-1])' )
       FREEZE_REQUIREMENTS: "1"
       PIP_CACHE_DIR: "/var/tmp/pip"
       PL_RUN_CUDA_TESTS: "1"
+      PL_STANDALONE_TESTS_BATCH_SIZE: "2" # todo
     container:
       image: $(image)
       # default shm size is 64m. Increase it to avoid:
@@ -81,9 +85,8 @@ jobs:
         displayName: "set env. vars"
       - bash: |
           echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM}"
-          echo "##vso[task.setvariable variable=TORCHVISION_URL]https://download.pytorch.org/whl/test/cu124/torchvision-0.19.0%2Bcu124-cp${PYTHON_VERSION_MM}-cp${PYTHON_VERSION_MM}-linux_x86_64.whl"
         condition: endsWith(variables['Agent.JobName'], 'future')
-        displayName: "set env. vars 4 future"
+        displayName: "extend env. vars 4 future"
 
       - bash: |
           echo $(DEVICES)
@@ -109,8 +112,9 @@ jobs:
         displayName: "Adjust dependencies"
 
       - bash: |
+          set -e
           extra=$(python -c "print({'lightning': 'pytorch-'}.get('$(PACKAGE_NAME)', ''))")
-          pip install -e ".[${extra}dev]" pytest-timeout -U --find-links="${TORCH_URL}" --find-links="${TORCHVISION_URL}"
+          pip install -e ".[${extra}dev]" pytest-timeout -U --extra-index-url="${TORCH_URL}"
           pip install setuptools==75.6.0 jsonargparse==4.35.0
         displayName: "Install package & dependencies"
 
@@ -161,11 +165,12 @@ jobs:
         displayName: "Testing: PyTorch standard"
         timeoutInMinutes: "35"
 
-      - bash: bash ./run_standalone_tests.sh "tests_pytorch"
+      - bash: |
+          wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/run_standalone_tests.sh
+          bash ./run_standalone_tests.sh "tests_pytorch"
         workingDirectory: tests/
         env:
           PL_USE_MOCKED_MNIST: "1"
-          PL_STANDALONE_TESTS_SOURCE: $(COVERAGE_SOURCE)
           PL_RUN_STANDALONE_TESTS: "1"
         displayName: "Testing: PyTorch standalone tests"
         timeoutInMinutes: "35"

.github/actions/pip-wheels/action.yml

@@ -46,8 +46,8 @@ runs:
       run: |
         # cat requirements.dump
         pip wheel -r requirements.dump --prefer-binary \
-          --wheel-dir=.wheels \
-          -f ${{ inputs.torch-url }} -f ${{ inputs.wheel-dir }}
+          --wheel-dir=".wheels" \
+          --extra-index-url=${{ inputs.torch-url }} -f ${{ inputs.wheel-dir }}
         ls -lh .wheels/
       shell: bash
 

.github/workflows/_legacy-checkpoints.yml

@@ -43,7 +43,7 @@ on:
 
 env:
   LEGACY_FOLDER: "tests/legacy"
-  TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
+  TORCH_URL: "https://download.pytorch.org/whl/cpu/"
 
 defaults:
   run:
@@ -67,12 +67,12 @@ jobs:
           PACKAGE_NAME: pytorch
           FREEZE_REQUIREMENTS: 1
         timeout-minutes: 20
-        run: pip install . -f ${TORCH_URL}
+        run: pip install . --extra-index-url="${TORCH_URL}"
         if: inputs.pl_version == ''
 
       - name: Install PL version
         timeout-minutes: 20
-        run: pip install "pytorch-lightning==${{ inputs.pl_version }}" -f ${TORCH_URL}
+        run: pip install "pytorch-lightning==${{ inputs.pl_version }}" --extra-index-url="${TORCH_URL}"
         if: inputs.pl_version != ''
 
       - name: Adjust tests -> PL

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

@@ -56,36 +56,28 @@ jobs:
           - { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
           - { os: "windows-2022", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
           # only run PyTorch latest with Python latest, use Fabric scope to limit dependency issues
-          - { os: "macOS-14", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
-          - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
-          - { os: "windows-2022", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.5.1" }
+          - { os: "macOS-14", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
+          - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
+          - { os: "windows-2022", pkg-name: "fabric", python-version: "3.12.7", pytorch-version: "2.6" }
           # "oldest" versions tests, only on minimum Python
-          - { os: "macOS-14", pkg-name: "lightning", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
-          - {
-              os: "ubuntu-20.04",
-              pkg-name: "lightning",
-              python-version: "3.9",
-              pytorch-version: "2.1",
-              requires: "oldest",
-            }
-          - {
-              os: "windows-2022",
-              pkg-name: "lightning",
-              python-version: "3.9",
-              pytorch-version: "2.1",
-              requires: "oldest",
-            }
+          - { os: "macOS-14", pkg-name: "fabric", pytorch-version: "2.1", requires: "oldest" }
+          - { os: "ubuntu-20.04", pkg-name: "fabric", pytorch-version: "2.1", requires: "oldest" }
+          - { os: "windows-2022", pkg-name: "fabric", pytorch-version: "2.1", requires: "oldest" }
           # "fabric" installs the standalone package
-          - { os: "macOS-14", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
-          - { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
-          - { os: "windows-2022", pkg-name: "fabric", python-version: "3.9", pytorch-version: "2.1" }
+          - { os: "macOS-14", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
+          - { os: "ubuntu-20.04", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
+          - { os: "windows-2022", pkg-name: "fabric", python-version: "3.10", pytorch-version: "2.5" }
+          # adding recently cut Torch 2.7 - FUTURE
+          #  - { os: "macOS-14", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
+          #  - { os: "ubuntu-22.04", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
+          #  - { os: "windows-2022", pkg-name: "fabric", python-version: "3.12", pytorch-version: "2.7" }
     timeout-minutes: 25 # because of building grpcio on Mac
     env:
       PACKAGE_NAME: ${{ matrix.pkg-name }}
       FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
       PYPI_CACHE_DIR: "_pip-wheels"
-      TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/torch_stable.html"
-      TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/torch"
+      TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/"
+      TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/"
       # TODO: Remove this - Enable running MPS tests on this platform
       DISABLE_MPS: ${{ matrix.os == 'macOS-14' && '1' || '0' }}
     steps:
@@ -94,7 +86,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python-version || '3.9' }}
 
       - name: basic setup
         run: pip install -q -r .actions/requirements.txt
@@ -126,8 +118,8 @@ jobs:
 
       - name: Env. variables
         run: |
-          # Switch PyTorch URL
-          python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.5' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
+          # Switch PyTorch URL between stable and test/future
+          python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.7' 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
@@ -139,7 +131,7 @@ jobs:
         timeout-minutes: 20
         run: |
           pip install -e ".[${EXTRA_PREFIX}test,${EXTRA_PREFIX}strategies]" -U --prefer-binary \
-            --find-links="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
+            --extra-index-url="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
           pip list
       - name: Dump handy wheels
         if: github.event_name == 'push' && github.ref == 'refs/heads/master'

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

@@ -60,35 +60,27 @@ jobs:
           - { os: "ubuntu-22.04", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
           - { os: "windows-2022", pkg-name: "lightning", python-version: "3.12.7", pytorch-version: "2.5.1" }
           # only run PyTorch latest with Python latest, use PyTorch scope to limit dependency issues
-          - { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
-          - { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
-          - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.5.1" }
+          - { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
+          - { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
+          - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12.7", pytorch-version: "2.6" }
           # "oldest" versions tests, only on minimum Python
-          - { os: "macOS-14", pkg-name: "lightning", python-version: "3.9", pytorch-version: "2.1", requires: "oldest" }
-          - {
-              os: "ubuntu-20.04",
-              pkg-name: "lightning",
-              python-version: "3.9",
-              pytorch-version: "2.1",
-              requires: "oldest",
-            }
-          - {
-              os: "windows-2022",
-              pkg-name: "lightning",
-              python-version: "3.9",
-              pytorch-version: "2.1",
-              requires: "oldest",
-            }
+          - { os: "macOS-14", pkg-name: "pytorch", pytorch-version: "2.1", requires: "oldest" }
+          - { os: "ubuntu-20.04", pkg-name: "pytorch", pytorch-version: "2.1", requires: "oldest" }
+          - { os: "windows-2022", pkg-name: "pytorch", pytorch-version: "2.1", requires: "oldest" }
           # "pytorch" installs the standalone package
-          - { os: "macOS-14", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
-          - { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
-          - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.9", pytorch-version: "2.1" }
+          - { os: "macOS-14", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
+          - { os: "ubuntu-20.04", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
+          - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.10", pytorch-version: "2.5" }
+          # adding recently cut Torch 2.7 - FUTURE
+          #  - { os: "macOS-14", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
+          #  - { os: "ubuntu-22.04", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
+          #  - { os: "windows-2022", pkg-name: "pytorch", python-version: "3.12", pytorch-version: "2.7" }
     timeout-minutes: 50
     env:
       PACKAGE_NAME: ${{ matrix.pkg-name }}
-      TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
-      TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/torch_stable.html"
-      TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/torch"
+      TORCH_URL: "https://download.pytorch.org/whl/cpu/"
+      TORCH_URL_STABLE: "https://download.pytorch.org/whl/cpu/"
+      TORCH_URL_TEST: "https://download.pytorch.org/whl/test/cpu/"
       FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
       PYPI_CACHE_DIR: "_pip-wheels"
       # TODO: Remove this - Enable running MPS tests on this platform
@@ -99,7 +91,7 @@ jobs:
       - name: Set up Python ${{ matrix.python-version }}
         uses: actions/setup-python@v5
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: ${{ matrix.python-version || '3.9' }}
 
       - name: basic setup
         run: pip install -q -r .actions/requirements.txt
@@ -132,8 +124,8 @@ jobs:
 
       - name: Env. variables
         run: |
-          # Switch PyTorch URL
-          python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.5' else '${{env.TORCH_URL_STABLE}}'))" >> $GITHUB_ENV
+          # Switch PyTorch URL between stable and test/future
+          python -c "print('TORCH_URL=' + str('${{env.TORCH_URL_TEST}}' if '${{ matrix.pytorch-version }}' == '2.7' 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
@@ -146,7 +138,7 @@ jobs:
         run: |
           pip install ".[${EXTRA_PREFIX}extra,${EXTRA_PREFIX}test,${EXTRA_PREFIX}strategies]" -U --prefer-binary \
             -r requirements/_integrations/accelerators.txt \
-            --find-links="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
+            --extra-index-url="${TORCH_URL}" --find-links="${PYPI_CACHE_DIR}"
           pip list
       - name: Drop LAI from extensions
         if: ${{ matrix.pkg-name != 'lightning' }}

.github/workflows/docker-build.yml

@@ -100,6 +100,7 @@ jobs:
           - { python_version: "3.11", pytorch_version: "2.3.1", cuda_version: "12.1.1" }
           - { python_version: "3.11", pytorch_version: "2.4.1", cuda_version: "12.1.1" }
           - { python_version: "3.12", pytorch_version: "2.5.1", cuda_version: "12.1.1" }
+          - { python_version: "3.12", pytorch_version: "2.6.0", cuda_version: "12.4.1" }
     steps:
       - uses: actions/checkout@v4
       - uses: docker/setup-buildx-action@v3

.github/workflows/docs-build.yml

@@ -46,7 +46,7 @@ defaults:
 
 env:
   FREEZE_REQUIREMENTS: "1"
-  TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
+  TORCH_URL: "https://download.pytorch.org/whl/cpu/"
   PYPI_CACHE_DIR: "_pip-wheels"
   PYPI_LOCAL_DIR: "pypi_pkgs/"
 
@@ -106,7 +106,7 @@ jobs:
           mkdir -p ${PYPI_CACHE_DIR}  # in case cache was not hit
           ls -lh ${PYPI_CACHE_DIR}
           pip install .[all] -U -r requirements/${{ matrix.pkg-name }}/docs.txt \
-            -f ${PYPI_LOCAL_DIR} -f ${PYPI_CACHE_DIR} -f ${TORCH_URL}
+            -f ${PYPI_LOCAL_DIR} -f ${PYPI_CACHE_DIR} --extra-index-url="${TORCH_URL}"
           pip list
       - name: Install req. for Notebooks/tutorials
         if: matrix.pkg-name == 'pytorch'

.github/workflows/release-pkg.yml

@@ -23,7 +23,7 @@ defaults:
 
 env:
   FREEZE_REQUIREMENTS: 1
-  TORCH_URL: "https://download.pytorch.org/whl/cpu/torch_stable.html"
+  TORCH_URL: "https://download.pytorch.org/whl/cpu/"
   PYTHON_VER: "3.9"
 
 jobs:
@@ -60,7 +60,7 @@ jobs:
           python-version: ${{ env.PYTHON_VER }}
       - name: install Package
         run: |
-          pip install . -f ${TORCH_URL}
+          pip install . --extra-index-url="${TORCH_URL}"
           pip list
       - name: package Version
         id: lai-package

dockers/base-cuda/Dockerfile

@@ -92,9 +92,8 @@ RUN \
       -r requirements/pytorch/extra.txt \
       -r requirements/pytorch/test.txt \
       -r requirements/pytorch/strategies.txt \
-      --find-links="https://download.pytorch.org/whl/cu${CUDA_VERSION_MM//'.'/''}/torch_stable.html" \
-      --find-links="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/torch" \
-      --find-links="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/pytorch-triton"
+      --extra-index-url="https://download.pytorch.org/whl/cu${CUDA_VERSION_MM//'.'/''}/" \
+      --extra-index-url="https://download.pytorch.org/whl/test/cu${CUDA_VERSION_MM//'.'/''}/"
 
 RUN \
     # Show what we have

requirements/fabric/base.txt

@@ -4,5 +4,5 @@
 torch >=2.1.0, <2.6.0
 fsspec[http] >=2022.5.0, <2024.4.0
 packaging >=20.0, <=23.1
-typing-extensions >=4.4.0, <4.10.0
+typing-extensions >=4.4.0, <4.11.0
 lightning-utilities >=0.10.0, <0.12.0