ci: proper setting oldest/latest for integrations & PL>=1.9

.azure/gpu-integrations.yml

@@ -20,6 +20,7 @@ jobs:
         "oldest":
           docker-image: "pytorch/pytorch:1.11.0-cuda11.3-cudnn8-runtime"
           torch-ver: "1.11.0"
+          requires: "oldest"
         "latest":
           docker-image: "pytorch/pytorch:2.0.0-cuda11.7-cudnn8-runtime"
           torch-ver: "2.0.0"
@@ -67,11 +68,13 @@ jobs:
           python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
           python adjust-torch-versions.py requirements/base.txt $(torch-ver)
           python adjust-torch-versions.py requirements/integrate.txt $(torch-ver)
-          # FixMe: this shall not be for all integrations/cases
-          python .github/assistant.py set-oldest-versions --req_files='["requirements/integrate.txt"]'
-          cat requirements/integrate.txt
         displayName: "Adjust versions"
 
+      - bash: |
+          python .github/assistant.py set-oldest-versions --req_files='["requirements/integrate.txt"]'
+        condition: and(succeeded(), eq(variables['requires'], 'oldest'))
+        displayName: "Setting oldest req."
+
       - bash: |
           pip install -q -r requirements/integrate.txt
           # force reinstall TM as it could be overwritten by integration's dependencies

.azure/gpu-unittests.yml

@@ -17,25 +17,22 @@ jobs:
   - job: unitest_GPU
     strategy:
       matrix:
-        "PyTorch | old":
+        "PyTorch | 1.8":
           # Torch does not have build wheels with old Torch versions for newer CUDA
           docker-image: "pytorchlightning/torchmetrics:ubuntu20.04-cuda11.1.1-py3.8-torch1.8.1"
-          agent-pool: "lit-rtx-3090"
           torch-ver: "1.8.1"
         "PyTorch | 1.X":
           docker-image: "pytorchlightning/torchmetrics:ubuntu22.04-cuda11.8.0-py3.9-torch1.13"
-          agent-pool: "lit-rtx-3090"
           torch-ver: "1.13.1"
         "PyTorch | 2.X":
           docker-image: "pytorchlightning/torchmetrics:ubuntu22.04-cuda11.8.0-py3.10-torch2.0"
-          agent-pool: "lit-rtx-3090"
           torch-ver: "2.0.1"
     # how long to run the job before automatically cancelling
     timeoutInMinutes: "120"
     # how much time to give 'run always even if cancelled tasks' before stopping them
     cancelTimeoutInMinutes: "2"
 
-    pool: "$(agent-pool)"
+    pool: "lit-rtx-3090"
 
     variables:
       DEVICES: $( python -c 'name = "$(Agent.Name)" ; gpus = name.split("_")[-1] if "_" in name else "0,1"; print(gpus)' )
@@ -81,11 +78,9 @@ jobs:
       - bash: |
           pip install -q packaging
           wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
-          python adjust-torch-versions.py requirements.txt $(torch-ver)
           for fpath in `ls requirements/*.txt`; do
               python adjust-torch-versions.py $fpath $(torch-ver)
           done
-        # FixMe: missing setting minumal configurations for testing
         displayName: "Adjust versions"
 
       - bash: |

.github/workflows/ci-integrate.yml

@@ -56,10 +56,6 @@ jobs:
         with:
           requires: ${{ matrix.requires }}
 
-      - name: Freeze PIL (hotfix)
-        # import of PILLOW_VERSION which they recently removed in v9.0 in favor of __version__
-        run: pip install "Pillow<9.0" # It messes with torchvision
-
       - name: Install all dependencies
         run: |
           set -e

.github/workflows/ci-tests.yml

@@ -98,7 +98,6 @@ jobs:
           pip install -r requirements/doctest.txt -U -f $PYPI_CACHE
           pip list
 
-      # todo: copy this to install checks
       - name: DocTests
         timeout-minutes: 25
         working-directory: ./src
@@ -107,11 +106,6 @@ jobs:
         # NOTE: run coverage on tests does not propagate failure status for Win, https://github.com/nedbat/coveragepy/issues/1003
         run: python -m pytest torchmetrics --reruns 3 --reruns-delay 2
 
-      - name: Freeze PIL (hotfix)
-        if: ${{ matrix.python-version != '3.11' }}
-        # import of PILLOW_VERSION which they recently removed in v9.0 in favor of __version__
-        run: pip install "Pillow<9.0" # It messes with torchvision
-
       - name: Install all dependencies
         run: |
           curl https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py -o adjust-torch-versions.py

src/torchmetrics/__init__.py

@@ -1,7 +1,9 @@
-r"""Root package info."""
+"""Root package info."""
 import logging as __logging
 import os
 
+from lightning_utilities.core.imports import package_available
+
 from torchmetrics.__about__ import *  # noqa: F403
 
 _logger = __logging.getLogger("torchmetrics")
@@ -11,6 +13,12 @@
 _PACKAGE_ROOT = os.path.dirname(__file__)
 _PROJECT_ROOT = os.path.dirname(_PACKAGE_ROOT)
 
+if package_available("PIL"):
+    import PIL
+
+    if not hasattr(PIL, "PILLOW_VERSION"):
+        PIL.PILLOW_VERSION = PIL.__version__
+
 from torchmetrics import functional  # noqa: E402
 from torchmetrics.aggregation import (  # noqa: E402
     CatMetric,