From 4fc965b1d7da3645e3801b4b1bdcf806065c619b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Tue, 22 Jan 2019 08:05:36 +0100 Subject: [PATCH 1/8] Test against inducer/loopy!310 --- .test-conda-env-py3-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt index 45c20c1f..fb808cf7 100644 --- a/.test-conda-env-py3-requirements.txt +++ b/.test-conda-env-py3-requirements.txt @@ -1,3 +1,3 @@ git+https://gitlab.tiker.net/inducer/boxtree git+https://github.com/inducer/pymbolic -git+https://github.com/inducer/loopy +git+https://gitlab.tiker.net/inducer/loopy@revive-gitlab-mr-297 diff --git a/requirements.txt b/requirements.txt index 8e48bc1c..30f412ef 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ git+https://github.com/inducer/pymbolic git+https://github.com/inducer/islpy git+https://github.com/inducer/pyopencl git+https://gitlab.tiker.net/inducer/boxtree -git+https://github.com/inducer/loopy +git+https://gitlab.tiker.net/inducer/loopy@revive-gitlab-mr-297 git+https://github.com/inducer/pyfmmlib -- GitLab From 11e0f7fc007a3cb0357ea7ff1fdad4468355b817 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 22 Jan 2019 07:51:13 -0600 Subject: [PATCH 2/8] Don't use auto for temp_var_type --- sumpy/codegen.py | 2 +- sumpy/e2p.py | 2 +- sumpy/p2p.py | 2 +- sumpy/qbx.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sumpy/codegen.py b/sumpy/codegen.py index 948512df..61ed7301 100644 --- a/sumpy/codegen.py +++ b/sumpy/codegen.py @@ -705,7 +705,7 @@ def to_loopy_insns(assignments, vector_names=set(), pymbolic_expr_maps=[], result = [ lp.Assignment(id=None, assignee=name, expression=convert_expr(name, expr), - temp_var_type=lp.auto) + temp_var_type=lp.Optional(None)) for name, expr in assignments] logger.info("loopy instruction generation: done") diff --git a/sumpy/e2p.py b/sumpy/e2p.py index d0d05cbf..7b0072ad 100644 --- a/sumpy/e2p.py +++ b/sumpy/e2p.py @@ -119,7 +119,7 @@ class E2PBase(KernelCacheWrapper): assignee="kernel_scaling", expression=sympy_conv( self.expansion.kernel.get_global_scaling_const()), - temp_var_type=lp.auto)] + temp_var_type=lp.Optional(None))] def get_cache_key(self): return (type(self).__name__, self.expansion, tuple(self.kernels)) diff --git a/sumpy/p2p.py b/sumpy/p2p.py index 4c4eb945..e3b457dd 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -125,7 +125,7 @@ class P2PBase(KernelComputation, KernelCacheWrapper): return [lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, - temp_var_type=lp.auto) + temp_var_type=lp.Optional(None)) for i, expr in enumerate(exprs)] def get_default_src_tgt_arguments(self): diff --git a/sumpy/qbx.py b/sumpy/qbx.py index 0d4359b6..9708764c 100644 --- a/sumpy/qbx.py +++ b/sumpy/qbx.py @@ -143,7 +143,7 @@ class LayerPotentialBase(KernelComputation, KernelCacheWrapper): return [lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, - temp_var_type=lp.auto) + temp_var_type=lp.Optional(None)) for i, expr in enumerate(exprs)] def get_default_src_tgt_arguments(self): -- GitLab From 4bc2a79e769de4a6e54c943355f8f4a31c82fe2a Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 22 Jan 2019 08:20:34 -0600 Subject: [PATCH 3/8] Fix another temp_var_type issue --- sumpy/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sumpy/tools.py b/sumpy/tools.py index c826ef2f..863b4bb9 100644 --- a/sumpy/tools.py +++ b/sumpy/tools.py @@ -299,7 +299,7 @@ class KernelComputation(object): lp.Assignment(id=None, assignee="knl_%d_scaling" % i, expression=sympy_conv(kernel.get_global_scaling_const()), - temp_var_type=dtype) + temp_var_type=lp.Optional(dtype)) for i, (kernel, dtype) in enumerate( zip(self.kernels, self.value_dtypes))] -- GitLab From da0a6c31bde5d77108bc0217561979de3e0c17cb Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 22 Jan 2019 10:29:00 -0600 Subject: [PATCH 4/8] Revert "Don't use auto for temp_var_type" This reverts commit 11e0f7fc007a3cb0357ea7ff1fdad4468355b817. --- sumpy/codegen.py | 2 +- sumpy/e2p.py | 2 +- sumpy/p2p.py | 2 +- sumpy/qbx.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sumpy/codegen.py b/sumpy/codegen.py index 61ed7301..948512df 100644 --- a/sumpy/codegen.py +++ b/sumpy/codegen.py @@ -705,7 +705,7 @@ def to_loopy_insns(assignments, vector_names=set(), pymbolic_expr_maps=[], result = [ lp.Assignment(id=None, assignee=name, expression=convert_expr(name, expr), - temp_var_type=lp.Optional(None)) + temp_var_type=lp.auto) for name, expr in assignments] logger.info("loopy instruction generation: done") diff --git a/sumpy/e2p.py b/sumpy/e2p.py index 7b0072ad..d0d05cbf 100644 --- a/sumpy/e2p.py +++ b/sumpy/e2p.py @@ -119,7 +119,7 @@ class E2PBase(KernelCacheWrapper): assignee="kernel_scaling", expression=sympy_conv( self.expansion.kernel.get_global_scaling_const()), - temp_var_type=lp.Optional(None))] + temp_var_type=lp.auto)] def get_cache_key(self): return (type(self).__name__, self.expansion, tuple(self.kernels)) diff --git a/sumpy/p2p.py b/sumpy/p2p.py index e3b457dd..4c4eb945 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -125,7 +125,7 @@ class P2PBase(KernelComputation, KernelCacheWrapper): return [lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, - temp_var_type=lp.Optional(None)) + temp_var_type=lp.auto) for i, expr in enumerate(exprs)] def get_default_src_tgt_arguments(self): diff --git a/sumpy/qbx.py b/sumpy/qbx.py index 9708764c..0d4359b6 100644 --- a/sumpy/qbx.py +++ b/sumpy/qbx.py @@ -143,7 +143,7 @@ class LayerPotentialBase(KernelComputation, KernelCacheWrapper): return [lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, - temp_var_type=lp.Optional(None)) + temp_var_type=lp.auto) for i, expr in enumerate(exprs)] def get_default_src_tgt_arguments(self): -- GitLab From 2a8a250f525e9ff8f6a34cb6e99b17751c3e8076 Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Tue, 22 Jan 2019 10:29:07 -0600 Subject: [PATCH 5/8] Revert "Fix another temp_var_type issue" This reverts commit 4bc2a79e769de4a6e54c943355f8f4a31c82fe2a. --- sumpy/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sumpy/tools.py b/sumpy/tools.py index 863b4bb9..c826ef2f 100644 --- a/sumpy/tools.py +++ b/sumpy/tools.py @@ -299,7 +299,7 @@ class KernelComputation(object): lp.Assignment(id=None, assignee="knl_%d_scaling" % i, expression=sympy_conv(kernel.get_global_scaling_const()), - temp_var_type=lp.Optional(dtype)) + temp_var_type=dtype) for i, (kernel, dtype) in enumerate( zip(self.kernels, self.value_dtypes))] -- GitLab From b743b8d61b27b5169ffc84cca27a85cd7ad3136f Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 23 Jan 2019 14:38:47 -0600 Subject: [PATCH 6/8] Revert "Revert "Fix another temp_var_type issue"" This reverts commit 2a8a250f525e9ff8f6a34cb6e99b17751c3e8076. --- sumpy/tools.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sumpy/tools.py b/sumpy/tools.py index c826ef2f..863b4bb9 100644 --- a/sumpy/tools.py +++ b/sumpy/tools.py @@ -299,7 +299,7 @@ class KernelComputation(object): lp.Assignment(id=None, assignee="knl_%d_scaling" % i, expression=sympy_conv(kernel.get_global_scaling_const()), - temp_var_type=dtype) + temp_var_type=lp.Optional(dtype)) for i, (kernel, dtype) in enumerate( zip(self.kernels, self.value_dtypes))] -- GitLab From 7103f9301646118847d0e7503573a1622d0fe1fa Mon Sep 17 00:00:00 2001 From: Matt Wala Date: Wed, 23 Jan 2019 14:39:35 -0600 Subject: [PATCH 7/8] Revert "Revert "Don't use auto for temp_var_type"" This reverts commit da0a6c31bde5d77108bc0217561979de3e0c17cb. --- sumpy/codegen.py | 2 +- sumpy/e2p.py | 2 +- sumpy/p2p.py | 2 +- sumpy/qbx.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sumpy/codegen.py b/sumpy/codegen.py index 948512df..61ed7301 100644 --- a/sumpy/codegen.py +++ b/sumpy/codegen.py @@ -705,7 +705,7 @@ def to_loopy_insns(assignments, vector_names=set(), pymbolic_expr_maps=[], result = [ lp.Assignment(id=None, assignee=name, expression=convert_expr(name, expr), - temp_var_type=lp.auto) + temp_var_type=lp.Optional(None)) for name, expr in assignments] logger.info("loopy instruction generation: done") diff --git a/sumpy/e2p.py b/sumpy/e2p.py index d0d05cbf..7b0072ad 100644 --- a/sumpy/e2p.py +++ b/sumpy/e2p.py @@ -119,7 +119,7 @@ class E2PBase(KernelCacheWrapper): assignee="kernel_scaling", expression=sympy_conv( self.expansion.kernel.get_global_scaling_const()), - temp_var_type=lp.auto)] + temp_var_type=lp.Optional(None))] def get_cache_key(self): return (type(self).__name__, self.expansion, tuple(self.kernels)) diff --git a/sumpy/p2p.py b/sumpy/p2p.py index 4c4eb945..e3b457dd 100644 --- a/sumpy/p2p.py +++ b/sumpy/p2p.py @@ -125,7 +125,7 @@ class P2PBase(KernelComputation, KernelCacheWrapper): return [lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, - temp_var_type=lp.auto) + temp_var_type=lp.Optional(None)) for i, expr in enumerate(exprs)] def get_default_src_tgt_arguments(self): diff --git a/sumpy/qbx.py b/sumpy/qbx.py index 0d4359b6..9708764c 100644 --- a/sumpy/qbx.py +++ b/sumpy/qbx.py @@ -143,7 +143,7 @@ class LayerPotentialBase(KernelComputation, KernelCacheWrapper): return [lp.Assignment(id=None, assignee="pair_result_%d" % i, expression=expr, - temp_var_type=lp.auto) + temp_var_type=lp.Optional(None)) for i, expr in enumerate(exprs)] def get_default_src_tgt_arguments(self): -- GitLab From ce37a5c87a684e6898bf1d2611e09386ae4f40cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20Kl=C3=B6ckner?= Date: Fri, 25 Jan 2019 17:26:41 +0100 Subject: [PATCH 8/8] Point CI back to loopy master --- .test-conda-env-py3-requirements.txt | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.test-conda-env-py3-requirements.txt b/.test-conda-env-py3-requirements.txt index fb808cf7..45c20c1f 100644 --- a/.test-conda-env-py3-requirements.txt +++ b/.test-conda-env-py3-requirements.txt @@ -1,3 +1,3 @@ git+https://gitlab.tiker.net/inducer/boxtree git+https://github.com/inducer/pymbolic -git+https://gitlab.tiker.net/inducer/loopy@revive-gitlab-mr-297 +git+https://github.com/inducer/loopy diff --git a/requirements.txt b/requirements.txt index 30f412ef..8e48bc1c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,5 +4,5 @@ git+https://github.com/inducer/pymbolic git+https://github.com/inducer/islpy git+https://github.com/inducer/pyopencl git+https://gitlab.tiker.net/inducer/boxtree -git+https://gitlab.tiker.net/inducer/loopy@revive-gitlab-mr-297 +git+https://github.com/inducer/loopy git+https://github.com/inducer/pyfmmlib -- GitLab