Merge branch 'main' into dokken/cmake_version_range

.github/workflows/pythonapp.yml

@@ -61,6 +61,11 @@ jobs:
         run: |
           python -m mypy ffcx/
 
+      - name: isort checks (non-blocking)
+        continue-on-error: true
+        run: |
+          python3 -m isort --check .
+
       - name: Check documentation style
         run: |
           python -m pydocstyle .

.isort.cfg

@@ -0,0 +1,5 @@
+[settings]
+src_paths = ffcx,test,demo
+known_first_party = basix,ufl
+known_third_party = numpy,pytest
+sections=FUTURE,STDLIB,THIRDPARTY,FIRSTPARTY,LOCALFOLDER

demo/test_demos.py

@@ -1,5 +1,6 @@
 import os
 import sys
+
 import pytest
 
 demo_dir = os.path.dirname(os.path.realpath(__file__))

doc/source/conf.py

@@ -14,6 +14,7 @@
 # import sys
 # sys.path.insert(0, os.path.abspath('.'))
 import datetime
+
 import ffcx
 
 # -- Project information -----------------------------------------------------

ffcx/analysis.py

@@ -16,9 +16,9 @@
 
 import numpy
 import numpy.typing
-import ufl
-import basix.ufl_wrapper
 
+import basix.ufl_wrapper
+import ufl
 from ffcx.element_interface import convert_element
 
 logger = logging.getLogger("ffcx")

ffcx/codegeneration/C/cnodes.py

@@ -8,6 +8,7 @@
 import numbers
 
 import numpy
+
 from ffcx.codegeneration.C.format_lines import Indented, format_indented_lines
 from ffcx.codegeneration.C.format_value import (format_float, format_int,
                                                 format_value)

ffcx/codegeneration/__init__.py

@@ -1,5 +1,5 @@
-import os
 import hashlib
+import os
 
 # Version of FFCx header files
 __author__ = "FEniCS Project"

ffcx/codegeneration/access.py

@@ -9,8 +9,8 @@
 import warnings
 
 import ufl
-from ffcx.element_interface import create_element, convert_element
 from basix.ufl_wrapper import BlockedElement
+from ffcx.element_interface import convert_element, create_element
 
 logger = logging.getLogger("ffcx")
 

ffcx/codegeneration/backend.py

@@ -5,6 +5,8 @@
 # SPDX-License-Identifier:    LGPL-3.0-or-later
 """Collection of FFCx specific pieces for the code generation phase."""
 
+import types
+
 import ffcx.codegeneration.C.cnodes
 from ffcx.codegeneration.access import FFCXBackendAccess
 from ffcx.codegeneration.C.ufl_to_cnodes import UFL2CNodesTranslatorCpp
@@ -18,7 +20,7 @@ class FFCXBackend(object):
     def __init__(self, ir, options):
 
         # This is the seam where cnodes/C is chosen for the FFCx backend
-        self.language = ffcx.codegeneration.C.cnodes
+        self.language: types.ModuleType = ffcx.codegeneration.C.cnodes
         scalar_type = options["scalar_type"]
         self.ufl_to_language = UFL2CNodesTranslatorCpp(self.language, scalar_type)
 

ffcx/codegeneration/dofmap.py

@@ -12,7 +12,6 @@
 
 import ffcx.codegeneration.dofmap_template as ufcx_dofmap
 
-
 logger = logging.getLogger("ffcx")
 
 

ffcx/codegeneration/expressions.py

@@ -150,10 +150,12 @@ def generate(self):
         L = self.backend.language
 
         parts = []
+        scalar_type = self.backend.access.options["scalar_type"]
+        value_type = scalar_to_value_type(scalar_type)
 
-        parts += self.generate_element_tables()
+        parts += self.generate_element_tables(value_type)
         # Generate the tables of geometry data that are needed
-        parts += self.generate_geometry_tables()
+        parts += self.generate_geometry_tables(value_type)
         parts += self.generate_piecewise_partition()
 
         all_preparts = []
@@ -169,15 +171,15 @@ def generate(self):
 
         return L.StatementList(parts)
 
-    def generate_geometry_tables(self):
+    def generate_geometry_tables(self, float_type: str):
         """Generate static tables of geometry data."""
         L = self.backend.language
 
         # Currently we only support circumradius
         ufl_geometry = {
-            ufl.geometry.ReferenceCellVolume: "reference_cell_volume"
+            ufl.geometry.ReferenceCellVolume: "reference_cell_volume",
         }
-        cells = {t: set() for t in ufl_geometry.keys()}
+        cells: Dict[Any, Set[Any]] = {t: set() for t in ufl_geometry.keys()}
 
         for integrand in self.ir.integrand.values():
             for attr in integrand["factorization"].nodes.values():
@@ -190,11 +192,11 @@ def generate_geometry_tables(self):
         parts = []
         for i, cell_list in cells.items():
             for c in cell_list:
-                parts.append(geometry.write_table(L, ufl_geometry[i], c))
+                parts.append(geometry.write_table(L, ufl_geometry[i], c, float_type))
 
         return parts
 
-    def generate_element_tables(self):
+    def generate_element_tables(self, float_type: str):
         """Generate tables of FE basis evaluated at specified points."""
         L = self.backend.language
         parts = []
@@ -204,12 +206,10 @@ def generate_element_tables(self):
         padlen = self.ir.options["padlen"]
         table_names = sorted(tables)
 
-        scalar_type = self.backend.access.options["scalar_type"]
-
         for name in table_names:
             table = tables[name]
             decl = L.ArrayDecl(
-                f"static const {scalar_type}", name, table.shape, table, padlen=padlen)
+                f"static const {float_type}", name, table.shape, table, padlen=padlen)
             parts += [decl]
 
         # Add leading comment if there are any tables

ffcx/codegeneration/finite_element.py

@@ -10,8 +10,8 @@
 
 import logging
 
-import ffcx.codegeneration.finite_element_template as ufcx_finite_element
 import ffcx.codegeneration.basix_custom_element_template as ufcx_basix_custom_finite_element
+import ffcx.codegeneration.finite_element_template as ufcx_finite_element
 import ufl
 
 logger = logging.getLogger("ffcx")

ffcx/codegeneration/geometry.py

@@ -4,9 +4,10 @@
 #
 # SPDX-License-Identifier:    LGPL-3.0-or-later
 
-import basix
 import numpy
 
+import basix
+
 
 def write_table(L, tablename, cellname, type: str):
     if tablename == "facet_edge_vertices":

ffcx/codegeneration/integrals.py

@@ -6,7 +6,7 @@
 
 import collections
 import logging
-from typing import List, Tuple
+from typing import Any, Dict, List, Set, Tuple
 
 import ufl
 from ffcx.codegeneration import geometry
@@ -253,7 +253,7 @@ def generate_quadrature_tables(self, value_type: str) -> List[str]:
         parts = L.commented_code_list(parts, "Quadrature rules")
         return parts
 
-    def generate_geometry_tables(self, float_type):
+    def generate_geometry_tables(self, float_type: str):
         """Generate static tables of geometry data."""
         L = self.backend.language
 
@@ -267,7 +267,7 @@ def generate_geometry_tables(self, float_type):
             ufl.geometry.ReferenceNormal: "reference_facet_normals",
             ufl.geometry.FacetOrientation: "facet_orientation"
         }
-        cells = {t: set() for t in ufl_geometry.keys()}
+        cells: Dict[Any, Set[Any]] = {t: set() for t in ufl_geometry.keys()}
 
         for integrand in self.ir.integrand.values():
             for attr in integrand["factorization"].nodes.values():

ffcx/codegeneration/jit.py

@@ -16,6 +16,7 @@
 from pathlib import Path
 
 import cffi
+
 import ffcx
 import ffcx.naming
 

ffcx/element_interface.py

@@ -8,14 +8,14 @@
 from __future__ import annotations
 
 import typing
-
 import warnings
+from functools import lru_cache
 
-import basix
 import numpy
-import ufl
+
+import basix
 import basix.ufl_wrapper
-from functools import lru_cache
+import ufl
 
 
 def convert_element(element: ufl.finiteelement.FiniteElementBase) -> basix.ufl_wrapper._BasixElementBase:

ffcx/ir/analysis/graph.py

@@ -8,6 +8,7 @@
 import logging
 
 import numpy
+
 import ufl
 from ffcx.ir.analysis.modified_terminals import is_modified_terminal
 from ffcx.ir.analysis.reconstruct import reconstruct

ffcx/ir/analysis/modified_terminals.py

@@ -10,6 +10,7 @@
                          Grad, Indexed, Jacobian, ReferenceGrad,
                          ReferenceValue, Restricted, SpatialCoordinate)
 from ufl.permutation import build_component_numbering
+
 from ...element_interface import convert_element
 
 logger = logging.getLogger("ffcx")

ffcx/ir/elementtables.py

@@ -9,6 +9,7 @@
 import typing
 
 import numpy
+
 import ufl
 import ufl.utils.derivativetuples
 from ffcx.element_interface import basix_index, convert_element

ffcx/ir/integral.py

@@ -11,6 +11,7 @@
 import typing
 
 import numpy
+
 import ufl
 from ffcx.ir.analysis.factorization import compute_argument_factorization
 from ffcx.ir.analysis.graph import build_scalar_graph

ffcx/ir/representation.py

@@ -22,8 +22,9 @@
 import typing
 import warnings
 
-import basix
 import numpy
+
+import basix
 import ufl
 from ffcx import naming
 from ffcx.analysis import UFLData

ffcx/ir/representationutils.py

@@ -9,6 +9,7 @@
 import logging
 
 import numpy
+
 import ufl
 from ffcx.element_interface import (create_quadrature, map_facet_points,
                                     reference_cell_vertices)

ffcx/main.py

@@ -16,7 +16,6 @@
 import string
 
 import ufl
-
 from ffcx import __version__ as FFCX_VERSION
 from ffcx import compiler, formatting
 from ffcx.options import FFCX_DEFAULT_OPTIONS, get_options

ffcx/naming.py

@@ -9,9 +9,10 @@
 
 import numpy
 import numpy.typing
-import ufl
 
 import ffcx
+import ufl
+
 from .element_interface import convert_element
 
 

ffcx/options.py

@@ -10,8 +10,8 @@
 import os
 import os.path
 import pprint
-from typing import Optional, Dict, Any
 from pathlib import Path
+from typing import Any, Dict, Optional
 
 logger = logging.getLogger("ffcx")
 

setup.cfg

@@ -57,6 +57,7 @@ test = pytest >= 6.0; sympy
 ci =
     coverage
     coveralls
+    isort
     pytest-cov
     pytest-xdist
     mypy

setup.py

@@ -2,7 +2,6 @@
 
 try:
     import pip
-
     from packaging import version
     if version.parse(pip.__version__) < version.parse("21.3"):
         # Issue with older version of pip https://github.com/pypa/pip/issues/7953

test/test_add_mode.py

@@ -4,9 +4,10 @@
 #
 # SPDX-License-Identifier:    LGPL-3.0-or-later
 
-import ffcx.codegeneration.jit
 import numpy as np
 import pytest
+
+import ffcx.codegeneration.jit
 import ufl
 from ffcx.naming import cdtype_to_numpy, scalar_to_value_type
 

test/test_flops.py

@@ -5,8 +5,8 @@
 # SPDX-License-Identifier:    LGPL-3.0-or-later
 
 
-from ffcx.codegeneration.flop_count import count_flops
 import ufl
+from ffcx.codegeneration.flop_count import count_flops
 
 
 def create_form(degree):

test/test_jit_expression.py

@@ -5,10 +5,11 @@
 #
 # SPDX-License-Identifier:    LGPL-3.0-or-later
 
-import basix
 import cffi
-import ffcx.codegeneration.jit
 import numpy as np
+
+import basix
+import ffcx.codegeneration.jit
 import ufl
 from ffcx.naming import cdtype_to_numpy, scalar_to_value_type
 

test/test_jit_forms.py

@@ -4,13 +4,14 @@
 #
 # SPDX-License-Identifier:    LGPL-3.0-or-later
 
-import ffcx.codegeneration.jit
 import numpy as np
 import pytest
 import sympy
+from sympy.abc import x, y, z
+
+import ffcx.codegeneration.jit
 import ufl
 from ffcx.naming import cdtype_to_numpy, scalar_to_value_type
-from sympy.abc import x, y, z
 
 
 @pytest.mark.parametrize("mode,expected_result", [