diff --git a/python/dune/codegen/sumfact/accumulation.py b/python/dune/codegen/sumfact/accumulation.py index eb44e3cb0967e932d07d3fb98b5480882d58b262..20f646b525fcdaf9c8c85ee2d298493d47f096c4 100644 --- a/python/dune/codegen/sumfact/accumulation.py +++ b/python/dune/codegen/sumfact/accumulation.py @@ -173,7 +173,7 @@ class AccumulationOutput(SumfactKernelInterfaceBase, ImmutableRecord): return prim.Subscript(prim.Variable(inp), inames + vec_iname) - def setup_output(self, sf, result, insn_dep, inames=None, additional_inames=()): + def accumulate_output(self, sf, result, insn_dep, inames=None, additional_inames=()): trial_leaf_element = get_leaf(self.trial_element, self.trial_element_index) if self.trial_element is not None else None basis_size = tuple(mat.basis_size for mat in sf.matrix_sequence_quadrature_permuted) @@ -566,4 +566,4 @@ def generate_accumulation_instruction(expr, visitor): result, insn_dep = realize_sum_factorization_kernel(vsf.copy(insn_dep=vsf.insn_dep.union(insn_dep))) if not get_form_option("fastdg"): - insn_dep = vsf.interface.setup_output(vsf, result, insn_dep) + insn_dep = vsf.interface.accumulate_output(vsf, result, insn_dep) diff --git a/python/dune/codegen/sumfact/symbolic.py b/python/dune/codegen/sumfact/symbolic.py index 8c7052add83dcfb5ba4ff4840b8ad57e11c94a72..53926d16cdfb4ceff1365da6066fc426ff09815d 100644 --- a/python/dune/codegen/sumfact/symbolic.py +++ b/python/dune/codegen/sumfact/symbolic.py @@ -65,7 +65,7 @@ class SumfactKernelInterfaceBase(object): """ raise NotImplementedError - def setup_output(self, sf, result, insn_dep, inames=None, additional_inames=()): + def accumulate_output(self, sf, result, insn_dep, inames=None, additional_inames=()): """Generate accumulate instruction after sumfact kernel function (non fastdg) This happens after the function call. @@ -111,6 +111,7 @@ class SumfactKernelInterfaceBase(object): TODO: Add note about permutation TODO: Document input arguments """ + raise NotImplementedError @property def quadrature_permutation(self): @@ -368,7 +369,7 @@ class VectorSumfactKernelOutput(SumfactKernelInterfaceBase): return deps - def setup_output(self, sf, result, insn_dep): + def accumulate_output(self, sf, result, insn_dep): # TODO: vector_cost_permutation not used! outputs = set(self.interfaces) @@ -385,7 +386,7 @@ class VectorSumfactKernelOutput(SumfactKernelInterfaceBase): deps = frozenset() for o in outputs: hadd_result = self._add_hadd(o, maybe_wrap_subscript(result, tuple(prim.Variable(iname) for iname in inames + (veciname,)))) - deps = deps.union(o.setup_output(sf, hadd_result, insn_dep, inames=inames, additional_inames=(veciname,))) + deps = deps.union(o.accumulate_output(sf, hadd_result, insn_dep, inames=inames, additional_inames=(veciname,))) return deps