diff --git a/sumpy/e2e.py b/sumpy/e2e.py index 20d8b3111b0509c2451423ab3e1820e6cb154686..2c309200f0ec83b40688802ba113798503d613d1 100644 --- a/sumpy/e2e.py +++ b/sumpy/e2e.py @@ -27,8 +27,9 @@ from six.moves import range import numpy as np import loopy as lp -from loopy.version import MOST_RECENT_LANGUAGE_VERSION # noqa import sumpy.symbolic as sym + +from loopy.version import MOST_RECENT_LANGUAGE_VERSION from sumpy.tools import KernelCacheWrapper import logging @@ -218,7 +219,8 @@ class E2EFromCSR(E2EBase): assumptions="ntgt_boxes>=1", silenced_warnings="write_race(write_expn*)", default_offset=lp.auto, - fixed_parameters=dict(dim=self.dim)) + fixed_parameters=dict(dim=self.dim), + lang_version=MOST_RECENT_LANGUAGE_VERSION) for expn in [self.src_expansion, self.tgt_expansion]: loopy_knl = expn.prepare_loopy_kernel(loopy_knl) @@ -337,7 +339,8 @@ class E2EFromChildren(E2EBase): name=self.name, assumptions="ntgt_boxes>=1", silenced_warnings="write_race(write_expn*)", - fixed_parameters=dict(dim=self.dim, nchildren=2**self.dim)) + fixed_parameters=dict(dim=self.dim, nchildren=2**self.dim), + lang_version=MOST_RECENT_LANGUAGE_VERSION) for expn in [self.src_expansion, self.tgt_expansion]: loopy_knl = expn.prepare_loopy_kernel(loopy_knl) @@ -440,7 +443,8 @@ class E2EFromParent(E2EBase): ] + gather_loopy_arguments([self.src_expansion, self.tgt_expansion]), name=self.name, assumptions="ntgt_boxes>=1", silenced_warnings="write_race(write_expn*)", - fixed_parameters=dict(dim=self.dim, nchildren=2**self.dim)) + fixed_parameters=dict(dim=self.dim, nchildren=2**self.dim), + lang_version=MOST_RECENT_LANGUAGE_VERSION) for expn in [self.src_expansion, self.tgt_expansion]: loopy_knl = expn.prepare_loopy_kernel(loopy_knl) diff --git a/sumpy/e2p.py b/sumpy/e2p.py index 87ddbc2a3b4d40b41f40bc0a0f4cfad5551be124..d0d05cbf8c45e8d9f1c4552f784950bdfcab4bfb 100644 --- a/sumpy/e2p.py +++ b/sumpy/e2p.py @@ -27,9 +27,10 @@ from six.moves import range import numpy as np import loopy as lp -from loopy.version import MOST_RECENT_LANGUAGE_VERSION # noqa import sumpy.symbolic as sym + from sumpy.tools import KernelCacheWrapper +from loopy.version import MOST_RECENT_LANGUAGE_VERSION __doc__ = """ @@ -188,7 +189,8 @@ class E2PFromSingleBox(E2PBase): assumptions="ntgt_boxes>=1", silenced_warnings="write_race(write_result*)", default_offset=lp.auto, - fixed_parameters=dict(dim=self.dim, nresults=len(result_names))) + fixed_parameters=dict(dim=self.dim, nresults=len(result_names)), + lang_version=MOST_RECENT_LANGUAGE_VERSION) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") loopy_knl = self.expansion.prepare_loopy_kernel(loopy_knl) @@ -295,7 +297,8 @@ class E2PFromCSR(E2PBase): default_offset=lp.auto, fixed_parameters=dict( dim=self.dim, - nresults=len(result_names))) + nresults=len(result_names)), + lang_version=MOST_RECENT_LANGUAGE_VERSION) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr") loopy_knl = lp.prioritize_loops(loopy_knl, "itgt_box,itgt,isrc_box") diff --git a/sumpy/p2e.py b/sumpy/p2e.py index f3ea1c7292b03246d55b3387279b595ae76cf813..1d2e63a2dc9852444f89e1a4df185654d507990b 100644 --- a/sumpy/p2e.py +++ b/sumpy/p2e.py @@ -27,7 +27,8 @@ from six.moves import range import numpy as np import loopy as lp -from loopy.version import MOST_RECENT_LANGUAGE_VERSION # noqa + +from loopy.version import MOST_RECENT_LANGUAGE_VERSION from sumpy.tools import KernelCacheWrapper import logging diff --git a/sumpy/qbx.py b/sumpy/qbx.py index 8b5d94d06b2ef16d551aa949a10e10c9f660183e..cde20ef235ee2cd7f5b7dfdf57e30be2d4d8c20c 100644 --- a/sumpy/qbx.py +++ b/sumpy/qbx.py @@ -27,7 +27,7 @@ import six from six.moves import range, zip import numpy as np import loopy as lp -from loopy.version import MOST_RECENT_LANGUAGE_VERSION # noqa +from loopy.version import MOST_RECENT_LANGUAGE_VERSION import sumpy.symbolic as sym from pytools import memoize_method from pymbolic import parse, var @@ -181,7 +181,8 @@ class LayerPotentialBase(KernelComputation, KernelCacheWrapper): assumptions="nsources>=1 and ntargets>=1", default_offset=lp.auto, silenced_warnings="write_race(write_lpot*)", - fixed_parameters=dict(dim=self.dim)) + fixed_parameters=dict(dim=self.dim), + lang_version=MOST_RECENT_LANGUAGE_VERSION) loopy_knl = lp.tag_inames(loopy_knl, "idim*:unr")