remove scipy dependency from benchmarking, as that's hammering builds

Author: kodonnell

pyproject.toml

@@ -13,15 +13,11 @@ write_to = "src/qoi/_version.py"
 write_to_template = "__version__ = \"{version}\""
 
 [tool.cibuildwheel]
-test-requires = "pytest scikit-image"
+test-requires = "pytest"
 test-command = "pytest {project}/tests"
 build = "cp37-* cp38-* cp39-* cp310-*"
-# arm64 is experimental on windows apparently, skip musl, and cp310-win32 fails so ignore for now, and ignore the non-standard linux builds (as they slow it down a lot!)
-skip = "*win_arm64* *-musllinux_* *s390x* *ppc64le* *aarch64* *i686*"
+# skip musl and ignore the non-standard linux builds
+skip = "*-musllinux_* *s390x* *ppc64le*"
 build-frontend = "build"
 environment = "USE_CYTHON=1"
-build-verbosity = 3
-
-[tool.cibuildwheel.linux]
-# Install stuff for scipy:
-before-all = "apt-get -y install gfortran libopenblas-dev liblapack-dev || yum -y install blas-devel lapack-devel"
+build-verbosity = 3

src/qoi/benchmark.py

@@ -7,7 +7,6 @@
 from typing import List, OrderedDict
 
 import numpy as np
-from skimage.metrics import structural_similarity
 
 import qoi
 
@@ -17,7 +16,12 @@
 
     OPENCV_AVAILABLE = True
 except ImportError:
-    warnings.warn("Couldn't find OpenCV - you can still run this, but OpenCV tests will be disabled.")
+    warnings.warn(
+        (
+            "Couldn't find OpenCV - you can still run this, but OpenCV tests/functionality will be disabled, including"
+            " lossy qoi (which uses OpenCV to resize the image)"
+        )
+    )
 
 PIL_AVAILABLE = False
 try:
@@ -27,6 +31,18 @@
 except ImportError:
     warnings.warn("Couldn't find PIL - you can still run this, but PIL tests will be disabled.")
 
+try:
+    from skimage.metrics import structural_similarity as img_similarity
+
+    similarity_name = "SSIM"
+except ImportError:
+    warnings.warn("Couldn't find skimage.metrics.structural_similarity so using MSE.")
+
+    def img_similarity(a, b, channel_axis=None):
+        return ((a - b) ** 2).mean()
+
+    similarity_name = "MSE"
+
 
 @dataclass
 class TestResult:
@@ -37,7 +53,7 @@ class TestResult:
     encode_ms: float
     encode_size: float
     decode_ms: float
-    ssim: float
+    img_similarity: float
 
 
 def timeit(f, warmup=3, tests=10):
@@ -61,7 +77,7 @@ def bench_qoi(rgb, test_name, warmup=3, tests=10):
         encode_ms=encode_ms,
         encode_size=len(bites),
         decode_ms=decode_ms,
-        ssim=structural_similarity(rgb, decoded, channel_axis=2),
+        img_similarity=img_similarity(rgb, decoded, channel_axis=2),
     )
 
 
@@ -83,7 +99,7 @@ def decode():
         encode_ms=encode_ms,
         encode_size=len(bites),
         decode_ms=decode_ms,
-        ssim=structural_similarity(rgb, decoded, channel_axis=2),
+        img_similarity=img_similarity(rgb, decoded, channel_axis=2),
     )
 
 
@@ -124,7 +140,7 @@ def encode():
             encode_ms=encode_ms,
             encode_size=len(bites),
             decode_ms=decode_ms,
-            ssim=structural_similarity(rgb, decoded, channel_axis=2),
+            img_similarity=img_similarity(rgb, decoded, channel_axis=2),
         )
 
 
@@ -161,7 +177,7 @@ def encode():
             encode_ms=encode_ms,
             encode_size=len(bites),
             decode_ms=decode_ms,
-            ssim=structural_similarity(rgb, decoded, channel_axis=2),
+            img_similarity=img_similarity(rgb, decoded, channel_axis=2),
         )
 
 
@@ -185,7 +201,7 @@ def bench_methods(
         )
     if qoi and (implementations is None or "qoi" in implementations):
         yield from bench_qoi(rgb, test_name=name, warmup=warmup, tests=tests)
-    if qoi and (implementations is None or "qoi-lossy" in implementations):
+    if qoi and (implementations is None or "qoi-lossy" in implementations) and OPENCV_AVAILABLE:
         yield from bench_qoi_lossy(rgb, test_name=name, warmup=warmup, tests=tests, scale=qoi_lossy_scale)
 
 
@@ -202,7 +218,7 @@ def totable(results: List[TestResult]):
         encode_ms="Encode (ms)",
         encode_size="Encode (kb)",
         decode_ms="Decode (ms)",
-        ssim="SSIM",
+        img_similarity=similarity_name,
     )
 
     # Convert to dicts of strings
@@ -212,7 +228,7 @@ def totable(results: List[TestResult]):
         for k in fields(res):
             name = k.name
             v = getattr(res, name)
-            if name == "ssim" or name.endswith("_ms"):
+            if name == "img_similarity" or name.endswith("_ms"):
                 v = f"{v:.2f}"
             elif name.endswith("_size"):
                 v = f"{v/1024:.1f}"