Add temporary eager tag. Flag eager tag for removal

grudge/array_context.py

@@ -662,6 +662,8 @@ def clone(self):
 
 # {{{ tensor product-specific machinery
 
+# FIXME: This is not permanent, but is necessary for eager evaluation in the
+# current state of `actx.einsum`
 class OutputIsTensorProductDOFArrayOrdered(Tag):
     """Signify that the strides will not be of order "C" or "F".
 
@@ -675,7 +677,8 @@ class OutputIsTensorProductDOFArrayOrdered(Tag):
 
 class TensorProductDOFAxis(DiscretizationDOFAxisTag):
     """
-    TODO: Add doc
+    Signify that an axis contains DOF data and belongs to a tensor product
+    discretization.
     """
     pass
 

grudge/op.py

@@ -216,15 +216,17 @@ def compute_tensor_product_derivative(actx, grp, get_diff_mat, vec, ijm,
             for ax in apply_mass_axes:
                 vec_mass_applied = single_axis_operator_application(
                     actx, grp.dim, mass_1d, ax, vec,
-                    tags=(FirstAxisIsElementsTag(),),
+                    tags=(FirstAxisIsElementsTag(),
+                          OutputIsTensorProductDOFArrayOrdered(),),
                     arg_names=("mass_1d", "vec")
                 )
 
             ref_weak_derivative = unfold(
                 grp.space,
                 single_axis_operator_application(
                     actx, grp.dim, stiff_1d, xyz_axis, vec_mass_applied,
-                    tags=(FirstAxisIsElementsTag(),),
+                    tags=(FirstAxisIsElementsTag(),
+                          OutputIsTensorProductDOFArrayOrdered(),),
                     arg_names=("stiff_1d", "vec_with_mass_applied"))
             )
 
@@ -243,7 +245,8 @@ def compute_tensor_product_derivative(actx, grp, get_diff_mat, vec, ijm,
                 grp.space,
                 single_axis_operator_application(
                     actx, grp.dim, diff_mat, xyz_axis, vec,
-                    tags=(FirstAxisIsElementsTag(),),
+                    tags=(FirstAxisIsElementsTag(),
+                          OutputIsTensorProductDOFArrayOrdered(),),
                     arg_names=("diff_mat", "vec"))
             )
 
@@ -323,7 +326,8 @@ def compute_tensor_product_grad(actx, grp, diff_mat, vec, ijm,
                 for ax in apply_mass_axes:
                     grad[xyz_axis] = single_axis_operator_application(
                         actx, grp.dim, mass_1d, ax, grad[xyz_axis],
-                        tags=(FirstAxisIsElementsTag(),),
+                        tags=(FirstAxisIsElementsTag(),
+                              OutputIsTensorProductDOFArrayOrdered(),),
                         arg_names=("mass_1d", f"vec_{xyz_axis}")
                 )
 
@@ -346,7 +350,8 @@ def compute_tensor_product_grad(actx, grp, diff_mat, vec, ijm,
                     grp.space,
                     single_axis_operator_application(
                         actx, grp.dim, diff_mat, xyz_axis, grad[xyz_axis],
-                        tags=(FirstAxisIsElementsTag(),),
+                        tags=(FirstAxisIsElementsTag(),
+                              OutputIsTensorProductDOFArrayOrdered(),),
                         arg_names=("diff_mat", f"vec_{xyz_axis}")
                     )
                 )
@@ -431,13 +436,15 @@ def compute_tensor_product_div(actx, grp, diff_mat, vec, ijm):
                     for ax in apply_mass_axes:
                         ref[xyz_axis] = single_axis_operator_application(
                             actx, grp.dim, mass_1d, ax, ref[xyz_axis],
-                            tags=(FirstAxisIsElementsTag(),),
+                            tags=(FirstAxisIsElementsTag(),
+                                  OutputIsTensorProductDOFArrayOrdered(),),
                             arg_names=("mass_1d", f"vec_{func_axis}_{xyz_axis}")
                         )
 
                     ref[xyz_axis] = single_axis_operator_application(
                         actx, grp.dim, stiff_1d, xyz_axis, ref[xyz_axis],
-                        tags=(FirstAxisIsElementsTag(),),
+                        tags=(FirstAxisIsElementsTag(),
+                              OutputIsTensorProductDOFArrayOrdered(),),
                         arg_names=("stiff_1d", f"vec_{func_axis}_{xyz_axis}")
                     )
 
@@ -454,7 +461,8 @@ def compute_tensor_product_div(actx, grp, diff_mat, vec, ijm):
 
                     ref[xyz_axis] = single_axis_operator_application(
                         actx, grp.dim, diff_mat, xyz_axis, ref[xyz_axis],
-                        tags=(FirstAxisIsElementsTag(),),
+                        tags=(FirstAxisIsElementsTag(),
+                              OutputIsTensorProductDOFArrayOrdered(),),
                         arg_names=("diff_mat", f"vec_{func_axis}_{xyz_axis}")
                     )
 
@@ -476,6 +484,7 @@ def compute_tensor_product_div(actx, grp, diff_mat, vec, ijm):
         )
 
         return div
+
     # }}}