diff --git a/sumpy/e2e.py b/sumpy/e2e.py index 7899c7b47b13aad99c26d8fe29c53418f31960c1..0a0726a07e968e37725751872ad73db70a41a827 100644 --- a/sumpy/e2e.py +++ b/sumpy/e2e.py @@ -562,7 +562,7 @@ class M2LGenerateTranslationClassesDependentData(E2EBase): self.tgt_expansion, self.src_expansion) translation_classes_data_knl = \ - m2l_translation.translation_classes_dependent_data_loopy_knl( + m2l_translation.loopy_translation_classes_dependent_data( self.tgt_expansion, self.src_expansion, result_dtype) from sumpy.tools import gather_loopy_arguments @@ -671,7 +671,7 @@ class M2LPreprocessMultipole(E2EBase): @memoize_method def get_inner_knl_and_optimizations(self, result_dtype): m2l_translation = self.tgt_expansion.m2l_translation - return m2l_translation.preprocess_multipole_loopy_knl( + return m2l_translation.loopy_preprocess_multipole( self.tgt_expansion, self.src_expansion, result_dtype) def get_kernel(self, result_dtype): @@ -761,7 +761,7 @@ class M2LPostprocessLocal(E2EBase): @memoize_method def get_inner_knl_and_optimizations(self, result_dtype): m2l_translation = self.tgt_expansion.m2l_translation - return m2l_translation.postprocess_local_loopy_knl( + return m2l_translation.loopy_postprocess_local( self.tgt_expansion, self.src_expansion, result_dtype) def get_kernel(self, result_dtype): diff --git a/sumpy/e2p.py b/sumpy/e2p.py index f304a3391c5d0c1e1a6fe0a1783b5910d33efc5c..eb9038dc5f14f00ea650bb0894055a1339046e5b 100644 --- a/sumpy/e2p.py +++ b/sumpy/e2p.py @@ -86,7 +86,7 @@ class E2PBase(KernelCacheMixin, ABC): def add_loopy_eval_callable( self, loopy_knl: lp.TranslationUnit) -> lp.TranslationUnit: - inner_knl = self.expansion.get_loopy_evaluator(self.kernels) + inner_knl = self.expansion.loopy_evaluator(self.kernels) loopy_knl = lp.merge([loopy_knl, inner_knl]) loopy_knl = lp.inline_callable_kernel(loopy_knl, "e2p") loopy_knl = lp.remove_unused_inames(loopy_knl) diff --git a/sumpy/expansion/__init__.py b/sumpy/expansion/__init__.py index c667ba998289ef5cb66164e6f97f312159d10811..a761d1be40da04d1a88143de203e2feb2289e3e8 100644 --- a/sumpy/expansion/__init__.py +++ b/sumpy/expansion/__init__.py @@ -66,9 +66,9 @@ class ExpansionBase(ABC): .. automethod:: get_coefficient_identifiers .. automethod:: coefficients_from_source .. automethod:: coefficients_from_source_vec - .. automethod:: get_loopy_expansion_formation + .. automethod:: loopy_expansion_formation .. automethod:: evaluate - .. automethod:: get_loopy_evaluator + .. automethod:: loopy_evaluator .. automethod:: with_kernel .. automethod:: copy @@ -164,7 +164,7 @@ class ExpansionBase(ABC): result[i] += weight * coeffs[i] return result - def get_loopy_expansion_formation( + def loopy_expansion_formation( self, kernels: Sequence[Kernel], strength_usage: Sequence[int], nstrengths: int) -> lp.TranslationUnit: """ @@ -183,7 +183,7 @@ class ExpansionBase(ABC): in *coeffs*. """ - def get_loopy_evaluator(self, kernels: Sequence[Kernel]) -> lp.TranslationUnit: + def loopy_evaluator(self, kernels: Sequence[Kernel]) -> lp.TranslationUnit: """ :returns: a :mod:`loopy` kernel that returns the evaluated target transforms of the potential given by *kernels*. diff --git a/sumpy/expansion/m2l.py b/sumpy/expansion/m2l.py index 376d57882674f3f20a202b6a035d89edb6dc30f8..9a75f8ea67408d06a6d808f79ba3463018f199e9 100644 --- a/sumpy/expansion/m2l.py +++ b/sumpy/expansion/m2l.py @@ -183,13 +183,13 @@ class M2LTranslationBase(ABC): """ return 0 - def translation_classes_dependent_data_loopy_knl(self, tgt_expansion, + def loopy_translation_classes_dependent_data(self, tgt_expansion, src_expansion, result_dtype): """Return a :mod:`loopy` kernel that calculates the data described by :func:`~sumpy.expansion.m2l.M2LTranslationBase.translation_classes_dependent_data`. :arg result_dtype: The :mod:`numpy` type of the result. """ - return translation_classes_dependent_data_loopy_knl(tgt_expansion, + return loopy_translation_classes_dependent_data(tgt_expansion, src_expansion, result_dtype) @abstractmethod @@ -437,7 +437,7 @@ class VolumeTaylorM2LTranslation(M2LTranslationBase): src_expansion) return len(circulant_matrix_mis) - def preprocess_multipole_loopy_knl(self, tgt_expansion, src_expansion, + def loopy_preprocess_multipole(self, tgt_expansion, src_expansion, result_dtype): circulant_matrix_mis, _, max_mi = \ @@ -553,7 +553,7 @@ class VolumeTaylorM2LTranslation(M2LTranslationBase): return self.translation_classes_dependent_ndata( tgt_expansion, src_expansion) - def postprocess_local_loopy_knl(self, tgt_expansion, src_expansion, + def loopy_postprocess_local(self, tgt_expansion, src_expansion, result_dtype): circulant_matrix_mis, needed_vector_terms, _ = \ self._translation_classes_dependent_data_mis(tgt_expansion, @@ -1020,9 +1020,9 @@ class FourierBesselM2LWithFFT(FourierBesselM2LWithPreprocessedMultipoles): # }}} FourierBesselM2LWithFFT -# {{{ translation_classes_dependent_data_loopy_knl +# {{{ loopy_translation_classes_dependent_data -def translation_classes_dependent_data_loopy_knl(tgt_expansion, src_expansion, +def loopy_translation_classes_dependent_data(tgt_expansion, src_expansion, result_dtype): """ This is a helper function to create a loopy kernel to generate translation @@ -1086,6 +1086,6 @@ def translation_classes_dependent_data_loopy_knl(tgt_expansion, src_expansion, return knl -# }}} translation_classes_dependent_data_loopy_knl +# }}} loopy_translation_classes_dependent_data # vim: fdm=marker diff --git a/sumpy/p2e.py b/sumpy/p2e.py index 8c25415ad514fb4ec3792f56b56579a4a3ea4566..7118bc2f49fccfa42d312cc96c00d8f360f09f83 100644 --- a/sumpy/p2e.py +++ b/sumpy/p2e.py @@ -88,7 +88,7 @@ class P2EBase(KernelCacheMixin, KernelComputation): def add_loopy_form_callable( self, loopy_knl: lp.TranslationUnit) -> lp.TranslationUnit: - inner_knl = self.expansion.get_loopy_expansion_formation( + inner_knl = self.expansion.loopy_expansion_formation( self.source_kernels, self.strength_usage, self.strength_count) loopy_knl = lp.merge([loopy_knl, inner_knl]) loopy_knl = lp.inline_callable_kernel(loopy_knl, "p2e")