Fix CI

Author: alexanderswerdlow

.github/workflows/ci.yml

@@ -2,13 +2,23 @@ name: Python package
 
 on: [push]
 
+env:
+  UV_LINK_MODE: "symlink"
+
 jobs:
   build:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"]
-        
+        include:
+          - python-version: "3.8"
+            numpy-version: "<2.0"
+            torch-version: "disable"
+            torch-pip: "torch==1.13.1+cpu torchvision==0.14.1+cpu --index-url https://download.pytorch.org/whl/cpu"
+
+          - python-version: "3.12"
+            numpy-version: ">=2.0"
     steps:
       - uses: actions/checkout@v4
 
@@ -17,8 +27,30 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install dependencies
-        run: uv sync --all-extras
+      - name: Install specific numpy version
+        if: matrix.numpy-version != ''
+        run: uv pip install "numpy${{ matrix.numpy-version }}"
+
+      - name: Install w/specific PyTorch version
+        if: ( matrix.torch-version != '' ) && ( matrix.torch-version != 'disable' )
+        run: uv sync --extra video --extra dev --extra ${{ matrix.torch-version }}
+
+      - name: Install w/CPU PyTorch version
+        if: matrix.torch-version != 'disable'
+        run: uv sync --extra video --extra dev --extra cpu
+      
+      - name: Install w/o PyTorch
+        if: matrix.torch-version == 'disable'
+        run: uv sync --extra video --extra dev
+
+      - name: Install PyTorch w/Pip
+        if: matrix.torch-pip != ''
+        run: uv pip install ${{ matrix.torch-pip }}
+
+      # We intentionally run again since some envs force specific numpy versions in this way.
+      - name: Install specific numpy version
+        if: matrix.numpy-version != ''
+        run: uv pip install "numpy${{ matrix.numpy-version }}"
 
       - name: Display Python version
         run: uv run python -c "import sys; print(sys.version)"
@@ -27,4 +59,6 @@ jobs:
         run: uv pip uninstall opencv-python && uv pip install opencv-python-headless
 
       - name: Test with pytest
-        run: uv run pytest
+        run: |
+          uv pip install pytest
+          uv run pytest -k 'test_concat' # uv run pytest

README.md

@@ -103,4 +103,13 @@ To run all tests, simply run: `pytest`
 
 To break with pdb on error, use: `pytest --pdb -s`
 
-To run a specific test use: `pytest -k 'test_concat' --pdb -s`
+To run a specific test use: `pytest -k 'test_concat' --pdb -s`
+
+## Local Installation
+
+To install locally in a self-contained environment with [UV](https://docs.astral.sh/uv/):
+
+```
+git clone https://github.com/alexanderswerdlow/image_utils.git
+uv sync --extra video --extra dev --extra cpu
+```

pyproject.toml

@@ -14,17 +14,54 @@ dependencies = [
     "numpy>=1.17",
     "pillow>=8.0.0",
     "einops>=0.3.0",
-    "jaxtyping>=0.2.19"
+    "jaxtyping>=0.2.19",
 ]
 
 [project.urls]
 Homepage = "https://github.com/alexanderswerdlow/image_utils"
 
 [project.optional-dependencies]
-torch = ["torch", "torchvision"]
 video = ["av>=10.0.0", "imageio[ffmpeg]>=2.23.0"]
-proc = ["joblib>=1.2.0"]
-dev = ["pytest", "pytest-cov", "lovely-tensors>=0.1.14", "lovely-numpy>=0.2.8", "opencv-python"]
+dev = ["pytest", "pytest-cov",  "lovely-numpy>=0.2.8", "opencv-python", "joblib>=1.2.0"]
+cpu = ["torch", "torchvision", "lovely-tensors"]
+cu118 = ["torch", "torchvision", "lovely-tensors"]
+cu124 = ["torch", "torchvision", "lovely-tensors"]
+
+[tool.uv]
+conflicts = [
+  [
+    { extra = "cpu" },
+    { extra = "cu118" },
+    { extra = "cu124" },
+  ],
+]
+
+[tool.uv.sources]
+torch = [
+  { index = "pytorch-cpu", extra = "cpu" },
+  { index = "pytorch-cu118", extra = "cu118" },
+  { index = "pytorch-cu124", extra = "cu124" },
+]
+torchvision = [
+  { index = "pytorch-cpu", extra = "cpu" },
+  { index = "pytorch-cu118", extra = "cu118" },
+  { index = "pytorch-cu124", extra = "cu124" },
+]
+
+[[tool.uv.index]]
+name = "pytorch-cpu"
+url = "https://download.pytorch.org/whl/cpu"
+explicit = true
+
+[[tool.uv.index]]
+name = "pytorch-cu118"
+url = "https://download.pytorch.org/whl/cu118"
+explicit = true
+
+[[tool.uv.index]]
+name = "pytorch-cu124"
+url = "https://download.pytorch.org/whl/cu124"
+explicit = true
 
 [build-system]
 requires = ["hatchling"]