remove expr_eval

Author: Emma Ai

odc/stats/_algebra.py

@@ -5,51 +5,7 @@
 import dask.array as da
 import xarray as xr
 import numpy as np
-import numexpr as ne
-import functools
 from dask.base import tokenize
-from typing import Any, Dict, Optional
-from odc.algo._dask import flatten_kv, unflatten_kv
-
-
-def apply_numexpr_np(
-    expr: str,
-    data: Optional[Dict[str, Any]] = None,
-    dtype=None,
-    casting="safe",
-    order="K",
-    **params,
-) -> np.ndarray:
-    """
-    Apply numexpr to numpy arrays
-    """
-
-    if data is None:
-        data = params
-    else:
-        data.update(params)
-
-    out = ne.evaluate(expr, local_dict=data, casting=casting, order=order)
-    if dtype is None:
-        return out
-    else:
-        return out.astype(dtype)
-
-
-def expr_eval(expr, data, dtype="float32", name="expr_eval", **kwargs):
-    tk = tokenize(apply_numexpr_np, *flatten_kv(data))
-    op = functools.partial(
-        apply_numexpr_np, expr, dtype=dtype, casting="unsafe", order="K", **kwargs
-    )
-
-    return da.map_blocks(
-        lambda op, *data: op(unflatten_kv(data)),
-        op,
-        *flatten_kv(data),
-        name=f"{name}_{tk}",
-        dtype=dtype,
-        meta=np.array((), dtype=dtype),
-    )
 
 
 def _median_by_ind(a):

odc/stats/plugins/lc_fc_wo_a0.py

@@ -16,7 +16,8 @@
     to_float,
     _nodata_fuser,
 )
-from odc.stats._algebra import expr_eval, median_ds
+from odc.stats._algebra import median_ds
+from odc.algo import expr_eval
 
 from ._registry import StatsPluginInterface, register
 

odc/stats/plugins/lc_level34.py

@@ -13,7 +13,7 @@
 
 from ._registry import StatsPluginInterface, register
 from ._utils import rasterize_vector_mask, generate_numexpr_expressions
-from odc.stats._algebra import expr_eval
+from odc.algo import expr_eval
 from osgeo import gdal
 
 NODATA = 255
@@ -28,6 +28,7 @@ class StatsLccsLevel4(StatsPluginInterface):
 
     def __init__(
         self,
+        *,
         class_def_path: str = None,
         class_condition: Dict[str, List] = None,
         urban_mask: str = None,

odc/stats/plugins/lc_ml_treelite.py

@@ -18,7 +18,7 @@
 from odc.algo._memsink import yxbt_sink, yxt_sink
 from odc.stats.io import load_with_native_transform
 
-from odc.stats._algebra import expr_eval
+from odc.algo import expr_eval
 from odc.stats.model import DateTimeRange
 from ._registry import StatsPluginInterface
 from ._worker import TreeliteModelPlugin

odc/stats/plugins/lc_tf_urban.py

@@ -16,7 +16,7 @@
 from odc.algo._memsink import yxbt_sink
 from odc.stats.io import load_with_native_transform
 
-from odc.stats._algebra import expr_eval
+from odc.algo import expr_eval
 from ._registry import StatsPluginInterface, register
 from ._worker import TensorFlowLiteModelPlugin
 

odc/stats/plugins/lc_treelite_cultivated.py

@@ -7,7 +7,7 @@
 import dask.array as da
 import numexpr as ne
 
-from odc.stats._algebra import expr_eval
+from odc.io import expr_eval
 from ._registry import register
 from .lc_ml_treelite import StatsMLTree, mask_and_predict
 
@@ -53,6 +53,7 @@ def feature_BSI(input_block, nbart_swir_1, nbart_red, nbart_nir, nbart_blue):
     ).astype("float32")
 
 
+# pylint: disable=too-many-positional-arguments
 def feature_TCW(
     input_block,
     nbart_blue,

odc/stats/plugins/lc_treelite_woody.py

@@ -5,7 +5,7 @@
 import xarray as xr
 import dask.array as da
 
-from odc.stats._algebra import expr_eval
+from odc.io import expr_eval
 from ._registry import register
 from .lc_ml_treelite import StatsMLTree, mask_and_predict
 

odc/stats/plugins/lc_veg_class_a1.py

@@ -6,7 +6,7 @@
 
 import numpy as np
 import xarray as xr
-from odc.stats._algebra import expr_eval
+from odc.algo import expr_eval
 
 from ._registry import StatsPluginInterface, register
 from ._utils import replace_nodata_with_mode
@@ -52,6 +52,7 @@ class StatsVegClassL1(StatsPluginInterface):
 
     def __init__(
         self,
+        *,
         output_classes: Dict,
         dem_threshold: Optional[int] = None,
         mudflat_threshold: Optional[int] = None,