Remove dead code, disable halo logic and remove deprecated bits

Halo code is still wrong as DG advection is losing mass in parallel, but
it is at least running.

Author: connorjward

pyop3/array/harray.py

@@ -28,7 +28,7 @@
     as_axis_tree,
 )
 from pyop3.axtree.layout import eval_offset
-from pyop3.axtree.tree import Indexed, IndexedAxisTree, MultiArrayCollector
+from pyop3.axtree.tree import IndexedAxisTree, MultiArrayCollector
 from pyop3.buffer import Buffer, DistributedBuffer
 from pyop3.dtypes import IntType, ScalarType
 from pyop3.lang import KernelArgument, ReplaceAssignment
@@ -74,12 +74,6 @@ def __init__(self, array, indices, path=None):
     def __getinitargs__(self):
         return (self.array, self.indices, self.path)
 
-    # def __str__(self) -> str:
-    #     return f"{self.array.name}[{{{', '.join(f'{i[0]}: {i[1]}' for i in self.indices.items())}}}]"
-    #
-    # def __repr__(self) -> str:
-    #     return f"MultiArrayVariable({self.array!r}, {self.indices!r})"
-
 
 from pymbolic.mapper.stringifier import PREC_CALL, PREC_NONE, StringifyMapper
 
@@ -101,29 +95,11 @@ def stringify_array(self, array, enclosing_prec, *args, **kwargs):
 CalledMapVariable = ArrayVar
 
 
-# does not belong here!
-# class CalledMapVariable(ArrayVar):
-#     mapper_method = sys.intern("map_called_map_variable")
-#
-#     def __init__(self, array, path, input_index_exprs, shape_index_exprs):
-#         super().__init__(array, {**input_index_exprs, **shape_index_exprs}, path)
-#         self.input_index_exprs = freeze(input_index_exprs)
-#         self.shape_index_exprs = freeze(shape_index_exprs)
-#
-#     def __getinitargs__(self):
-#         return (
-#             self.array,
-#             self.target_path,
-#             self.input_index_exprs,
-#             self.shape_index_exprs,
-#         )
-
-
 class FancyIndexWriteException(Exception):
     pass
 
 
-class HierarchicalArray(Array, Indexed, ContextFree, KernelArgument):
+class HierarchicalArray(Array, ContextFree, KernelArgument):
     """Multi-dimensional, hierarchical array.
 
     Parameters
@@ -189,35 +165,6 @@ def __init__(
         # TODO This attr really belongs to the buffer not the array
         self.constant = constant
 
-        # if some_but_not_all(x is None for x in [target_paths, index_exprs]):
-        #     raise ValueError
-
-        # if target_paths is None:
-        #     target_paths = axes._default_target_paths()
-        # if index_exprs is None:
-        #     index_exprs = axes._default_index_exprs()
-        #
-        # self._target_paths = freeze(target_paths)
-        # self._index_exprs = freeze(index_exprs)
-        # self._outer_loops = outer_loops or ()
-        #
-        # self._layouts = layouts if layouts is not None else axes.layouts
-
-    @property
-    @deprecated()
-    def target_paths(self):
-        return self.axes.target_paths
-
-    @property
-    @deprecated()
-    def index_exprs(self):
-        return self.axes.index_exprs
-
-    @property
-    @deprecated()
-    def layouts(self):
-        return self.axes.layouts
-
     def __str__(self):
         return self.name
 
@@ -253,14 +200,9 @@ def getitem(self, indices, *, strict=False):
     # to be iterable (which it's not). This avoids some confusing behaviour.
     __iter__ = None
 
-    @property
-    @deprecated("buffer")
-    def array(self):
-        return self.buffer
-
     @property
     def dtype(self):
-        return self.array.dtype
+        return self.buffer.dtype
 
     @property
     def kernel_dtype(self):
@@ -425,7 +367,7 @@ def outer_loops(self):
 
     @property
     def sf(self):
-        return self.array.sf
+        return self.buffer.sf
 
     @property
     def comm(self):
@@ -436,11 +378,13 @@ def datamap(self):
         datamap_ = {}
         datamap_.update(self.buffer.datamap)
         datamap_.update(self.axes.datamap)
-        for index_exprs in self.index_exprs.values():
+
+        # FIXME, deleting this breaks stuff...
+        for index_exprs in self.axes.index_exprs.values():
             for expr in index_exprs.values():
                 for array in MultiArrayCollector()(expr):
                     datamap_.update(array.datamap)
-        for layout_expr in self.layouts.values():
+        for layout_expr in self.axes.layouts.values():
             for array in MultiArrayCollector()(layout_expr):
                 datamap_.update(array.datamap)
         return freeze(datamap_)
@@ -457,9 +401,9 @@ def assemble(self, update_leaves=False):
 
         """
         if update_leaves:
-            self.array._reduce_then_broadcast()
+            self.buffer._reduce_then_broadcast()
         else:
-            self.array._reduce_leaves_to_roots()
+            self.buffer._reduce_leaves_to_roots()
 
     def materialize(self) -> HierarchicalArray:
         """Return a new "unindexed" array with the same shape."""
@@ -491,7 +435,7 @@ def _with_axes(self, axes):
         assert False, "do not use, it's wrong"
         return type(self)(
             axes,
-            data=self.array,
+            data=self.buffer,
             max_value=self.max_value,
             name=self.name,
         )
@@ -518,7 +462,7 @@ def from_list(cls, data, axis_labels, name=None, dtype=ScalarType, inc=0):
         if isinstance(count, Sequence):
             count = cls.from_list(count, axis_labels[:-1], name, dtype, inc + 1)
             subaxis = Axis(count, axis_labels[-1])
-            axes = count.axes.add_subaxis(subaxis, count.axes.leaf)
+            axes = count.axes.add_axis(subaxis, count.axes.leaf)
         else:
             axes = AxisTree(Axis(count, axis_labels[-1]))
 
@@ -547,15 +491,6 @@ def set_value(self, indices, value, path=None, *, loop_exprs=pmap()):
         offset = self.axes.offset(indices, path, loop_exprs=loop_exprs)
         self.buffer.data_wo[offset] = value
 
-    # def offset(self, indices, path=None, *, loop_exprs=pmap()):
-    #     return eval_offset(
-    #         self.axes,
-    #         self.subst_layouts,
-    #         indices,
-    #         path,
-    #         loop_exprs=loop_exprs,
-    #     )
-
     def select_axes(self, indices):
         selected = []
         current_axis = self.axes
@@ -657,10 +592,6 @@ def __getitem__(self, indices) -> ContextSensitiveMultiArray:
         #
         # return ContextSensitiveMultiArray(array_per_context)
 
-    @property
-    def array(self):
-        return self._shared_attr("array")
-
     @property
     def buffer(self):
         return self._shared_attr("buffer")

pyop3/array/petsc.py

@@ -342,7 +342,7 @@ def maps(self):
                     ].items()
                     if ax == cfield_axis.label
                 )
-                orig_caxes = AxisTree(self.orig_caxes[cfield].parent_to_children)
+                orig_caxes = AxisTree(self.orig_caxes[cfield].node_map)
                 orig_caxess = [orig_caxes]
                 dropped_ckeys = {cfield_axis.label}
             else: