diff --git a/sumpy/e2e.py b/sumpy/e2e.py index 724903fd587e45a03a65f5bbd750b85b20615bba..12e80b5f5d79781ab7ff78bcad8954e3e6ef3271 100644 --- a/sumpy/e2e.py +++ b/sumpy/e2e.py @@ -196,7 +196,7 @@ class E2EFromCSR(E2EBase): """] + [""" tgt_expansions[tgt_ibox - tgt_base_ibox, {coeffidx}] = \ simul_reduce(sum, isrc_box, coeff{coeffidx}) \ - {{id_prefix=write_expn,nosync=write_expn*}} + {{id_prefix=write_expn}} """.format(coeffidx=i) for i in range(ncoeff_tgt)] + [""" end """], @@ -220,7 +220,8 @@ class E2EFromCSR(E2EBase): silenced_warnings="write_race(write_expn*)", default_offset=lp.auto, fixed_parameters=dict(dim=self.dim), - lang_version=MOST_RECENT_LANGUAGE_VERSION) + lang_version=MOST_RECENT_LANGUAGE_VERSION + ) for expn in [self.src_expansion, self.tgt_expansion]: loopy_knl = expn.prepare_loopy_kernel(loopy_knl) @@ -314,7 +315,7 @@ class E2EFromChildren(E2EBase): tgt_expansions[tgt_ibox - tgt_base_ibox, {i}] \ + coeff{i} \ {{id_prefix=write_expn,dep=compute_coeff*, - nosync=read_coeff*:write_expn*}} + nosync=read_coeff*}} """.format(i=i) for i in range(ncoeffs)] + [""" end end @@ -422,7 +423,7 @@ class E2EFromParent(E2EBase): tgt_expansions[tgt_ibox - tgt_base_ibox, {i}] = \ tgt_expansions[tgt_ibox - tgt_base_ibox, {i}] + coeff{i} \ - {{id_prefix=write_expn,nosync=read_expn*:write_expn*}} + {{id_prefix=write_expn,nosync=read_expn*}} """.format(i=i) for i in range(ncoeffs)] + [""" end """], diff --git a/sumpy/p2e.py b/sumpy/p2e.py index ba60c38cac3d20b9cb438c5c4272bfcef7e50358..e9037a3f55396d57103a06970de3a1418adf00f3 100644 --- a/sumpy/p2e.py +++ b/sumpy/p2e.py @@ -137,7 +137,7 @@ class P2EFromSingleBox(P2EBase): """] + [""" tgt_expansions[src_ibox-tgt_base_ibox, {coeffidx}] = \ simul_reduce(sum, isrc, strength*coeff{coeffidx}) \ - {{id_prefix=write_expn,nosync=write_expn*}} + {{id_prefix=write_expn}} """.format(coeffidx=i) for i in range(ncoeffs)] + [""" end """], @@ -256,7 +256,7 @@ class P2EFromCSR(P2EBase): tgt_expansions[tgt_ibox - tgt_base_ibox, {coeffidx}] = \ simul_reduce(sum, (isrc_box, isrc), strength*coeff{coeffidx}) \ - {{id_prefix=write_expn,nosync=write_expn*}} + {{id_prefix=write_expn}} """.format(coeffidx=i) for i in range(ncoeffs)] + [""" end """], diff --git a/sumpy/version.py b/sumpy/version.py index 178a9771bc2f20ad06b4679f3076d5a03b3dd782..98f05a2db719067b04cb7b36457b24c84b4ddddf 100644 --- a/sumpy/version.py +++ b/sumpy/version.py @@ -25,4 +25,8 @@ VERSION = (2016, 1) VERSION_STATUS = "beta1" VERSION_TEXT = ".".join(str(x) for x in VERSION) + VERSION_STATUS -KERNEL_VERSION = 26 +# When developing on a branch, set the first element of this tuple to your +# branch name, so as to avoid conflicts with the master branch. Make sure +# to reset this to the next number up with "master" before merging into +# master. +KERNEL_VERSION = ("master", 28)