Skip to content

Commit 8960662

Browse files
isurufinducer
authored andcommitted
refactor loopy methods
1 parent effa57d commit 8960662

File tree

5 files changed

+16
-16
lines changed

5 files changed

+16
-16
lines changed

sumpy/e2e.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ def get_kernel(self, result_dtype):
562562
self.tgt_expansion, self.src_expansion)
563563

564564
translation_classes_data_knl = \
565-
m2l_translation.translation_classes_dependent_data_loopy_knl(
565+
m2l_translation.loopy_translation_classes_dependent_data(
566566
self.tgt_expansion, self.src_expansion, result_dtype)
567567

568568
from sumpy.tools import gather_loopy_arguments
@@ -671,7 +671,7 @@ def default_name(self):
671671
@memoize_method
672672
def get_inner_knl_and_optimizations(self, result_dtype):
673673
m2l_translation = self.tgt_expansion.m2l_translation
674-
return m2l_translation.preprocess_multipole_loopy_knl(
674+
return m2l_translation.loopy_preprocess_multipole(
675675
self.tgt_expansion, self.src_expansion, result_dtype)
676676

677677
def get_kernel(self, result_dtype):
@@ -761,7 +761,7 @@ def default_name(self):
761761
@memoize_method
762762
def get_inner_knl_and_optimizations(self, result_dtype):
763763
m2l_translation = self.tgt_expansion.m2l_translation
764-
return m2l_translation.postprocess_local_loopy_knl(
764+
return m2l_translation.loopy_postprocess_local(
765765
self.tgt_expansion, self.src_expansion, result_dtype)
766766

767767
def get_kernel(self, result_dtype):

sumpy/e2p.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def get_cache_key(self):
8686

8787
def add_loopy_eval_callable(
8888
self, loopy_knl: lp.TranslationUnit) -> lp.TranslationUnit:
89-
inner_knl = self.expansion.get_loopy_evaluator(self.kernels)
89+
inner_knl = self.expansion.loopy_evaluator(self.kernels)
9090
loopy_knl = lp.merge([loopy_knl, inner_knl])
9191
loopy_knl = lp.inline_callable_kernel(loopy_knl, "e2p")
9292
loopy_knl = lp.remove_unused_inames(loopy_knl)

sumpy/expansion/__init__.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ class ExpansionBase(ABC):
6666
.. automethod:: get_coefficient_identifiers
6767
.. automethod:: coefficients_from_source
6868
.. automethod:: coefficients_from_source_vec
69-
.. automethod:: get_loopy_expansion_formation
69+
.. automethod:: loopy_expansion_formation
7070
.. automethod:: evaluate
71-
.. automethod:: get_loopy_evaluator
71+
.. automethod:: loopy_evaluator
7272
7373
.. automethod:: with_kernel
7474
.. automethod:: copy
@@ -164,7 +164,7 @@ def coefficients_from_source_vec(self,
164164
result[i] += weight * coeffs[i]
165165
return result
166166

167-
def get_loopy_expansion_formation(
167+
def loopy_expansion_formation(
168168
self, kernels: Sequence[Kernel],
169169
strength_usage: Sequence[int], nstrengths: int) -> lp.TranslationUnit:
170170
"""
@@ -183,7 +183,7 @@ def evaluate(self, kernel, coeffs, bvec, rscale, sac=None):
183183
in *coeffs*.
184184
"""
185185

186-
def get_loopy_evaluator(self, kernels: Sequence[Kernel]) -> lp.TranslationUnit:
186+
def loopy_evaluator(self, kernels: Sequence[Kernel]) -> lp.TranslationUnit:
187187
"""
188188
:returns: a :mod:`loopy` kernel that returns the evaluated
189189
target transforms of the potential given by *kernels*.

sumpy/expansion/m2l.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,13 +183,13 @@ def translation_classes_dependent_ndata(self, tgt_expansion, src_expansion):
183183
"""
184184
return 0
185185

186-
def translation_classes_dependent_data_loopy_knl(self, tgt_expansion,
186+
def loopy_translation_classes_dependent_data(self, tgt_expansion,
187187
src_expansion, result_dtype):
188188
"""Return a :mod:`loopy` kernel that calculates the data described by
189189
:func:`~sumpy.expansion.m2l.M2LTranslationBase.translation_classes_dependent_data`.
190190
:arg result_dtype: The :mod:`numpy` type of the result.
191191
"""
192-
return translation_classes_dependent_data_loopy_knl(tgt_expansion,
192+
return loopy_translation_classes_dependent_data(tgt_expansion,
193193
src_expansion, result_dtype)
194194

195195
@abstractmethod
@@ -437,7 +437,7 @@ def preprocess_multipole_nexprs(self, tgt_expansion, src_expansion):
437437
src_expansion)
438438
return len(circulant_matrix_mis)
439439

440-
def preprocess_multipole_loopy_knl(self, tgt_expansion, src_expansion,
440+
def loopy_preprocess_multipole(self, tgt_expansion, src_expansion,
441441
result_dtype):
442442

443443
circulant_matrix_mis, _, max_mi = \
@@ -553,7 +553,7 @@ def postprocess_local_nexprs(self, tgt_expansion, src_expansion):
553553
return self.translation_classes_dependent_ndata(
554554
tgt_expansion, src_expansion)
555555

556-
def postprocess_local_loopy_knl(self, tgt_expansion, src_expansion,
556+
def loopy_postprocess_local(self, tgt_expansion, src_expansion,
557557
result_dtype):
558558
circulant_matrix_mis, needed_vector_terms, _ = \
559559
self._translation_classes_dependent_data_mis(tgt_expansion,
@@ -1020,9 +1020,9 @@ def postprocess_local_exprs(self, tgt_expansion, src_expansion,
10201020
# }}} FourierBesselM2LWithFFT
10211021

10221022

1023-
# {{{ translation_classes_dependent_data_loopy_knl
1023+
# {{{ loopy_translation_classes_dependent_data
10241024

1025-
def translation_classes_dependent_data_loopy_knl(tgt_expansion, src_expansion,
1025+
def loopy_translation_classes_dependent_data(tgt_expansion, src_expansion,
10261026
result_dtype):
10271027
"""
10281028
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,
10861086

10871087
return knl
10881088

1089-
# }}} translation_classes_dependent_data_loopy_knl
1089+
# }}} loopy_translation_classes_dependent_data
10901090

10911091
# vim: fdm=marker

sumpy/p2e.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ def __init__(self, ctx, expansion, kernels=None,
8888

8989
def add_loopy_form_callable(
9090
self, loopy_knl: lp.TranslationUnit) -> lp.TranslationUnit:
91-
inner_knl = self.expansion.get_loopy_expansion_formation(
91+
inner_knl = self.expansion.loopy_expansion_formation(
9292
self.source_kernels, self.strength_usage, self.strength_count)
9393
loopy_knl = lp.merge([loopy_knl, inner_knl])
9494
loopy_knl = lp.inline_callable_kernel(loopy_knl, "p2e")

0 commit comments

Comments
 (0)