Merge branch 'main' into array-api

Author: lshaw8317

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@v5
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
         python-version: ${{ matrix.python-version }}
 

.github/workflows/cibuildwheels.yml

@@ -63,7 +63,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           # Use the most recent released python
           python-version: '3.x'

.github/workflows/wasm.yml

@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v6
         with:
           python-version: '3.x'
 

.pre-commit-config.yaml

@@ -7,7 +7,7 @@ ci:
 default_stages: [pre-commit, pre-push]
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer
@@ -16,7 +16,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.12.7
+    rev: v0.12.11
     hooks:
       - id: ruff-check
         args: ["--fix", "--show-fixes"]

bench/pack_tensor.py

@@ -49,7 +49,7 @@
     ctoc = time.time()
     tc = (ctoc - ctic) / NREP
     print(
-        f"  Time for tensorflow (tf.io.serialize):\t{tc:.3f} s ({(N * 8 / tc) / 2**30:.2f} GB/s)) ",
+        f"  Time for tensorflow (tf.io.serialize):\t{tc:.3f} s ({(N * 4 / tc) / 2**30:.2f} GB/s)) ",
         end="",
     )
     print(f"\tcr: {in_.size * in_.dtype.itemsize * 1.0 / len(c):5.1f}x")
@@ -66,7 +66,7 @@
     ctoc = time.time()
     tc = (ctoc - ctic) / NREP
     print(
-        f"  Time for torch (torch.save):\t\t\t{tc:.3f} s ({(N * 8 / tc) / 2**30:.2f} GB/s)) ",
+        f"  Time for torch (torch.save):\t\t\t{tc:.3f} s ({(N * 4 / tc) / 2**30:.2f} GB/s)) ",
         end="",
     )
     buff.seek(0)
@@ -87,7 +87,7 @@
     ctoc = time.time()
     tc = (ctoc - ctic) / NREP
     print(
-        f"  Time for tensorflow (blosc2.pack_tensor):\t{tc:.3f} s ({(N * 8 / tc) / 2**30:.2f} GB/s)) ",
+        f"  Time for tensorflow (blosc2.pack_tensor):\t{tc:.3f} s ({(N * 4 / tc) / 2**30:.2f} GB/s)) ",
         end="",
     )
     print(f"\tcr: {in_.size * in_.dtype.itemsize * 1.0 / len(c):5.1f}x")
@@ -103,7 +103,7 @@
     ctoc = time.time()
     tc = (ctoc - ctic) / NREP
     print(
-        f"  Time for torch (blosc2.pack_tensor):\t\t{tc:.3f} s ({(N * 8 / tc) / 2**30:.2f} GB/s)) ",
+        f"  Time for torch (blosc2.pack_tensor):\t\t{tc:.3f} s ({(N * 4 / tc) / 2**30:.2f} GB/s)) ",
         end="",
     )
     print(f"\tcr: {in_.size * in_.dtype.itemsize * 1.0 / len(c):5.1f}x")
@@ -122,7 +122,7 @@
     dtoc = time.time()
     td = (dtoc - dtic) / NREP
     print(
-        f"  Time for tensorflow (tf.io.parse_tensor):\t{td:.3f} s ({(N * 8 / td) / 2**30:.2f} GB/s)) ",
+        f"  Time for tensorflow (tf.io.parse_tensor):\t{td:.3f} s ({(N * 4 / td) / 2**30:.2f} GB/s)) ",
     )
 
     with open("serialize_torch.bin", "rb") as f:
@@ -136,7 +136,7 @@
     dtoc = time.time()
     td = (dtoc - dtic) / NREP
     print(
-        f"  Time for torch (torch.load):\t\t\t{td:.3f} s ({(N * 8 / td) / 2**30:.2f} GB/s)) ",
+        f"  Time for torch (torch.load):\t\t\t{td:.3f} s ({(N * 4 / td) / 2**30:.2f} GB/s)) ",
     )
 
     with open("pack_tensorflow.bl2", "rb") as f:
@@ -149,7 +149,7 @@
     dtoc = time.time()
     td = (dtoc - dtic) / NREP
     print(
-        f"  Time for tensorflow (blosc2.unpack_tensor):\t{td:.3f} s ({(N * 8 / td) / 2**30:.2f} GB/s)) ",
+        f"  Time for tensorflow (blosc2.unpack_tensor):\t{td:.3f} s ({(N * 4 / td) / 2**30:.2f} GB/s)) ",
     )
     assert np.array_equal(in_, out)
 
@@ -165,6 +165,6 @@
 
     td = (dtoc - dtic) / NREP
     print(
-        f"  Time for torch (blosc2.unpack_tensor):\t{td:.3f} s ({(N * 8 / td) / 2**30:.2f} GB/s)) ",
+        f"  Time for torch (blosc2.unpack_tensor):\t{td:.3f} s ({(N * 4 / td) / 2**30:.2f} GB/s)) ",
     )
     assert np.array_equal(in_, out)

pyproject.toml

@@ -101,6 +101,8 @@ exclude = ["bench*", ".github*"]
 
 [tool.ruff]
 line-length = 109
+# Raise complexity from the default 10 to 13
+complexity = 13
 extend-exclude = ["bench"]
 
 [tool.ruff.lint]

src/blosc2/embed_store.py

@@ -31,7 +31,7 @@ class EmbedStore:
     Parameters
     ----------
     urlpath : str or None, optional
-        Path for persistent storage. Using a ' .b2e' extension is recommended.
+        Path for persistent storage. Using a '.b2e' extension is recommended.
         If None, the embed store will be in memory only, which can be
         deserialized later using the :func:`blosc2.from_cframe` function.
     mode : str, optional