finat.element_factory

docs/source/element_list.py

@@ -1,6 +1,6 @@
 from finat.ufl.elementlist import ufl_elements
 # ~ from ufl.finiteelement.elementlist import ufl_elements
-from tsfc.finatinterface import supported_elements
+from finat.element_factory import supported_elements
 import csv
 
 shape_names = {

firedrake/assemble.py

@@ -12,7 +12,7 @@
 import numpy
 from pyadjoint.tape import annotate_tape
 from tsfc import kernel_args
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 from tsfc.ufl_utils import extract_firedrake_constants
 import ufl
 import finat.ufl

firedrake/cython/dmcommon.pyx

@@ -11,7 +11,7 @@ from mpi4py import MPI
 from firedrake.utils import IntType, ScalarType
 from libc.string cimport memset
 from libc.stdlib cimport qsort
-from tsfc.finatinterface import as_fiat_cell
+from finat.element_factory import as_fiat_cell
 
 cimport numpy as np
 cimport mpi4py.MPI as MPI

firedrake/cython/extrusion_numbering.pyx

@@ -193,7 +193,7 @@ from mpi4py.libmpi cimport (MPI_Op_create, MPI_OP_NULL, MPI_Op_free,
                             MPI_User_function)
 from pyop2 import op2
 from firedrake.utils import IntType
-from tsfc.finatinterface import as_fiat_cell
+from finat.element_factory import as_fiat_cell
 
 cimport numpy
 cimport mpi4py.MPI as MPI

firedrake/extrusion_utils.py

@@ -8,7 +8,7 @@
 from pyop2.caching import serial_cache
 from firedrake.petsc import PETSc
 from firedrake.utils import IntType, RealType, ScalarType
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 import loopy as lp
 from loopy.version import LOOPY_USE_LANGUAGE_VERSION_2018_2  # noqa: F401
 from firedrake.parameters import target

firedrake/functionspacedata.py

@@ -20,7 +20,7 @@
 from decorator import decorator
 from functools import partial
 
-from tsfc.finatinterface import create_element as _create_element
+from finat.element_factory import create_element as _create_element
 
 from pyop2 import op2
 from firedrake.utils import IntType

firedrake/interpolation.py

@@ -14,7 +14,7 @@
 from pyop2 import op2
 from pyop2.caching import memory_and_disk_cache
 
-from tsfc.finatinterface import create_element, as_fiat_cell
+from finat.element_factory import create_element, as_fiat_cell
 from tsfc import compile_expression_dual_evaluation
 from tsfc.ufl_utils import extract_firedrake_constants
 

firedrake/mesh.py

@@ -45,7 +45,7 @@
     ngsPETSc = None
 # Only for docstring
 import mpi4py  # noqa: F401
-from tsfc.finatinterface import as_fiat_cell
+from finat.element_factory import as_fiat_cell
 
 
 __all__ = [

firedrake/mg/kernels.py

@@ -30,7 +30,7 @@
 from tsfc.driver import TSFCIntegralDataInfo
 from tsfc.kernel_interface.common import lower_integral_type
 from tsfc.parameters import default_parameters
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 from finat.quadrature import make_quadrature
 from firedrake.pointquery_utils import dX_norm_square, X_isub_dX, init_X, inside_check, is_affine, celldist_l1_c_expr
 from firedrake.pointquery_utils import to_reference_coords_newton_step as to_reference_coords_newton_step_body
@@ -45,7 +45,7 @@ def to_reference_coordinates(ufl_coordinate_element, parameters=None):
         parameters = _
 
     # Create FInAT element
-    element = tsfc.finatinterface.create_element(ufl_coordinate_element)
+    element = finat.element_factory.create_element(ufl_coordinate_element)
     gdim, = ufl_coordinate_element.reference_value_shape
     cell = ufl_coordinate_element.cell
 

firedrake/output/paraview_reordering.py

@@ -1,4 +1,4 @@
-from tsfc.finatinterface import create_base_element
+from finat.element_factory import create_base_element
 import numpy as np
 from pyop2.utils import as_tuple
 

firedrake/pointquery_utils.py

@@ -221,7 +221,7 @@ def compile_coordinate_element(mesh: MeshGeometry, contains_eps: float, paramete
 
     ufl_coordinate_element = mesh.ufl_coordinate_element()
     # Create FInAT element
-    element = tsfc.finatinterface.create_element(ufl_coordinate_element)
+    element = finat.element_factory.create_element(ufl_coordinate_element)
 
     code = {
         "geometric_dimension": mesh.geometric_dimension(),

firedrake/preconditioners/fdm.py

@@ -19,7 +19,7 @@
 from firedrake_citations import Citations
 from ufl.algorithms.ad import expand_derivatives
 from ufl.algorithms.expand_indices import expand_indices
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 from pyop2.compilation import load
 from pyop2.mpi import COMM_SELF
 from pyop2.sparsity import get_preallocation

firedrake/preconditioners/pmg.py

@@ -9,7 +9,7 @@
 from firedrake.solving_utils import _SNESContext
 from firedrake.tsfc_interface import extract_numbered_coefficients
 from firedrake.utils import ScalarType_c, IntType_c, cached_property
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 from tsfc import compile_expression_dual_evaluation
 from pyop2 import op2
 from pyop2.caching import serial_cache

firedrake/slate/slac/kernel_builder.py

@@ -14,7 +14,7 @@
 from firedrake.slate.slac.tsfc_driver import compile_terminal_form
 
 from tsfc import kernel_args
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 from tsfc.loopy import create_domains, assign_dtypes
 
 from pytools import UniqueNameGenerator

tests/firedrake/regression/test_interpolate_p3intmoments.py

@@ -9,7 +9,7 @@
 from FIAT.quadrature import make_quadrature
 from FIAT.polynomial_set import ONPolynomialSet
 from finat.fiat_elements import ScalarFiatElement
-from tsfc.finatinterface import convert, as_fiat_cell
+from finat.element_factory import convert, as_fiat_cell
 import finat.ufl
 
 ufcint = UFCInterval()
@@ -89,7 +89,7 @@ def __init__(self, cell, degree):
         super().__init__(P3IntMoments(cell, degree))
 
 
-# Replace the old tsfc.finatinterface.convert dispatch with a new one that
+# Replace the old finat.element_factory.convert dispatch with a new one that
 # gives the the new FInAT element for P3 on an interval with variant
 # "interior-moment"
 old_convert = convert.dispatch(finat.ufl.FiniteElement)

tests/tsfc/test_create_fiat_element.py

@@ -5,7 +5,7 @@
 
 import ufl
 import finat.ufl
-from tsfc.finatinterface import create_element as _create_element
+from finat.element_factory import create_element as _create_element
 
 
 supported_elements = {

tests/tsfc/test_create_finat_element.py

@@ -3,7 +3,7 @@
 import ufl
 import finat.ufl
 import finat
-from tsfc.finatinterface import create_element, supported_elements
+from finat.element_factory import create_element, supported_elements
 
 
 @pytest.fixture(params=["BDM",

tests/tsfc/test_dual_evaluation.py

@@ -1,7 +1,7 @@
 import pytest
 import ufl
 import finat.ufl
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 from tsfc import compile_expression_dual_evaluation
 
 

tests/tsfc/test_interpolation_factorisation.py

@@ -7,7 +7,7 @@
 from finat.ufl import FiniteElement, VectorElement, TensorElement
 
 from tsfc import compile_expression_dual_evaluation
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 
 
 @pytest.fixture(params=[interval, quadrilateral, hexahedron],

tests/tsfc/test_tsfc_274.py

@@ -2,7 +2,7 @@
 import numpy
 from finat.point_set import PointSet
 from gem.interpreter import evaluate
-from tsfc.finatinterface import create_element
+from finat.element_factory import create_element
 from ufl import quadrilateral
 from finat.ufl import FiniteElement, RestrictedElement
 

tsfc/fem.py

@@ -15,6 +15,7 @@
                                      PhysicalGeometry)
 from finat.point_set import PointSet, PointSingleton
 from finat.quadrature import make_quadrature
+from finat.element_factory import as_fiat_cell, create_element
 from gem.node import traversal
 from gem.optimise import constant_fold_zero, ffc_rounding
 from gem.unconcatenate import unconcatenate
@@ -32,7 +33,6 @@
 from ufl.domain import extract_unique_domain
 
 from tsfc import ufl2gem
-from tsfc.finatinterface import as_fiat_cell, create_element
 from tsfc.kernel_interface import ProxyKernelInterface
 from tsfc.modified_terminals import (analyse_modified_terminal,
                                      construct_modified_terminal)
@@ -270,9 +270,10 @@ def get_quadrature_rule(fiat_cell, integration_dim, quadrature_degree, scheme):
 
 
 def make_basis_evaluation_key(ctx, finat_element, mt, entity_id):
+    ufl_element = mt.terminal.ufl_element()
     domain = extract_unique_domain(mt.terminal)
     coordinate_element = domain.ufl_coordinate_element()
-    return (finat_element, mt.local_derivatives, ctx.point_set, ctx.integration_dim, entity_id, coordinate_element, mt.restriction)
+    return (ufl_element, mt.local_derivatives, ctx.point_set, ctx.integration_dim, entity_id, coordinate_element, mt.restriction)
 
 
 class PointSetContext(ContextBase):
@@ -697,8 +698,7 @@ def take_singleton(xs):
                           for alpha, tables in per_derivative.items()}
 
     # Coefficient evaluation
-    ctx.index_cache.setdefault(terminal.ufl_element(), element.get_indices())
-    beta = ctx.index_cache[terminal.ufl_element()]
+    beta = ctx.index_cache.setdefault(terminal.ufl_element(), element.get_indices())
     zeta = element.get_value_indices()
     vec_beta, = gem.optimise.remove_componenttensors([gem.Indexed(vec, beta)])
     value_dict = {}