Bump numcodecs-qpet-sperr to v0.2.0 with support for flexible QoI block sizes (#34)

* Bump numcodecs-qpet-sperr to v0.2.0 with support for flexible QoI block sizes

* Bump wac-graph to v0.8.1

Author: juntyr

Cargo.toml

@@ -65,7 +65,7 @@ numcodecs-jpeg2000 = { version = "0.3", path = "codecs/jpeg2000", default-featur
 numcodecs-linear-quantize = { version = "0.5", path = "codecs/linear-quantize", default-features = false }
 numcodecs-log = { version = "0.5", path = "codecs/log", default-features = false }
 numcodecs-pco = { version = "0.3", path = "codecs/pco", default-features = false }
-numcodecs-qpet-sperr = { version = "0.1", path = "codecs/qpet-sperr", default-features = false }
+numcodecs-qpet-sperr = { version = "0.2", path = "codecs/qpet-sperr", default-features = false }
 numcodecs-random-projection = { version = "0.4", path = "codecs/random-projection", default-features = false }
 numcodecs-reinterpret = { version = "0.4", path = "codecs/reinterpret", default-features = false }
 numcodecs-round = { version = "0.5", path = "codecs/round", default-features = false }
@@ -103,7 +103,7 @@ pyo3 = { version = "0.26", default-features = false }
 pyo3-error = { version = "0.6", default-features = false }
 pyo3-log = { version = "0.13.0", default-features = false }
 pythonize = { version = "0.26", default-features = false }
-qpet-sperr = { version = "0.1", default-features = false }
+qpet-sperr = { version = "0.2", default-features = false }
 rand = { version = "0.9.1", default-features = false }
 schemars = { version = "1.0.3", default-features = false }
 scratch = { version = "1.0", default-features = false }
@@ -119,7 +119,7 @@ thiserror = { version = "2.0.12", default-features = false }
 tthresh = { version = "0.1", default-features = false }
 twofloat = { version = "0.8", default-features = false }
 vecmap-rs = { version = "0.2", default-features = false }
-wac-graph = { version = "0.8", default-features = false }
+wac-graph = { version = "0.8.1", default-features = false }
 wasi-sandboxed-component-provider = { version = "=0.2.6", default-features = false }
 wasi-logger = { version = "0.1", default-features = false }
 wasi-preview1-component-adapter-provider = { version = "37.0", default-features = false }

codecs/qpet-sperr/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "numcodecs-qpet-sperr"
-version = "0.1.0"
+version = "0.2.0"
 edition = { workspace = true }
 authors = { workspace = true }
 repository = { workspace = true }

codecs/qpet-sperr/src/lib.rs

@@ -26,11 +26,7 @@ use ::zstd_sys as _;
 #[cfg(test)]
 use ::serde_json as _;
 
-use std::{
-    borrow::Cow,
-    fmt,
-    num::{NonZeroU16, NonZeroUsize},
-};
+use std::{borrow::Cow, fmt, num::NonZeroUsize};
 
 use ndarray::{Array, Array1, ArrayBase, Axis, Data, Dimension, IxDyn, ShapeError};
 use num_traits::{Float, identities::Zero};
@@ -42,7 +38,7 @@ use schemars::{JsonSchema, Schema, SchemaGenerator, json_schema};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use thiserror::Error;
 
-type QpetSperrCodecVersion = StaticCodecVersion<0, 1, 0>;
+type QpetSperrCodecVersion = StaticCodecVersion<0, 2, 0>;
 
 #[derive(Clone, Serialize, Deserialize, JsonSchema)]
 // serde cannot deny unknown fields because of the flatten
@@ -72,14 +68,14 @@ pub enum QpetSperrCompressionMode {
     SymbolicQuantityOfInterest {
         /// quantity of interest expression
         qoi: String,
-        /// block size over which the quantity of interest errors are averaged,
-        /// 1 for pointwise
+        /// 3D block size (z,y,x) over which the quantity of interest errors
+        /// are averaged, 1x1x1 for pointwise
         #[serde(default = "default_qoi_block_size")]
-        qoi_block_size: NonZeroU16,
+        qoi_block_size: (NonZeroUsize, NonZeroUsize, NonZeroUsize),
         /// positive (pointwise) absolute error bound over the quantity of
         /// interest
         qoi_pwe: Positive<f64>,
-        /// 3D size of the chunks (z, y, x) that SPERR uses internally
+        /// 3D size of the chunks (z,y,x) that SPERR uses internally
         #[serde(default = "default_sperr_chunks")]
         sperr_chunks: (NonZeroUsize, NonZeroUsize, NonZeroUsize),
         /// optional positive pointwise absolute error bound over the data
@@ -94,10 +90,10 @@ pub enum QpetSperrCompressionMode {
     },
 }
 
-const fn default_qoi_block_size() -> NonZeroU16 {
-    const NON_ZERO_ONE: NonZeroU16 = NonZeroU16::MIN;
+const fn default_qoi_block_size() -> (NonZeroUsize, NonZeroUsize, NonZeroUsize) {
+    const NON_ZERO_ONE: NonZeroUsize = NonZeroUsize::MIN;
     // 1: pointwise
-    NON_ZERO_ONE
+    (NON_ZERO_ONE, NON_ZERO_ONE, NON_ZERO_ONE)
 }
 
 const fn default_sperr_chunks() -> (NonZeroUsize, NonZeroUsize, NonZeroUsize) {

codecs/qpet-sperr/tests/schema.json

@@ -10,12 +10,32 @@
           "description": "quantity of interest expression"
         },
         "qoi_block_size": {
-          "type": "integer",
-          "format": "uint16",
-          "minimum": 1,
-          "maximum": 65535,
-          "description": "block size over which the quantity of interest errors are averaged,\n1 for pointwise",
-          "default": 1
+          "type": "array",
+          "prefixItems": [
+            {
+              "type": "integer",
+              "format": "uint",
+              "minimum": 1
+            },
+            {
+              "type": "integer",
+              "format": "uint",
+              "minimum": 1
+            },
+            {
+              "type": "integer",
+              "format": "uint",
+              "minimum": 1
+            }
+          ],
+          "minItems": 3,
+          "maxItems": 3,
+          "description": "3D block size (z,y,x) over which the quantity of interest errors\nare averaged, 1x1x1 for pointwise",
+          "default": [
+            1,
+            1,
+            1
+          ]
         },
         "qoi_pwe": {
           "type": "number",
@@ -43,7 +63,7 @@
           ],
           "minItems": 3,
           "maxItems": 3,
-          "description": "3D size of the chunks (z, y, x) that SPERR uses internally",
+          "description": "3D size of the chunks (z,y,x) that SPERR uses internally",
           "default": [
             256,
             256,
@@ -89,7 +109,7 @@
       "type": "string",
       "pattern": "^(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-((?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+([0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$",
       "description": "The codec's encoding format version. Do not provide this parameter explicitly.",
-      "default": "0.1.0"
+      "default": "0.2.0"
     }
   },
   "title": "QpetSperrCodec",