Merge branch 'master' into docs/pesq-gallery-2

Author: Borda

.azure/gpu-integrations.yml

@@ -22,8 +22,8 @@ jobs:
           torch-ver: "2.0"
           requires: "oldest"
         "torch | 2.x":
-          docker-image: "pytorch/pytorch:2.5.0-cuda12.1-cudnn9-runtime"
-          torch-ver: "2.5"
+          docker-image: "pytorch/pytorch:2.6.0-cuda12.4-cudnn9-runtime"
+          torch-ver: "2.6"
     # how long to run the job before automatically cancelling
     timeoutInMinutes: "40"
     # how much time to give 'run always even if cancelled tasks' before stopping them

.azure/gpu-unittests.yml

@@ -29,9 +29,6 @@ jobs:
           docker-image: "ubuntu22.04-cuda11.8.0-py3.10-torch2.0"
           torch-ver: "2.0"
         "PyTorch | 2.X stable":
-          docker-image: "ubuntu22.04-cuda12.1.1-py3.11-torch2.5"
-          torch-ver: "2.5"
-        "PyTorch | 2.X future":
           docker-image: "ubuntu22.04-cuda12.4.1-py3.11-torch2.6"
           torch-ver: "2.6"
     # how long to run the job before automatically cancelling
@@ -185,7 +182,7 @@ jobs:
       - bash: |
           du -h --max-depth=1 .
           python -m pytest $(TEST_DIRS) \
-            -m "not DDP" --numprocesses=5 --dist=loadfile \
+            -m "not DDP" --numprocesses=9 --dist=loadfile \
             --cov=torchmetrics --timeout=240 --durations=100 \
             --reruns 3 --reruns-delay 1
         workingDirectory: "tests/"

.devcontainer/Dockerfile

@@ -19,7 +19,7 @@ RUN \
     pip3 --disable-pip-version-check --no-cache-dir install \
       -r /tmp/pip-tmp/requirements/_devel.txt \
       -r /tmp/pip-tmp/requirements/_docs.txt \
-      --find-links="https://download.pytorch.org/whl/cpu/torch_stable.html" \
+      --extra-index-url="https://download.pytorch.org/whl/cpu/" \
       --find-links="dist/" && \
     rm -rf /tmp/pip-tmp
 

.github/assistant.py

@@ -16,21 +16,23 @@
 import os
 import re
 import sys
+from pathlib import Path
 from typing import Optional, Union
 
 import fire
 from packaging.version import parse
 
 _REQUEST_TIMEOUT = 10
-_PATH_ROOT = os.path.dirname(os.path.dirname(__file__))
+_PATH_REPO_ROOT = Path(__file__).resolve().parent.parent
+_PATH_DIR_TESTS = _PATH_REPO_ROOT / "tests"
 _PKG_WIDE_SUBPACKAGES = ("utilities", "helpers")
 LUT_PYTHON_TORCH = {
     "3.8": "1.4",
     "3.9": "1.7.1",
     "3.10": "1.11",
     "3.11": "1.13",
 }
-_path_root = lambda *ds: os.path.join(_PATH_ROOT, *ds)
+_path_root = lambda *ds: os.path.join(_PATH_REPO_ROOT, *ds)
 REQUIREMENTS_FILES = (*glob.glob(_path_root("requirements", "*.txt")), _path_root("requirements.txt"))
 
 
@@ -143,6 +145,8 @@ def changed_domains(
         if len(files) == len(files_markdown):
             logging.debug("Only markdown files was changed so not reason for deep testing...")
             return _return_empty
+        # filter out markdown files
+        files = [fn for fn in files if fn not in files_markdown]
 
         # filter only testing files which are not specific tests so for example configurations or helper tools
         files_testing = [fn for fn in files if fn.startswith("tests") and not fn.endswith(".md") and "test_" not in fn]
@@ -188,10 +192,17 @@ def _crop_path(fname: str, paths: tuple[str] = ("src/torchmetrics/", "tests/unit
         if as_list:  # keep only unique
             return list(test_modules)
 
-        test_modules = [f"unittests/{md}" for md in set(test_modules)]
-        not_exists = [p for p in test_modules if os.path.exists(p)]
+        test_modules = [os.path.join("unittests", fp) for fp in set(test_modules)]
+        # filter only existing modules
+        not_exists = [fp for fp in test_modules if not (_PATH_DIR_TESTS / fp).exists()]
         if not_exists:
-            raise ValueError(f"Missing following paths: {not_exists}")
+            logging.debug(f"Missing following paths: {not_exists}")
+        # filter only existing path in repo
+        test_modules = [fp for fp in test_modules if (_PATH_DIR_TESTS / fp).exists()]
+        if not test_modules:
+            logging.debug("No tests were changed -> rather test everything...")
+            return _return_all
+
         return " ".join(test_modules)
 
     @staticmethod

.github/workflows/_merge_cache.yml

@@ -29,18 +29,22 @@ jobs:
           merge-multiple: true
           path: _local-packages
       - name: Cache pull packages
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           enableCrossOsArchive: true
           path: ${{ inputs.pypi-dir }}
           key: ${{ inputs.pypi-key }}
 
+      - name: show pulled caches
+        continue-on-error: true
+        run: ls -lh ${{ inputs.pypi-dir }}
+
       - name: show 📦
         run: |
           # create the directory if it doesn't exist - no artifact were found
           mkdir -p _local-packages
           ls -lh _local-packages
-          ls -lh ${{ inputs.pypi-dir }}
+          mkdir -p ${{ inputs.pypi-dir }}
           # count files in the staging dir
           file_count=$(ls -1 "_local-packages/" | wc -l)
           echo "NUM_PACKAGES=$file_count" >> $GITHUB_ENV
@@ -50,7 +54,7 @@ jobs:
 
       - name: Cache push packages
         if: env.NUM_PACKAGES != 0
-        uses: actions/cache/save@v3
+        uses: actions/cache/save@v4
         with:
           enableCrossOsArchive: true
           path: ${{ inputs.pypi-dir }}

.github/workflows/ci-checks.yml

@@ -13,19 +13,22 @@ concurrency:
 
 jobs:
   check-code:
-    uses: Lightning-AI/utilities/.github/workflows/check-typing.yml@v0.11.9
+    uses: Lightning-AI/utilities/.github/workflows/check-typing.yml@v0.13.1
     with:
-      actions-ref: v0.11.9
+      actions-ref: v0.13.1
       extra-typing: "typing"
 
   check-schema:
-    uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.11.9
+    uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.13.1
+    with:
+      actions-ref: v0.13.1
+      azure-schema-version: "v1.208.0"
 
   check-package:
     if: github.event.pull_request.draft == false
-    uses: Lightning-AI/utilities/.github/workflows/check-package.yml@v0.11.9
+    uses: Lightning-AI/utilities/.github/workflows/check-package.yml@v0.13.1
     with:
-      actions-ref: v0.11.9
+      actions-ref: v0.13.1
       artifact-name: dist-packages-${{ github.sha }}
       import-name: "torchmetrics"
       testing-matrix: |
@@ -35,7 +38,7 @@ jobs:
         }
 
   check-md-links:
-    uses: Lightning-AI/utilities/.github/workflows/check-md-links.yml@v0.11.9
+    uses: Lightning-AI/utilities/.github/workflows/check-md-links.yml@v0.13.1
     with:
       base-branch: master
       config-file: ".github/markdown-links-config.json"

.github/workflows/ci-tests.yml

@@ -52,14 +52,14 @@ jobs:
           - { os: "macOS-13", python-version: "3.10", pytorch-version: "2.0.1" }
           # using the ARM based M1 machine
           - { os: "macOS-14", python-version: "3.10", pytorch-version: "2.0.1" }
-          - { os: "macOS-14", python-version: "3.12", pytorch-version: "2.5.0" }
+          - { os: "macOS-14", python-version: "3.12", pytorch-version: "2.6.0" }
           # some windows
           - { os: "windows-2022", python-version: "3.10", pytorch-version: "2.0.1" }
-          - { os: "windows-2022", python-version: "3.12", pytorch-version: "2.5.0" }
+          - { os: "windows-2022", python-version: "3.12", pytorch-version: "2.6.0" }
           # Future released version
-          - { os: "ubuntu-22.04", python-version: "3.11", pytorch-version: "2.6.0" }
-          - { os: "macOS-14", python-version: "3.11", pytorch-version: "2.6.0" }
-          - { os: "windows-2022", python-version: "3.11", pytorch-version: "2.6.0" }
+          #- { os: "ubuntu-22.04", python-version: "3.11", pytorch-version: "2.7.0" }
+          #- { os: "macOS-14", python-version: "3.11", pytorch-version: "2.7.0" }
+          #- { os: "windows-2022", python-version: "3.11", pytorch-version: "2.7.0" }
     env:
       FREEZE_REQUIREMENTS: ${{ ! (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release/')) }}
       TOKENIZERS_PARALLELISM: false
@@ -104,7 +104,7 @@ jobs:
           cache-references: true
 
       - name: Switch to PT test URL
-        if: ${{ matrix.pytorch-version == '2.6.0' }}
+        if: ${{ matrix.pytorch-version == '2.7.0' }}
         run: echo 'PIP_EXTRA_INDEX_URL=--extra-index-url https://download.pytorch.org/whl/test/cpu/' >> $GITHUB_ENV
       - name: Install pkg
         timeout-minutes: 25
@@ -131,6 +131,8 @@ jobs:
           done
           pip install --requirement requirements/_devel.txt -U \
             $PIP_EXTRA_INDEX_URL --find-links="$PYPI_CACHE_DIR"
+          pip install --requirement requirements/clustering.txt -U \
+            $PIP_EXTRA_INDEX_URL --find-links="$PYPI_CACHE_DIR" || true # separate install to avoid conflicts and ignore failures
           pip list
 
       - name: set special vars for PR

.github/workflows/clear-cache.yml

@@ -23,18 +23,18 @@ on:
 jobs:
   cron-clear:
     if: github.event_name == 'schedule' || github.event_name == 'pull_request'
-    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.11.9
+    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.13.1
     with:
-      scripts-ref: v0.11.9
+      scripts-ref: v0.13.1
       dry-run: ${{ github.event_name == 'pull_request' }}
       pattern: "pip-latest"
       age-days: 7
 
   direct-clear:
     if: github.event_name == 'workflow_dispatch' || github.event_name == 'pull_request'
-    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.11.9
+    uses: Lightning-AI/utilities/.github/workflows/cleanup-caches.yml@v0.13.1
     with:
-      scripts-ref: v0.11.9
+      scripts-ref: v0.13.1
       dry-run: ${{ github.event_name == 'pull_request' }}
       pattern: ${{ inputs.pattern || 'pypi_wheels' }} # setting str in case of PR / debugging
       age-days: ${{ fromJSON(inputs.age-days) || 0 }} # setting 0 in case of PR / debugging

.github/workflows/docker-build.yml

@@ -72,7 +72,6 @@ jobs:
           - { python: "3.11", pytorch: "2.3.1", cuda: "12.1.1", ubuntu: "22.04" }
           - { python: "3.11", pytorch: "2.4.1", cuda: "12.1.1", ubuntu: "22.04" }
           - { python: "3.11", pytorch: "2.5.0", cuda: "12.1.1", ubuntu: "22.04" }
-          # the future version - test or RC version
           - { python: "3.11", pytorch: "2.6.0", cuda: "12.4.1", ubuntu: "22.04" }
     steps:
       - uses: actions/checkout@v4

.github/workflows/docs-build.yml

@@ -39,7 +39,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with:
-          python-version: "3.x"
+          python-version: "3.10"
 
       - name: source cashing
         uses: ./.github/actions/pull-caches

.github/workflows/greetings.yml

@@ -10,5 +10,5 @@ jobs:
       - uses: actions/first-interaction@v1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          issue-message: "Hi! thanks for your contribution!, great first issue!"
+          issue-message: "Hi! Thanks for your contribution! Great first issue!"
           pr-message: "Hey thanks for the input! Please give us a bit of time to review it!"

.github/workflows/publish-pkg.yml

@@ -67,7 +67,7 @@ jobs:
       - run: ls -lh dist/
       # We do this, since failures on test.pypi aren't that bad
       - name: Publish to Test PyPI
-        uses: pypa/gh-action-pypi-publish@v1.12.3
+        uses: pypa/gh-action-pypi-publish@v1.12.4
         with:
           user: __token__
           password: ${{ secrets.test_pypi_password }}
@@ -94,7 +94,7 @@ jobs:
           path: dist
       - run: ls -lh dist/
       - name: Publish distribution 📦 to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.12.3
+        uses: pypa/gh-action-pypi-publish@v1.12.4
         with:
           user: __token__
           password: ${{ secrets.pypi_password }}