Use latest miniexpr and _global_linear_idx -> _flat_idx

Author: FrancescAlted

CMakeLists.txt

@@ -63,7 +63,7 @@ endif()
 
 FetchContent_Declare(miniexpr
     GIT_REPOSITORY https://github.com/Blosc/miniexpr.git
-    GIT_TAG af37741a3344604e21d5572e9b216117d0db8768
+    GIT_TAG 320240a849e185c84114501200052bfeb8d66f2b
     # SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../miniexpr
 )
 FetchContent_MakeAvailable(miniexpr)

bench/ndarray/linear-constructor.py

@@ -17,7 +17,7 @@
 
 @blosc2.dsl_kernel
 def kernel_ramp(start):
-    return start + _global_linear_idx  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
+    return start + _flat_idx  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
 
 t0 = time()
 npa = np.arange(np.prod(shape), dtype=dtype).reshape(shape)

bench/ndarray/sum-linear-idx.py

@@ -6,7 +6,7 @@
 #######################################################################
 
 # Compare reduction performance on DSL kernels.
-# This uses the special _global_linear_idx var.
+# This uses the special _flat_idx var.
 
 from time import time
 import numpy as np
@@ -19,7 +19,7 @@
 @blosc2.dsl_kernel
 def kernel_ramp():
     # return _i0 * _n1 + _i1  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
-    return _global_linear_idx  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
+    return _flat_idx  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
 
 print(kernel_ramp.dsl_source)
 a = blosc2.lazyudf(kernel_ramp, (), dtype=dtype, shape=shape)

src/blosc2/dsl_kernel.py

@@ -191,7 +191,7 @@ def _numeric_literal_value(node):
             and isinstance(node.operand.value, int | float | bool)
         ):
             value = node.operand.value
-            return +value if isinstance(node.op, ast.UAdd) else -value
+            return value if isinstance(node.op, ast.UAdd) else -value
         return None
 
     for node in ast.walk(tree):

src/blosc2/ndarray.py

@@ -5408,7 +5408,7 @@ def arange_fill(inputs, output, offset):
 
     @blosc2.dsl_kernel
     def kernel_ramp(start, step):
-        return start + _global_linear_idx * step  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
+        return start + _flat_idx * step  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
 
     if step is None:  # not array-api compliant but for backwards compatibility
         step = 1
@@ -5513,7 +5513,7 @@ def linspace_fill(inputs, output, offset):
 
     @blosc2.dsl_kernel
     def kernel_ramp(start, step):
-        return float(start) + _global_linear_idx * float(step)  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
+        return float(start) + _flat_idx * float(step)  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
 
     if shape is None:
         if num is None:

tests/ndarray/test_dsl_kernels.py

@@ -122,13 +122,13 @@ def kernel_scalar_start_step(start, step):
 @blosc2.dsl_kernel
 def kernel_scalar_start_stop_nitems(start, stop, nitems):
     step = (stop - start) / nitems
-    return start + _global_linear_idx * step  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
+    return start + _flat_idx * step  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
 
 
 @blosc2.dsl_kernel
 def kernel_scalar_start_stop_nitems_float_cast(start, stop, nitems):
     step = (float(stop) - float(start)) / float(nitems)
-    return float(start) + _global_linear_idx * step  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
+    return float(start) + _flat_idx * step  # noqa: F821  # DSL index/shape symbols resolved by miniexpr
 
 
 @blosc2.dsl_kernel
@@ -591,7 +591,7 @@ def test_dsl_kernel_float_cast_with_negative_scalar_param():
     np.testing.assert_allclose(res[...], expected, rtol=1e-6, atol=1e-6)
 
 
-def test_dsl_kernel_float_cast_with_global_linear_idx_no_segfault_subprocess():
+def test_dsl_kernel_float_cast_with_flat_idx_no_segfault_subprocess():
     if blosc2.IS_WASM:
         pytest.skip("subprocess is not supported on emscripten/wasm32")
 
@@ -603,7 +603,7 @@ def test_dsl_kernel_float_cast_with_global_linear_idx_no_segfault_subprocess():
         @blosc2.dsl_kernel
         def kernel(start, stop, nitems):
             step = (float(stop) - float(start)) / float(nitems)
-            return float(start) + _global_linear_idx * step  # noqa: F821
+            return float(start) + _flat_idx * step  # noqa: F821
 
         shape = (10, 100)
         arr = blosc2.lazyudf(kernel, (-10, 10, 999), dtype=np.float32, shape=shape).compute()