Merge pull request #278 from omaech/updating-examples

Update of the Initialization of CParams, DParams, and Storage in Blosc2
Blosc · Oct 10, 2024 · 3da7003 · 3da7003
2 parents a4493f4 + c71f8c6
commit 3da7003
Show file tree

Hide file tree

Showing 29 changed files with 623 additions and 655 deletions.
diff --git a/bench/get_slice.py b/bench/get_slice.py
@@ -22,8 +22,8 @@
 
 nchunks = shape // chunksize
 # Set the compression and decompression parameters
-cparams = {"codec": blosc2.Codec.BLOSCLZ, "typesize": 8, "blocksize": blocksize * 8}
-dparams = {}
+cparams = blosc2.CParams(codec=blosc2.Codec.BLOSCLZ, typesize=8, blocksize=blocksize * 8)
+dparams = blosc2.DParams()
 contiguous = True
 persistent = bool(sys.argv[1]) if len(sys.argv) > 1 else False
 
@@ -32,11 +32,11 @@
 else:
     urlpath = None
 
-storage = {"contiguous": contiguous, "urlpath": urlpath, "cparams": cparams, "dparams": dparams}
+storage = blosc2.Storage(contiguous=contiguous, urlpath=urlpath)
 blosc2.remove_urlpath(urlpath)
 
 # Create the empty SChunk
-schunk = blosc2.SChunk(chunksize=chunksize * cparams["typesize"], **storage)
+schunk = blosc2.SChunk(chunksize=chunksize * cparams.typesize, storage=storage, cparams=cparams, dparams=dparams)
 
 # Append some chunks
 for i in range(nchunks):

diff --git a/bench/ndarray/compare_getslice.py b/bench/ndarray/compare_getslice.py
@@ -62,14 +62,14 @@
 cname = "zstd"
 nthreads = 8
 filter = blosc2.Filter.SHUFFLE
-cparams = {
-    "codec": blosc2.Codec.ZSTD,
-    "clevel": clevel,
-    "filters": [filter],
-    "filters_meta": [0],
-    "nthreads": nthreads,
-}
-dparams = {"nthreads": nthreads}
+cparams = blosc2.CParams(
+    codec=blosc2.Codec.ZSTD,
+    clevel=clevel,
+    filters=[filter],
+    filters_meta=[0],
+    nthreads=nthreads,
+)
+dparams = blosc2.DParams(nthreads=nthreads)
 
 zfilter = numcodecs.Blosc.SHUFFLE
 blocksize = int(np.prod(blocks)) if blocks else 0

diff --git a/bench/ndarray/copy_postfilter.py b/bench/ndarray/copy_postfilter.py
@@ -18,11 +18,12 @@
 dtype = np.dtype(np.int32)
 
 # Set the compression and decompression parameters
-dparams = {"nthreads": 1}
+dparams = {"nthreads" : 1}
 
 # Create array
 arr = blosc2.empty(shape=(nchunks * chunkshape,), chunks=(chunkshape,), dtype=dtype, dparams=dparams)
 data = np.arange(chunkshape, dtype=dtype)
+
 t0 = time()
 for i in range(nchunks):
     arr[i * chunkshape : (i + 1) * chunkshape] = data

diff --git a/bench/ndarray/transcode_data.py b/bench/ndarray/transcode_data.py
@@ -69,9 +69,9 @@
     },
 }
 
-dparams = {
-    "nthreads": nthreads_decomp,
-}
+dparams = blosc2.DParams(
+    nthreads=nthreads_decomp,
+)
 
 dir_path = Path(dir_path)
 if not dir_path.is_dir():

diff --git a/bench/set_slice.py b/bench/set_slice.py
@@ -22,8 +22,8 @@
 
 nchunks = shape // chunksize
 # Set the compression and decompression parameters
-cparams = {"codec": blosc2.Codec.BLOSCLZ, "typesize": 8, "blocksize": blocksize * 8}
-dparams = {}
+cparams = blosc2.CParams(codec=blosc2.Codec.BLOSCLZ, typesize=8, blocksize=blocksize * 8)
+dparams = blosc2.DParams()
 contiguous = True
 persistent = bool(sys.argv[1]) if len(sys.argv) > 1 else False
 
@@ -32,11 +32,11 @@
 else:
     urlpath = None
 
-storage = {"contiguous": contiguous, "urlpath": urlpath, "cparams": cparams, "dparams": dparams}
+storage = blosc2.Storage(contiguous=contiguous, urlpath=urlpath)
 blosc2.remove_urlpath(urlpath)
 
 # Create the empty SChunk
-schunk = blosc2.SChunk(chunksize=chunksize * cparams["typesize"], **storage)
+schunk = blosc2.SChunk(chunksize=chunksize * cparams.typesize, storage=storage, cparams=cparams, dparams=dparams)
 
 # Append some chunks
 for i in range(nchunks):

diff --git a/bench/sum_postfilter.py b/bench/sum_postfilter.py
@@ -19,13 +19,12 @@
 chunksize = chunkshape * dtype.itemsize
 
 # Set the compression and decompression parameters
-cparams = {"typesize": 4, "nthreads": 1}
-dparams = {"nthreads": 1}
-storage = {"cparams": cparams, "dparams": dparams}
+cparams = blosc2.CParams(typesize=4, nthreads=1)
+dparams = blosc2.DParams(nthreads=1)
 
 # Create super-chunks
-schunk0 = blosc2.SChunk(chunksize=chunksize, **storage)
-schunk = blosc2.SChunk(chunksize=chunksize, **storage)
+schunk0 = blosc2.SChunk(chunksize=chunksize, cparams=cparams, dparams=dparams)
+schunk = blosc2.SChunk(chunksize=chunksize, cparams=cparams, dparams=dparams)
 
 data = np.arange(chunkshape, dtype=dtype)
 t0 = time()