refactor: construct Kernel in one shot

Author: ksagiyam

tsfc/kernel_interface/firedrake.py

@@ -44,7 +44,9 @@ def __init__(self, ast=None, integral_type=None, oriented=False,
                  subdomain_id=None, domain_number=None,
                  coefficient_numbers=(),
                  needs_cell_sizes=False,
-                 flop_count=0):
+                 tabulations=None,
+                 flop_count=0,
+                 name=None):
         # Defaults
         self.ast = ast
         self.integral_type = integral_type
@@ -53,7 +55,9 @@ def __init__(self, ast=None, integral_type=None, oriented=False,
         self.subdomain_id = subdomain_id
         self.coefficient_numbers = coefficient_numbers
         self.needs_cell_sizes = needs_cell_sizes
+        self.tabulations = tabulations
         self.flop_count = flop_count
+        self.name = name
         super(Kernel, self).__init__()
 
 
@@ -123,13 +127,9 @@ def __init__(self, integral_data_info, scalar_type, fem_scalar_type,
                  dont_split=(), diagonal=False):
         """Initialise a kernel builder."""
         integral_type = integral_data_info.integral_type
-        subdomain_id = integral_data_info.subdomain_id
-        domain_number = integral_data_info.domain_number
         super(KernelBuilder, self).__init__(scalar_type, integral_type.startswith("interior_facet"))
         self.fem_scalar_type = fem_scalar_type
 
-        self.kernel = Kernel(integral_type=integral_type, subdomain_id=subdomain_id,
-                             domain_number=domain_number)
         self.diagonal = diagonal
         self.local_tensor = None
         self.coordinates_arg = None
@@ -213,7 +213,6 @@ def set_coefficients(self, integral_data, form_data):
         for i, coefficient in enumerate(coefficients):
             self.coefficient_args.append(
                 self._coefficient(coefficient, "w_%d" % i))
-        self.kernel.coefficient_numbers = tuple(self.integral_data_info.coefficient_numbers)
 
     def register_requirements(self, ir):
         """Inspect what is referenced by the IR that needs to be
@@ -233,36 +232,38 @@ def construct_kernel(self, name, ctx):
         impero_c, oriented, needs_cell_sizes, tabulations = self.compile_gem(ctx)
         if impero_c is None:
             return self.construct_empty_kernel(name)
-        self.kernel.oriented = oriented
-        self.kernel.needs_cell_sizes = needs_cell_sizes
-        self.kernel.tabulations = tabulations
-
-        index_names = get_index_names(ctx['quadrature_indices'], self.argument_multiindices, ctx['index_cache'])
-        body = generate_coffee(impero_c, index_names, self.scalar_type)
-
+        info = self.integral_data_info
         args = [self.local_tensor, self.coordinates_arg]
-        if self.kernel.oriented:
+        if oriented:
             args.append(cell_orientations_coffee_arg)
-        if self.kernel.needs_cell_sizes:
+        if needs_cell_sizes:
             args.append(self.cell_sizes_arg)
         args.extend(self.coefficient_args)
-        if self.kernel.integral_type in ["exterior_facet", "exterior_facet_vert"]:
+        if info.integral_type in ["exterior_facet", "exterior_facet_vert"]:
             args.append(coffee.Decl("unsigned int",
                                     coffee.Symbol("facet", rank=(1,)),
                                     qualifiers=["const"]))
-        elif self.kernel.integral_type in ["interior_facet", "interior_facet_vert"]:
+        elif info.integral_type in ["interior_facet", "interior_facet_vert"]:
             args.append(coffee.Decl("unsigned int",
                                     coffee.Symbol("facet", rank=(2,)),
                                     qualifiers=["const"]))
-
-        for name_, shape in self.kernel.tabulations:
+        for name_, shape in tabulations:
             args.append(coffee.Decl(self.scalar_type, coffee.Symbol(
                 name_, rank=shape), qualifiers=["const"]))
-
-        self.kernel.name = name
-        self.kernel.ast = KernelBuilderBase.construct_kernel(self, name, args, body)
-        self.kernel.flop_count = count_flops(impero_c)
-        return self.kernel
+        index_names = get_index_names(ctx['quadrature_indices'], self.argument_multiindices, ctx['index_cache'])
+        body = generate_coffee(impero_c, index_names, self.scalar_type)
+        ast = KernelBuilderBase.construct_kernel(self, name, args, body)
+        flop_count = count_flops(impero_c)  # Estimated total flops for this kernel.
+        return Kernel(ast=ast,
+                      integral_type=info.integral_type,
+                      subdomain_id=info.subdomain_id,
+                      domain_number=info.domain_number,
+                      coefficient_numbers=info.coefficient_numbers,
+                      oriented=oriented,
+                      needs_cell_sizes=needs_cell_sizes,
+                      tabulations=tabulations,
+                      flop_count=flop_count,
+                      name=name)
 
     def construct_empty_kernel(self, name):
         """Return None, since Firedrake needs no empty kernels.

tsfc/kernel_interface/firedrake_loopy.py

@@ -52,7 +52,9 @@ def __init__(self, ast=None, integral_type=None, oriented=False,
                  subdomain_id=None, domain_number=None,
                  coefficient_numbers=(),
                  needs_cell_sizes=False,
-                 flop_count=0):
+                 tabulations=None,
+                 flop_count=0,
+                 name=None):
         # Defaults
         self.ast = ast
         self.integral_type = integral_type
@@ -61,7 +63,9 @@ def __init__(self, ast=None, integral_type=None, oriented=False,
         self.subdomain_id = subdomain_id
         self.coefficient_numbers = coefficient_numbers
         self.needs_cell_sizes = needs_cell_sizes
+        self.tabulations = tabulations
         self.flop_count = flop_count
+        self.name = name
         super(Kernel, self).__init__()
 
 
@@ -199,13 +203,9 @@ def __init__(self, integral_data_info, scalar_type, fem_scalar_type,
                  dont_split=(), diagonal=False):
         """Initialise a kernel builder."""
         integral_type = integral_data_info.integral_type
-        subdomain_id = integral_data_info.subdomain_id
-        domain_number = integral_data_info.domain_number
         super(KernelBuilder, self).__init__(scalar_type, integral_type.startswith("interior_facet"))
         self.fem_scalar_type = fem_scalar_type
 
-        self.kernel = Kernel(integral_type=integral_type, subdomain_id=subdomain_id,
-                             domain_number=domain_number)
         self.diagonal = diagonal
         self.local_tensor = None
         self.coordinates_arg = None
@@ -289,7 +289,6 @@ def set_coefficients(self, integral_data, form_data):
         for i, coefficient in enumerate(coefficients):
             self.coefficient_args.append(
                 self._coefficient(coefficient, "w_%d" % i))
-        self.kernel.coefficient_numbers = tuple(self.integral_data_info.coefficient_numbers)
 
     def register_requirements(self, ir):
         """Inspect what is referenced by the IR that needs to be
@@ -309,29 +308,32 @@ def construct_kernel(self, name, ctx):
         impero_c, oriented, needs_cell_sizes, tabulations = self.compile_gem(ctx)
         if impero_c is None:
             return self.construct_empty_kernel(name)
-        self.kernel.oriented = oriented
-        self.kernel.needs_cell_sizes = needs_cell_sizes
-        self.kernel.tabulations = tabulations
-
+        info = self.integral_data_info
         args = [self.local_tensor, self.coordinates_arg]
-        if self.kernel.oriented:
+        if oriented:
             args.append(self.cell_orientations_loopy_arg)
-        if self.kernel.needs_cell_sizes:
+        if needs_cell_sizes:
             args.append(self.cell_sizes_arg)
         args.extend(self.coefficient_args)
-        if self.kernel.integral_type in ["exterior_facet", "exterior_facet_vert"]:
+        if info.integral_type in ["exterior_facet", "exterior_facet_vert"]:
             args.append(lp.GlobalArg("facet", dtype=numpy.uint32, shape=(1,)))
-        elif self.kernel.integral_type in ["interior_facet", "interior_facet_vert"]:
+        elif info.integral_type in ["interior_facet", "interior_facet_vert"]:
             args.append(lp.GlobalArg("facet", dtype=numpy.uint32, shape=(2,)))
-
-        for name_, shape in self.kernel.tabulations:
+        for name_, shape in tabulations:
             args.append(lp.GlobalArg(name_, dtype=self.scalar_type, shape=shape))
-
         index_names = get_index_names(ctx['quadrature_indices'], self.argument_multiindices, ctx['index_cache'])
-        self.kernel.ast = generate_loopy(impero_c, args, self.scalar_type, name, index_names)
-        self.kernel.name = name
-        self.kernel.flop_count = count_flops(impero_c)
-        return self.kernel
+        ast = generate_loopy(impero_c, args, self.scalar_type, name, index_names)
+        flop_count = count_flops(impero_c)  # Estimated total flops for this kernel.
+        return Kernel(ast=ast,
+                      integral_type=info.integral_type,
+                      subdomain_id=info.subdomain_id,
+                      domain_number=info.domain_number,
+                      coefficient_numbers=info.coefficient_numbers,
+                      oriented=oriented,
+                      needs_cell_sizes=needs_cell_sizes,
+                      tabulations=tabulations,
+                      flop_count=flop_count,
+                      name=name)
 
     def construct_empty_kernel(self, name):
         """Return None, since Firedrake needs no empty kernels.