From 91f258417b39f828a7bd0f5b3cf7a7ab52a286bb Mon Sep 17 00:00:00 2001
From: Bogdan Enache <enache2@illinois.edu>
Date: Fri, 8 Dec 2017 13:54:26 -0600
Subject: [PATCH] Removed some dead code, make things cleaner, re-added a
operator cache
---
grudge/execution.py | 27 +++++++++------------------
grudge/symbolic/operators.py | 6 ++++--
2 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/grudge/execution.py b/grudge/execution.py
index 3fd47c3c..e128d741 100644
--- a/grudge/execution.py
+++ b/grudge/execution.py
@@ -213,21 +213,19 @@ class ExecutionMapper(mappers.Evaluator,
queue=self.queue,
dtype=field.dtype, allocator=self.bound_op.allocator)
- for i in range(len(out_discr.groups)):
- in_grp = in_discr.groups[i]
- out_grp = out_discr.groups[i]
- # FIXME: This cache thing
- #cache_key = "elwise_linear", grp, op, field.dtype
- #try:
- #matrix = self.bound_op.operator_data_cache[cache_key]
- #except KeyError:
- matrix = (
+ for in_grp, out_grp in zip(in_discr.groups, out_discr.groups):
+
+ cache_key = "elwise_linear", in_grp, out_grp, op, field.dtype
+ try:
+ matrix = self.bound_op.operator_data_cache[cache_key]
+ except KeyError:
+ matrix = (
cl.array.to_device(
self.queue,
np.asarray(op.matrix(out_grp, in_grp), dtype=field.dtype))
.with_queue(None))
- #self.bound_op.operator_data_cache[cache_key] = matrix
+ self.bound_op.operator_data_cache[cache_key] = matrix
knl()(self.queue, mat=matrix, result=out_grp.view(result),
vec=in_grp.view(field))
@@ -249,9 +247,6 @@ class ExecutionMapper(mappers.Evaluator,
return conn(self.queue, self.rec(field_expr)).with_queue(self.queue)
def map_opposite_interior_face_swap(self, op, field_expr):
- #if op.dd_in.quadrature_tag is not sym.QTAG_NONE:
- #raise ValueError("face swap unavailable on quadrature meshes")
-
return self.discrwb.opposite_face_connection()(
self.queue, self.rec(field_expr)).with_queue(self.queue)
@@ -363,8 +358,6 @@ class ExecutionMapper(mappers.Evaluator,
# This should be unified with map_elementwise_linear, which should
# be extended to support batching.
- # FIXME: Enable
- # assert repr_op.dd_in == repr_op.dd_out
assert repr_op.dd_in.domain_tag == repr_op.dd_out.domain_tag
@memoize_in(self.discrwb, "reference_derivative_knl")
@@ -394,9 +387,7 @@ class ExecutionMapper(mappers.Evaluator,
dtype=field.dtype, extra_dims=(noperators,),
allocator=self.bound_op.allocator)
- for i in range(len(out_discr.groups)):
- in_grp = in_discr.groups[i]
- out_grp = out_discr.groups[i]
+ for in_grp, out_grp in zip(in_discr.groups, out_discr.groups):
if in_grp.nelements == 0:
continue
diff --git a/grudge/symbolic/operators.py b/grudge/symbolic/operators.py
index eece5cbf..0d579a32 100644
--- a/grudge/symbolic/operators.py
+++ b/grudge/symbolic/operators.py
@@ -149,10 +149,12 @@ class DiffOperatorBase(Operator):
def __init__(self, xyz_axis, dd_in=None, dd_out=None):
if dd_in is None:
dd_in = _sym().DD_VOLUME
+
if dd_out is None:
dd_out = dd_in.with_qtag(_sym().QTAG_NONE)
- if dd_out == "vol": # FIXME I'm pretty sure doing it this way is wrong
- dd_out = _sym().DD_VOLUME
+ else:
+ dd_out = _sym().as_dofdesc(dd_out)
+
if dd_out.uses_quadrature():
raise ValueError("differentiation outputs are not on "
"quadrature grids")
--
GitLab