Merge pull request #416 from Blosc/fixLazyExpr

Fix lazyexpr o0 bug to pass test

Author: lshaw8317

src/blosc2/lazyexpr.py

@@ -719,11 +719,13 @@ def visit_Name(self, node):
                         opname,
                         v,
                     ) in localop.operands.items():  # expression operands already in terms of basic operands
-                        newopname = self.update_func(v)
+                        # add illegal character ; to track changed operands and not overwrite later
+                        newopname = ";" + self.update_func(v)
                         newexpr = re.sub(
                             rf"(?<=\s){opname}|(?<=\(){opname}", newopname, newexpr
                         )  # replace with newopname
-                    node.id = newexpr
+                    # remove all instances of ; as all changes completed
+                    node.id = newexpr.replace(";", "")
                 else:
                     node.id = self.update_func(localop)
             else:

tests/ndarray/test_reductions.py

@@ -468,3 +468,23 @@ def test_slicebrackets_lazy():
     arr = blosc2.lazyexpr("anarr[10, 1] + 1", {"anarr": a})
     newarr = arr[:]
     np.testing.assert_allclose(newarr, a[10, 1] + 1)
+
+
+def test_reduce_string():
+    shape = (10, 10, 2)
+
+    # Create a NDArray from a NumPy array
+    npa = np.linspace(0, 1, np.prod(shape), dtype=np.float32).reshape(shape)
+    npb = np.linspace(1, 2, np.prod(shape), dtype=np.float64).reshape(shape)
+    npc = npa**2 + npb**2 + 2 * npa * npb + 1
+
+    a = blosc2.asarray(npa)
+    b = blosc2.asarray(npb)
+
+    # Get a LazyExpr instance
+    c = a**2 + b**2 + 2 * a * b + 1
+    # Evaluate: output is a NDArray
+    d = blosc2.lazyexpr("sl + c.sum() + a.std()", operands={"a": a, "c": c, "sl": a.slice((1, 1))})
+    sum = d.compute()[()]
+    npsum = npa[1, 1] + np.sum(npc) + np.std(npa)
+    assert np.allclose(sum, npsum)