Better function naming

datashader/antialias.py

@@ -2,11 +2,6 @@
 from enum import Enum
 from typing import NamedTuple, TYPE_CHECKING
 
-from datashader.utils import (
-    nanfirst_in_place, nanlast_in_place, nanmax_in_place,
-    nanmin_in_place, nansum_in_place, ngjit, parallel_fill)
-from numba import literal_unroll
-
 
 # Enum used to specify how the second stage aggregation is performed
 # for 2-stage antialiased lines.

datashader/compiler.py

@@ -79,7 +79,13 @@ def compile_components(agg, schema, glyph, *, antialias=False, cuda=False, parti
     ``antialias_stage_2``
         If using antialiased lines this is a tuple of the ``AntialiasCombination``
         values corresponding to the aggs. If not using antialiased lines then
-        this is False.
+        this is ``False``.
+
+    ``antialias_stage_2_funcs``
+        If using antialiased lines which require a second stage combine, this
+        is a tuple of the three combine functions which are the accumulate,
+        clear and copy_back functions. If not using antialiased lines then this
+        is ``None``.
 
     ``column_names``
         Names of DataFrame columns or DataArray variables that are used by the
@@ -103,11 +109,11 @@ def compile_components(agg, schema, glyph, *, antialias=False, cuda=False, parti
         else:
             array_module = np
         antialias_stage_2 = antialias_stage_2(array_module)
-        aa_3_funcs = make_aa(antialias_stage_2)
+        antialias_stage_2_funcs = make_antialias_stage_2_functions(antialias_stage_2)
     else:
         self_intersect = False
         antialias_stage_2 = False
-        aa_3_funcs = None  #None, None, None
+        antialias_stage_2_funcs = None
 
     # List of tuples of
     # (append, base, input columns, temps, combine temps, uses cuda mutex, is_categorical)
@@ -131,11 +137,15 @@ def compile_components(agg, schema, glyph, *, antialias=False, cuda=False, parti
 
     column_names = [c.column for c in cols if c.column != SpecialColumn.RowIndex]
 
-    return create, info, append, combine, finalize, antialias_stage_2, aa_3_funcs, column_names
+    return create, info, append, combine, finalize, antialias_stage_2, antialias_stage_2_funcs, column_names
 
 
-def _get_combine_func(combination: AntialiasCombination, zero: float, n_reduction: bool, categorical: bool):
-    if not n_reduction and not categorical:
+def _get_antialias_stage_2_combine_func(combination: AntialiasCombination, zero: float,
+                                        n_reduction: bool, categorical: bool):
+    if not n_reduction:
+        # The aggs to combine here are either 3D (ny, nx, ncat) if categorical is True or
+        # 2D (ny, nx) if categorical is False. The same combination functions can be for both
+        # as all elements are independent.
         if combination == AntialiasCombination.MAX:
             return nanmax_in_place
         elif combination == AntialiasCombination.MIN:
@@ -147,26 +157,14 @@ def _get_combine_func(combination: AntialiasCombination, zero: float, n_reductio
         else:
             return nansum_in_place
 
-    if not n_reduction and categorical:
-        if combination == AntialiasCombination.MAX:
-            raise NotImplementedError
-        elif combination == AntialiasCombination.MIN:
-            raise NotImplementedError
-        elif combination == AntialiasCombination.FIRST:
-            raise NotImplementedError
-        elif combination == AntialiasCombination.LAST:
-            raise NotImplementedError
-        else:
-            return nansum_in_place
-
     raise NotImplementedError
 
 
-def make_aa(antialias_stage_2):
+def make_antialias_stage_2_functions(antialias_stage_2):
     aa_combinations, aa_zeroes, aa_n_reductions, aa_categorical = antialias_stage_2
 
     # Accumulate functions.
-    funcs = [_get_combine_func(comb, zero, n_red, cat) for comb, zero, n_red, cat
+    funcs = [_get_antialias_stage_2_combine_func(comb, zero, n_red, cat) for comb, zero, n_red, cat
              in zip(aa_combinations, aa_zeroes, aa_n_reductions, aa_categorical)]
 
     namespace = {}

datashader/data_libraries/dask.py

@@ -71,11 +71,12 @@ def default(glyph, df, schema, canvas, summary, *, antialias=False, cuda=False):
 
     # Compile functions
     partitioned = isinstance(df, dd.DataFrame) and df.npartitions > 1
-    create, info, append, combine, finalize, antialias_stage_2, aa_3_funcs, column_names = compile_components(
-        summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=partitioned)
+    create, info, append, combine, finalize, antialias_stage_2, antialias_stage_2_funcs, column_names = \
+        compile_components(summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=partitioned)
     x_mapper = canvas.x_axis.mapper
     y_mapper = canvas.y_axis.mapper
-    extend = glyph._build_extend(x_mapper, y_mapper, info, append, antialias_stage_2, aa_3_funcs)
+    extend = glyph._build_extend(
+        x_mapper, y_mapper, info, append, antialias_stage_2, antialias_stage_2_funcs)
     x_range = bounds[:2]
     y_range = bounds[2:]
 
@@ -209,11 +210,12 @@ def line(glyph, df, schema, canvas, summary, *, antialias=False, cuda=False):
 
     # Compile functions
     partitioned = isinstance(df, dd.DataFrame) and df.npartitions > 1
-    create, info, append, combine, finalize, antialias_stage_2, aa_3_funcs, _ = compile_components(
-        summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=partitioned)
+    create, info, append, combine, finalize, antialias_stage_2, antialias_stage_2_funcs, _ = \
+        compile_components(summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=partitioned)
     x_mapper = canvas.x_axis.mapper
     y_mapper = canvas.y_axis.mapper
-    extend = glyph._build_extend(x_mapper, y_mapper, info, append, antialias_stage_2, aa_3_funcs)
+    extend = glyph._build_extend(
+        x_mapper, y_mapper, info, append, antialias_stage_2, antialias_stage_2_funcs)
     x_range = bounds[:2]
     y_range = bounds[2:]
 

datashader/data_libraries/dask_xarray.py

@@ -58,11 +58,12 @@ def dask_rectilinear(glyph, xr_ds, schema, canvas, summary, *, antialias=False,
     shape, bounds, st, axis = shape_bounds_st_and_axis(xr_ds, canvas, glyph)
 
     # Compile functions
-    create, info, append, combine, finalize, antialias_stage_2, aa_3_funcs, _ = compile_components(
-        summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=True)
+    create, info, append, combine, finalize, antialias_stage_2, antialias_stage_2_funcs, _ = \
+        compile_components(summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=True)
     x_mapper = canvas.x_axis.mapper
     y_mapper = canvas.y_axis.mapper
-    extend = glyph._build_extend(x_mapper, y_mapper, info, append, antialias_stage_2, aa_3_funcs)
+    extend = glyph._build_extend(
+        x_mapper, y_mapper, info, append, antialias_stage_2, antialias_stage_2_funcs)
     x_range = bounds[:2]
     y_range = bounds[2:]
 
@@ -140,11 +141,12 @@ def dask_raster(glyph, xr_ds, schema, canvas, summary, *, antialias=False, cuda=
     shape, bounds, st, axis = shape_bounds_st_and_axis(xr_ds, canvas, glyph)
 
     # Compile functions
-    create, info, append, combine, finalize, antialias_stage_2, aa_3_funcs, _ = compile_components(
-        summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=True)
+    create, info, append, combine, finalize, antialias_stage_2, antialias_stage_2_funcs, _ = \
+        compile_components(summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=True)
     x_mapper = canvas.x_axis.mapper
     y_mapper = canvas.y_axis.mapper
-    extend = glyph._build_extend(x_mapper, y_mapper, info, append, antialias_stage_2, aa_3_funcs)
+    extend = glyph._build_extend(
+        x_mapper, y_mapper, info, append, antialias_stage_2, antialias_stage_2_funcs)
     x_range = bounds[:2]
     y_range = bounds[2:]
 
@@ -234,11 +236,12 @@ def dask_curvilinear(glyph, xr_ds, schema, canvas, summary, *, antialias=False,
     shape, bounds, st, axis = shape_bounds_st_and_axis(xr_ds, canvas, glyph)
 
     # Compile functions
-    create, info, append, combine, finalize, antialias_stage_2, aa_3_funcs, _ = compile_components(
-        summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=True)
+    create, info, append, combine, finalize, antialias_stage_2, antialias_stage_2_funcs, _ = \
+        compile_components(summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=True)
     x_mapper = canvas.x_axis.mapper
     y_mapper = canvas.y_axis.mapper
-    extend = glyph._build_extend(x_mapper, y_mapper, info, append, antialias_stage_2, aa_3_funcs)
+    extend = glyph._build_extend(
+        x_mapper, y_mapper, info, append, antialias_stage_2, antialias_stage_2_funcs)
     x_range = bounds[:2]
     y_range = bounds[2:]
 

datashader/data_libraries/pandas.py

@@ -23,11 +23,12 @@ def pandas_pipeline(df, schema, canvas, glyph, summary, *, antialias=False):
 @glyph_dispatch.register(_GeometryLike)
 @glyph_dispatch.register(_AreaToLineLike)
 def default(glyph, source, schema, canvas, summary, *, antialias=False, cuda=False):
-    create, info, append, _, finalize, antialias_stage_2, aa_3_funcs, _ = compile_components(
-        summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=False)
+    create, info, append, _, finalize, antialias_stage_2, antialias_stage_2_funcs, _ = \
+        compile_components(summary, schema, glyph, antialias=antialias, cuda=cuda, partitioned=False)
     x_mapper = canvas.x_axis.mapper
     y_mapper = canvas.y_axis.mapper
-    extend = glyph._build_extend(x_mapper, y_mapper, info, append, antialias_stage_2, aa_3_funcs)
+    extend = glyph._build_extend(
+        x_mapper, y_mapper, info, append, antialias_stage_2, antialias_stage_2_funcs)
 
     x_range = canvas.x_range or glyph.compute_x_bounds(source)
     y_range = canvas.y_range or glyph.compute_y_bounds(source)

datashader/glyphs/area.py

@@ -98,7 +98,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -182,7 +182,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -274,7 +274,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -365,7 +365,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -472,7 +472,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -580,7 +580,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -649,7 +649,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -728,7 +728,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -797,7 +797,7 @@ def compute_bounds_dask(self, ddf):
                 self.compute_y_bounds())
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -865,7 +865,7 @@ def compute_bounds_dask(self, ddf):
                 self.compute_y_bounds())
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -950,7 +950,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(
@@ -1030,7 +1030,7 @@ def compute_bounds_dask(self, ddf):
                 self.maybe_expand_bounds(y_extents))
 
     @memoize
-    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _aa_3_funcs):
+    def _build_extend(self, x_mapper, y_mapper, info, append, _antialias_stage_2, _antialias_stage_2_funcs):
         expand_aggs_and_cols = self.expand_aggs_and_cols(append)
         map_onto_pixel = _build_map_onto_pixel_for_line(x_mapper, y_mapper)
         draw_trapezoid_y = _build_draw_trapezoid_y(