Re-enable testing on macos-latest

.github/workflows/tests.yml

@@ -5,15 +5,28 @@ on:
     branches: [master]
     paths:
       - "zamba/**"
+      - "pyproject.toml"
+      - ".github/workflows/tests.yml"
   pull_request:
     branches:
       - master
     paths:
       - "zamba/**"
+      - "pyproject.toml"
+      - ".github/workflows/tests.yml"
   schedule:
     # Run every Sunday
     - cron: '0 0 * * 0'
   workflow_dispatch:
+    inputs:
+      chosen-os:
+        description: 'OS to run on'
+        required: true
+        type: choice
+        default: ubuntu-latest
+        options:
+        - ubuntu-latest
+        - macos-latest
 
 env:
   MODEL_CACHE_DIR: ${{ github.workspace }}/.zamba-weights
@@ -22,14 +35,16 @@ jobs:
   code-quality:
     name: Code Quality
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v4
 
-      - name: Set up Python and uv
-        uses: drivendataorg/setup-python-uv-action@v1
+      - uses: astral-sh/setup-uv@v5
         with:
-          python-version: 3.11
+          python-version: "3.11"
+          enable-cache: true
+          cache-suffix: "lint"
+          cache-dependency-glob: |
+            requirements-dev/lint.txt
 
       - name: Install dependencies
         run: |
@@ -39,17 +54,46 @@ jobs:
         run: |
           make lint
 
+
+  set-up-os-matrix:
+    name: "Set up OS matrix"
+    needs: code-quality
+    runs-on: ubuntu-latest
+    outputs:
+      os_matrix: ${{ steps.step.outputs.os_matrix }}
+    steps:
+      - name: Set up OS matrix
+        id: step
+        run: |
+          if [[ ${{ github.event_name }} = 'schedule' ]]; then
+            MATRIX='["ubuntu-latest", "macos-latest"]'
+          elif [[ ${{ github.event_name }} = 'workflow_dispatch' ]]; then
+            MATRIX='["${{ inputs.chosen-os }}"]'
+          else
+            MATRIX='["ubuntu-latest"]'
+          fi
+          echo "$MATRIX"
+          echo "os_matrix=$MATRIX" >> "$GITHUB_OUTPUT"
+
+
   cache-model-weights:
     name: Download or use cached model weights
-    runs-on: ubuntu-latest
+    needs: set-up-os-matrix
+    strategy:
+      matrix:
+        os: ${{ fromJson(needs.set-up-os-matrix.outputs.os_matrix) }}
+    runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v4
 
-    - name: Set up Python and uv
-      uses: drivendataorg/setup-python-uv-action@v1
+    - uses: astral-sh/setup-uv@v5
       with:
-        python-version: 3.11
+        python-version: "3.11"
+        enable-cache: true
+        cache-suffix: "cache-weights"
+        cache-dependency-glob: |
+          pyproject.toml
 
     - name: Install dependencies
       run: |
@@ -67,14 +111,14 @@ jobs:
 
   tests:
     name: Test suite (${{ matrix.os }}, Python ${{ matrix.python-version }})
-    needs: [code-quality, cache-model-weights]
-    runs-on: ${{ matrix.os }}
+    needs: [set-up-os-matrix, cache-model-weights]
     env:
       DISTUTILS_USE_SDK: 1 # for MSVC compiler
     strategy:
       matrix:
-        os: [ubuntu-latest]
+        os: ${{ fromJson(needs.set-up-os-matrix.outputs.os_matrix) }}
         python-version: [3.11, 3.12]
+    runs-on: ${{ matrix.os }}
 
     steps:
       - if: matrix.os == 'ubuntu-latest'
@@ -118,10 +162,13 @@ jobs:
       - name: Configure Windows compilers
         uses: ilammy/msvc-dev-cmd@v1
 
-      - name: Set up Python and uv
-        uses: drivendataorg/setup-python-uv-action@v1
+      - uses: astral-sh/setup-uv@v5
         with:
           python-version: ${{ matrix.python-version }}
+          enable-cache: true
+          cache-suffix: "tests-${{ matrix.python-version }}"
+          cache-dependency-glob: |
+            pyproject.toml
 
       - name: Install dependencies
         run: |
@@ -150,7 +197,7 @@ jobs:
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.xml
-          fail_ci_if_error: true
+          fail_ci_if_error: ${{ (github.event_name == 'push' && true) || (github.event_name == 'pull_request' && true) || false }}
 
   test-install:
     name: Test install from built distributions
@@ -185,10 +232,13 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           version: "4.4"
 
-      - name: Set up Python and uv
-        uses: drivendataorg/setup-python-uv-action@v1
+      - uses: astral-sh/setup-uv@v5
         with:
           python-version: ${{ matrix.python-version }}
+          enable-cache: true
+          cache-suffix: "test-install-${{ matrix.python-version }}"
+          cache-dependency-glob: |
+            pyproject.toml
 
       - name: Build package
         run: |
@@ -213,7 +263,7 @@ jobs:
 
   notify:
     name: Notify failed build
-    needs: [code-quality, tests, test-install]
+    needs: [code-quality, set-up-os-matrix, tests, test-install]
     if: failure() && (github.event_name == 'push' || github.event_name == 'schedule')
     runs-on: ubuntu-latest
     steps:

tests/test_cli.py

@@ -191,7 +191,7 @@ def test_actual_prediction_on_single_video(tmp_path, model):  # noqa: F811
 
 
 def test_actual_prediction_on_images(tmp_path, mocker):  # noqa: F811
-    """Tests experimental feature of predicting on images."""
+    """Test predicting on images."""
     shutil.copytree(ASSETS_DIR / "images", tmp_path / "images")
     data_dir = tmp_path / "images"
 

zamba/images/data.py

@@ -111,7 +111,9 @@ def preprocess_annotations(self, annotations: pd.DataFrame) -> pd.DataFrame:
             annotations = pd.DataFrame(processed_annotations)
         else:
             processed_annotations = []
-            detector = run_detector.load_detector("MDV5A")
+            detector = run_detector.load_detector(
+                "MDV5A", force_cpu=(os.getenv("RUNNER_OS") == "macOS")
+            )
             for _, row in tqdm(
                 annotations.iterrows(),
                 total=len(annotations),

zamba/images/manager.py

@@ -56,7 +56,7 @@ def predict(config: ImageClassificationPredictConfig) -> None:
         ]
     )
     logger.info("Loading models")
-    detector = run_detector.load_detector("MDV5A")
+    detector = run_detector.load_detector("MDV5A", force_cpu=(os.getenv("RUNNER_OS") == "macOS"))
     classifier_module = instantiate_model(
         checkpoint=config.checkpoint,
     )