releasing minor 1.2.1 [rebase & merge]

.azure/gpu-integrations.yml

@@ -17,12 +17,13 @@ jobs:
   - job: integrate_GPU
     strategy:
       matrix:
-        "oldest":
-          docker-image: "pytorch/pytorch:1.11.0-cuda11.3-cudnn8-runtime"
-          torch-ver: "1.11.0"
-        "latest":
-          docker-image: "pytorch/pytorch:2.0.0-cuda11.7-cudnn8-runtime"
-          torch-ver: "2.0.0"
+        "torch | 1.x":
+          docker-image: "pytorchlightning/torchmetrics:ubuntu22.04-cuda11.8.0-py3.9-torch1.13"
+          torch-ver: "1.13.1"
+          requires: "oldest"
+        "torch | 2.x":
+          docker-image: "pytorch/pytorch:2.1.1-cuda12.1-cudnn8-runtime"
+          torch-ver: "2.1.1"
     # 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
@@ -46,6 +47,8 @@ jobs:
           CUDA_version_mm="${CUDA_version//'.'/''}"
           echo "##vso[task.setvariable variable=CUDA_VERSION_MM]$CUDA_version_mm"
           echo "##vso[task.setvariable variable=TORCH_URL]https://download.pytorch.org/whl/cu${CUDA_version_mm}/torch_stable.html"
+          # packages for running assistant
+          pip install -q packaging fire requests wget
         displayName: "set Env. vars"
 
       - bash: |
@@ -63,24 +66,29 @@ jobs:
 
       - bash: |
           set -e
-          pip install -q packaging fire requests wget
+          python .github/assistant.py set-oldest-versions --req_files='["requirements/_integrate.txt"]'
+          cat requirements/_integrate.txt
+        condition: eq(variables['requires'], 'oldest')
+        displayName: "Setting oldest req."
+
+      - bash: |
+          set -e
           python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
-          python adjust-torch-versions.py requirements.txt $(torch-ver)
-          python adjust-torch-versions.py requirements/integrate.txt $(torch-ver)
-          python .github/assistant.py set-oldest-versions --req_files='["requirements/integrate.txt"]'
-          cat requirements/integrate.txt
+          for fpath in `ls requirements/*.txt`; do
+              # torch version shall be sourced based on the used docker
+              python adjust-torch-versions.py $fpath
+          done
         displayName: "Adjust versions"
 
       - bash: |
-          set -ex
-          pip install -q -r requirements/integrate.txt
+          pip install -q -r requirements/_integrate.txt
           # force reinstall TM as it could be overwritten by integration's dependencies
-          pip install . -U -r requirements/test.txt --find-links ${TORCH_URL}
-          pip list
+          pip install . -U -r requirements/_tests.txt --find-links ${TORCH_URL}
         displayName: "Install package & integrations"
 
       - bash: |
           set -e
+          pip list
           python -c "from torch import __version__ as ver ; assert str(ver).split('+')[0] == '$(torch-ver)', f'PyTorch: {ver}'"
           python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu >= 2, f'found GPUs: {mgpu}'"
         displayName: "Sanity check"

.azure/gpu-unittests.yml

@@ -19,23 +19,20 @@ jobs:
       matrix:
         "PyTorch | old":
           # Torch does not have build wheels with old Torch versions for newer CUDA
-          docker-image: "nvidia/cuda:11.1.1-cudnn8-devel-ubuntu20.04"
-          agent-pool: "lit-rtx-3090"
+          docker-image: "pytorchlightning/torchmetrics:ubuntu20.04-cuda11.1.1-py3.8-torch1.8.1"
           torch-ver: "1.8.1"
         "PyTorch | 1.X":
-          docker-image: "pytorch/pytorch:1.13.1-cuda11.6-cudnn8-runtime"
-          agent-pool: "lit-rtx-3090"
+          docker-image: "pytorchlightning/torchmetrics:ubuntu22.04-cuda11.8.0-py3.9-torch1.13"
           torch-ver: "1.13.1"
         "PyTorch | 2.X":
-          docker-image: "pytorch/pytorch:2.0.0-cuda11.7-cudnn8-runtime"
-          agent-pool: "lit-rtx-3090"
-          torch-ver: "2.0.0"
+          docker-image: "pytorchlightning/torchmetrics:ubuntu22.04-cuda12.1.0-py3.11-torch2.1"
+          torch-ver: "2.1.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)' )
@@ -51,37 +48,12 @@ jobs:
 
     container:
       image: "$(docker-image)"
-      options: "--gpus=all --shm-size=8g -v /usr/bin/docker:/tmp/docker:ro  -v /var/tmp:/var/tmp"
+      options: "--gpus=all --shm-size=8g -v /var/tmp:/var/tmp"
 
     workspace:
       clean: all
 
     steps:
-      - script: |
-          set -ex
-          container_id=$(head -1 /proc/self/cgroup|cut -d/ -f3)
-          echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
-          /tmp/docker exec -t -u 0 $container_id \
-            sh -c "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confold" -y install sudo"
-          echo "##vso[task.setvariable variable=CONTAINER_ID]$container_id"
-        displayName: "Install Sudo in container (thanks Microsoft!)"
-
-      - script: |
-          sudo apt-get update -q --fix-missing
-          sudo apt-get install -q -y --no-install-recommends \
-            build-essential \
-            wget \
-            python${PYTHON_VERSION} \
-            python${PYTHON_VERSION}-dev \
-            python${PYTHON_VERSION}-distutils
-          sudo update-alternatives --install /usr/bin/python python /usr/bin/python${PYTHON_VERSION} 1
-          wget https://bootstrap.pypa.io/get-pip.py --progress=bar:force:noscroll --no-check-certificate
-          python get-pip.py
-        env:
-          PYTHON_VERSION: "3.8"
-        condition: startsWith(variables['docker-image'], 'nvidia/cuda:')
-        displayName: "install python & pip"
-
       - bash: |
           echo "##vso[task.setvariable variable=CUDA_VISIBLE_DEVICES]$(DEVICES)"
           CUDA_version=$(nvcc --version | sed -n 's/^.*release \([0-9]\+\.[0-9]\+\).*$/\1/p')
@@ -96,7 +68,6 @@ jobs:
           whereis nvidia
           nvidia-smi
           echo $CUDA_VISIBLE_DEVICES
-          echo $CONTAINER_ID
           echo $TORCH_URL
           python --version
           pip --version
@@ -105,29 +76,26 @@ jobs:
         displayName: "Image info & NVIDIA"
 
       - bash: |
-          pip install -q packaging wget
-          python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
-          python adjust-torch-versions.py requirements.txt $(torch-ver)
+          python .github/assistant.py set-oldest-versions
+        condition: eq(variables['torch-ver'], '1.8.1')
+        displayName: "Setting oldest versions"
+
+      - bash: |
+          pip install -q packaging
+          wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
           for fpath in `ls requirements/*.txt`; do
-              python adjust-torch-versions.py $fpath $(torch-ver)
+              # torch version shall be sourced based on the used docker
+              python adjust-torch-versions.py $fpath
           done
         displayName: "Adjust versions"
 
       - bash: |
-          set -ex
-          sudo apt-get update -qq --fix-missing
-          sudo apt-get install -y --no-install-recommends \
-            build-essential gcc g++ cmake ffmpeg git libsndfile1 unzip
-          # pip install pip -U
-          pip install -q "numpy<1.24"  # trying to resolve pesq installation
-          pip install . -U -r ./requirements/devel.txt \
-            --prefer-binary --find-links=${TORCH_URL}
-          pip install mkl-service==2.4.0  # needed for the gpu multiprocessing
-          pip list
+          pip install . -U -r ./requirements/_devel.txt --prefer-binary --find-links=${TORCH_URL}
         displayName: "Install environment"
 
       - bash: |
           set -e
+          pip list
           python -c "from torch import __version__ as ver ; assert str(ver).split('+')[0] == '$(torch-ver)', f'PyTorch: {ver}'"
           python -c "import torch ; mgpu = torch.cuda.device_count() ; assert mgpu >= 2, f'found GPUs: {mgpu}'"
         displayName: "Sanity check"
@@ -149,8 +117,7 @@ jobs:
         displayName: "DocTesting"
 
       - bash: |
-          # wget is simpler but does not work on Windows
-          python -c "from urllib.request import urlretrieve ; urlretrieve('https://pl-public-data.s3.amazonaws.com/metrics/data.zip', 'data.zip')"
+          wget https://pl-public-data.s3.amazonaws.com/metrics/data.zip
           unzip -o data.zip
           ls -l _data/*
         workingDirectory: tests

.devcontainer/Dockerfile

@@ -11,20 +11,20 @@ RUN if [ "${NODE_VERSION}" != "none" ]; then \
     fi
 
 COPY requirements/ /tmp/pip-tmp/requirements/
-COPY requirements.txt /tmp/pip-tmp/
 RUN \
     pip3 install awscli && \
     aws s3 sync --no-sign-request s3://sphinx-packages/ dist/  && \
+    # trying to resolve pesq installation issue
+    pip3 install -q "numpy<1.24" && \
     pip3 --disable-pip-version-check --no-cache-dir install \
-      -r /tmp/pip-tmp/requirements/devel.txt \
-      -r /tmp/pip-tmp/requirements/docs.txt \
+      -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" \
       --find-links="dist/" && \
     rm -rf /tmp/pip-tmp
 
 # [Optional] If your pip requirements rarely change, uncomment this section to add them to the image.
-# COPY requirements.txt /tmp/pip-tmp/
-# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
+# RUN pip3 --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements/base.txt \
 #    && rm -rf /tmp/pip-tmp
 
 # [Optional] Uncomment this section to install additional OS packages.

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.194.0/containers/python-3
 {
   "name": "PyTorch Lightning Metrics",
-  "image": "pytorchlightning/metrics-dev",
+  "image": "pytorchlightning/torchmetrics:devcontainer-py3.9",
   // If you want to use a different Python version, uncomment the build object below
   // "build": {
   //     "dockerfile": "Dockerfile",

.github/CONTRIBUTING.md

@@ -134,7 +134,7 @@ When you send a PR the continuous integration will run tests and build the docs.
 To setup a local development environment, install both local and test dependencies:
 
 ```bash
-python -m pip install -r requirements/test.txt
+python -m pip install -r requirements/_tests.txt
 python -m pip install pre-commit
 ```
 

.github/actions/pull-caches/action.yml

@@ -19,14 +19,15 @@ runs:
   using: "composite"
   steps:
     - name: install assistant's deps
-      run: pip install -q fire requests packaging
+      run: pip install -q fire requests packaging wget
       shell: bash
 
     - name: Set PyTorch version
       if: inputs.pytorch-version != ''
       run: |
-        curl https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py -o adjust-torch-versions.py
-        python adjust-torch-versions.py requirements.txt ${{ inputs.pytorch-version }}
+        pip install wget
+        python -m wget https://raw.githubusercontent.com/Lightning-AI/utilities/main/scripts/adjust-torch-versions.py
+        python adjust-torch-versions.py requirements/base.txt ${{ inputs.pytorch-version }}
       shell: bash
 
     - name: Set min. dependencies

.github/actions/push-caches/action.yml

@@ -32,16 +32,16 @@ runs:
     #  run: |
     #    import os
     #    fp = 'requirements.dump'
-    #    with open(fp) as fo:
-    #      lines = [ln.strip() for ln in fo.readlines()]
+    #    with open(fp) as fopen:
+    #      lines = [ln.strip() for ln in fopen.readlines()]
     #    lines = [ln.split('+')[0] for ln in lines if '-e ' not in ln]
-    #    with open(fp, 'w') as fw:
-    #      fw.writelines([ln + os.linesep for ln in lines])
+    #    with open(fp, 'w') as fwrite:
+    #      fwrite.writelines([ln + os.linesep for ln in lines])
     #  shell: python
 
     - name: Dump wheels
       run: |
-        pip wheel -r requirements/devel.txt --prefer-binary \
+        pip wheel -r requirements/_devel.txt --prefer-binary \
           --wheel-dir=.pip-wheels \
           -f ${{ inputs.torch-url }} -f ${{ inputs.pypi-dir }}
         ls -lh .pip-wheels

.github/assistant.py

@@ -18,11 +18,11 @@
 import re
 import sys
 import traceback
-from distutils.version import LooseVersion
 from typing import List, Optional, Tuple, Union
 
 import fire
 import requests
+from packaging.version import parse
 from pkg_resources import parse_requirements
 
 _REQUEST_TIMEOUT = 10
@@ -68,20 +68,20 @@ def prune_packages(req_file: str, *pkgs: str) -> None:
             fp.writelines(lines)
 
     @staticmethod
-    def set_min_torch_by_python(fpath: str = "requirements.txt") -> None:
+    def set_min_torch_by_python(fpath: str = "requirements/base.txt") -> None:
         """Set minimal torch version according to Python actual version.
 
-        >>> AssistantCLI.set_min_torch_by_python("../requirements.txt")
+        >>> AssistantCLI.set_min_torch_by_python("../requirements/base.txt")
 
         """
         py_ver = f"{sys.version_info.major}.{sys.version_info.minor}"
         if py_ver not in LUT_PYTHON_TORCH:
             return
         with open(fpath) as fp:
             reqs = parse_requirements(fp.readlines())
-        pkg_ver = [p for p in reqs if p.name == "torch"][0]
-        pt_ver = min([LooseVersion(v[1]) for v in pkg_ver.specs])
-        pt_ver = max(LooseVersion(LUT_PYTHON_TORCH[py_ver]), pt_ver)
+        pkg_ver = next(p for p in reqs if p.name == "torch")
+        pt_ver = min([parse(v[1]) for v in pkg_ver.specs])
+        pt_ver = max(parse(LUT_PYTHON_TORCH[py_ver]), pt_ver)
         with open(fpath) as fp:
             requires = fp.read()
         requires = re.sub(r"torch>=[\d\.]+", f"torch>={pt_ver}", requires)
@@ -103,6 +103,7 @@ def set_oldest_versions(req_files: List[str] = REQUIREMENTS_FILES) -> None:
         """Set the oldest version for requirements."""
         AssistantCLI.set_min_torch_by_python()
         for fpath in req_files:
+            logging.info(f"processing req: `{fpath}`")
             AssistantCLI.replace_min_requirements(fpath)
 
     @staticmethod

.github/workflows/ci-checks.yml

@@ -5,6 +5,7 @@ on:
     branches: [master, "release/*"]
   pull_request:
     branches: [master, "release/*"]
+    types: [opened, reopened, ready_for_review, synchronize]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-${{ github.head_ref }}
@@ -14,8 +15,8 @@ jobs:
   check-code:
     uses: Lightning-AI/utilities/.github/workflows/check-code.yml@v0.9.0
     with:
-      actions-ref: main
-      extra-typing: typing
+      actions-ref: v0.9.0
+      extra-typing: "typing"
 
   check-schema:
     uses: Lightning-AI/utilities/.github/workflows/check-schema.yml@v0.9.0
@@ -24,7 +25,7 @@ jobs:
     if: github.event.pull_request.draft == false
     uses: Lightning-AI/utilities/.github/workflows/check-package.yml@v0.9.0
     with:
-      actions-ref: main
+      actions-ref: v0.9.0
       artifact-name: dist-packages-${{ github.sha }}
       import-name: "torchmetrics"
       testing-matrix: |