add support for newer pip and CUDA computation versions (#151)

jamesobutler · dependabot[bot] · web-flow · commit 33397cbe45d0 · 2024-12-15T17:06:17.000+01:00
Signed-off-by: dependabot[bot] &lt;support@github.com&gt;
Co-authored-by: dependabot[bot] &lt;49699333+dependabot[bot]@users.noreply.github.com&gt;
diff --git a/.github/actions/setup-dev-env/action.yml b/.github/actions/setup-dev-env/action.yml
@@ -3,7 +3,7 @@ description: "Setup development environment"
 
 inputs:
   python-version:
-    default: "3.7"
+    default: "3.9"
 
 runs:
   using: composite
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/check-pytorch-package-indices.yml b/.github/workflows/check-pytorch-package-indices.yml
@@ -7,6 +7,8 @@ on:
       - .github/workflows/check-available-pytorch-dists.yml
       - scripts/check_pytorch_package_indices.py
 
+  workflow_dispatch:
+
   schedule:
     - cron: "20 4 * * *"
 
@@ -16,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
@@ -3,6 +3,8 @@ name: install
 on:
   pull_request:
 
+  workflow_dispatch:
+
 jobs:
   channel:
     strategy:
@@ -12,10 +14,10 @@ jobs:
           - windows-latest
           - macos-latest
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         pytorch-channel:
           - stable
           - test
@@ -26,7 +28,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -65,29 +67,32 @@ jobs:
           - windows-latest
           - macos-latest
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
         pytorch-computation-backend:
           - cpu
-          - cu117
           - cu118
+          - cu121
+          - cu124
         exclude:
-          - os: macos-latest
-            pytorch-computation-backend: cu117
           - os: macos-latest
             pytorch-computation-backend: cu118
+          - os: macos-latest
+            pytorch-computation-backend: cu121
+          - os: macos-latest
+            pytorch-computation-backend: cu124
       # TODO: find a way to test this
       #          - os: ubuntu-latest
-      #            pytorch-computation-backend: rocm5.4.2
+      #            pytorch-computation-backend: rocm6.2
       fail-fast: false
 
     runs-on: ${{ matrix.os }}
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -102,7 +107,7 @@ jobs:
       - name: Install torch
         run:
           ltt install --pytorch-computation-backend=${{
-          matrix.pytorch-computation-backend }} torch==2.0.0
+          matrix.pytorch-computation-backend }} torch==2.5.1
 
       - name: Check computation backend
         shell: python
@@ -140,7 +145,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -14,15 +14,15 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
       - name: Setup development environment
         uses: ./.github/actions/setup-dev-env
 
       - name: Restore pre-commit cache
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: ~/.cache/pre-commit
           key: pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
diff --git a/.github/workflows/linux-nightly-install.yml b/.github/workflows/linux-nightly-install.yml
@@ -6,6 +6,8 @@ on:
       - .github/issue-templates/linux-nightly-uninstallable.md
       - .github/workflows/linux-nightly-install.yml
 
+  workflow_dispatch:
+
   schedule:
     - cron: "40 4 * * *"
 
@@ -14,17 +16,17 @@ jobs:
     strategy:
       matrix:
         python-version:
-          - "3.8"
           - "3.9"
           - "3.10"
           - "3.11"
+          - "3.12"
       max-parallel: 1
 
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,7 +11,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/publishable.yml b/.github/workflows/publishable.yml
@@ -20,13 +20,15 @@ on:
       - "README.rst"
       - "requirements-dev.txt"
 
+  workflow_dispatch:
+
 jobs:
   pypi:
     runs-on: ubuntu-latest
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/tests-pip-latest.yml b/.github/workflows/tests-pip-latest.yml
@@ -7,6 +7,8 @@ on:
       - .github/issue-templates/pip-latest-success.md
       - .github/workflows/tests-pip-latest.yml
 
+  workflow_dispatch:
+
   schedule:
     - cron: "0 4 * * *"
 
@@ -23,7 +25,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -19,6 +19,8 @@ on:
       - "pytest.ini"
       - "requirements-dev.txt"
 
+  workflow_dispatch:
+
   schedule:
     - cron: "0 4 * * *"
 
@@ -31,10 +33,10 @@ jobs:
           - windows-latest
           - macos-latest
         python-version:
-          - "3.7"
-          - "3.8"
           - "3.9"
           - "3.10"
+          - "3.11"
+          - "3.12"
 
     runs-on: ${{ matrix.os }}
     env:
@@ -43,7 +45,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -56,7 +58,7 @@ jobs:
         run: doit test
 
       - name: Upload coverage
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v5
         with:
           flags: unit
           env_vars: OS,PYTHON_VERSION
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: mixed-line-ending
@@ -9,7 +9,7 @@ repos:
       - id: end-of-file-fixer
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.5.1
+    rev: v3.1.0
     hooks:
       - id: prettier
         types_or:
@@ -18,9 +18,9 @@ repos:
           - yaml
 
   - repo: https://github.com/omnilib/ufmt
-    rev: v1.3.2
+    rev: v2.8.0
     hooks:
       - id: ufmt
         additional_dependencies:
-          - black == 22.1.0
-          - usort == 1.0.2
+          - black == 24.10.0
+          - usort == 1.0.8
diff --git a/light_the_torch/_cb.py b/light_the_torch/_cb.py
@@ -151,6 +151,12 @@ def _detect_nvidia_driver_version() -> Optional[Version]:
     "Linux": {
         # Table 2 from
         # https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html
+        Version("12.6"): Version("525.60.13"),
+        Version("12.5"): Version("525.60.13"),
+        Version("12.4"): Version("525.60.13"),
+        Version("12.3"): Version("525.60.13"),
+        Version("12.2"): Version("525.60.13"),
+        Version("12.1"): Version("525.60.13"),
         Version("12.0"): Version("525.60.13"),
         # Table 2 from
         # https://docs.nvidia.com/cuda/archive/11.8.0/cuda-toolkit-release-notes/index.html
@@ -176,7 +182,13 @@ def _detect_nvidia_driver_version() -> Optional[Version]:
     "Windows": {
         # Table 2 from
         # https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html
-        Version("12.0"): Version("527.41"),
+        Version("12.6"): Version("528.33"),
+        Version("12.5"): Version("528.33"),
+        Version("12.4"): Version("528.33"),
+        Version("12.3"): Version("528.33"),
+        Version("12.2"): Version("528.33"),
+        Version("12.1"): Version("528.33"),
+        Version("12.0"): Version("528.33"),
         # Table 2 from
         # https://docs.nvidia.com/cuda/archive/11.8.0/cuda-toolkit-release-notes/index.html
         Version("11.8"): Version("452.39"),
diff --git a/light_the_torch/_compat.py b/light_the_torch/_compat.py
diff --git a/light_the_torch/_utils.py b/light_the_torch/_utils.py
@@ -1,15 +1,15 @@
 import contextlib
 import functools
 import importlib
+
+import importlib.metadata as importlib_metadata
 import inspect
 import itertools
 
 from unittest import mock
 
 from pip._vendor.packaging.requirements import Requirement
 
-from ._compat import importlib_metadata
-
 
 class UnexpectedInternalError(Exception):
     def __init__(self, msg) -> None:
diff --git a/pyproject.toml b/pyproject.toml
@@ -26,18 +26,16 @@ classifiers = [
     "Environment :: GPU :: NVIDIA CUDA",
     "Intended Audience :: Developers",
     "License :: OSI Approved :: BSD License",
-    "Programming Language :: Python :: 3.7",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Topic :: System :: Installation/Setup",
     "Topic :: Utilities",
 ]
-requires-python = ">= 3.7"
+requires-python = ">= 3.9"
 dependencies = [
-    "pip >=22.3, <23.3",
-    "importlib_metadata ; python_version < '3.8'",
+    "pip >=22.3, <24.4",
 ]
 dynamic = ["version"]
 
@@ -66,7 +64,7 @@ local_scheme = "node-and-timestamp"
 # https://github.com/psf/black#configuration-format
 
 line-length = 88
-target-version = ['py37']
+target-version = ['py39']
 exclude = '''
 /(
     \.git
diff --git a/scripts/collect_env.py b/scripts/collect_env.py
@@ -83,9 +83,11 @@ def detect_pytorch_or_dependent_packages():
             name in PYTORCH_DISTRIBUTIONS
             for name in itertools.chain(
                 [dist.name],
-                [Requirement(req_str).name for req_str in dist.requires]
-                if dist.requires
-                else [],
+                (
+                    [Requirement(req_str).name for req_str in dist.requires]
+                    if dist.requires
+                    else []
+                ),
             )
         )
     }

Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,11 @@ def detect_pytorch_or_dependent_packages():`
`83`	`83`	`name in PYTORCH_DISTRIBUTIONS`
`84`	`84`	`for name in itertools.chain(`
`85`	`85`	`[dist.name],`
`86`		`- [Requirement(req_str).name for req_str in dist.requires]`
`87`		`- if dist.requires`
`88`		`- else [],`
	`86`	`+ (`
	`87`	`+ [Requirement(req_str).name for req_str in dist.requires]`
	`88`	`+ if dist.requires`
	`89`	`+ else []`
	`90`	`+ ),`
`89`	`91`	`)`
`90`	`92`	`)`
`91`	`93`	`}`