Adapt to FFCx numba relocation

python/demo/demo_static-condensation.py

@@ -61,8 +61,8 @@
 from dolfinx.io import XDMFFile
 from dolfinx.jit import ffcx_jit
 from dolfinx.mesh import locate_entities_boundary, meshtags
-from ffcx.codegeneration.utils import empty_void_pointer
-from ffcx.codegeneration.utils import numba_ufcx_kernel_signature as ufcx_signature
+from ffcx.codegeneration.numba.utils import empty_void_pointer
+from ffcx.codegeneration.numba.utils import ufcx_kernel_signature as ufcx_signature
 
 # -
 

python/test/unit/fem/test_custom_assembler.py

@@ -10,13 +10,6 @@
 
 from mpi4py import MPI
 
-try:
-    import numba
-
-    from ffcx.codegeneration.utils import get_void_pointer
-except ImportError:
-    pass
-
 import numpy as np
 import pytest
 
@@ -29,6 +22,8 @@
 cffi_support = pytest.importorskip("numba.core.typing.cffi_utils")
 numba = pytest.importorskip("numba")
 
+from ffcx.codegeneration.numba.utils import get_void_pointer  # noqa: E402
+
 ffi = cffi.FFI()
 
 

python/test/unit/fem/test_custom_jit_kernels.py

@@ -15,15 +15,14 @@
 import pytest
 
 import dolfinx
-import ffcx.codegeneration.utils
 from dolfinx import cpp as _cpp
 from dolfinx import fem, la
 from dolfinx.common import list_timings
 from dolfinx.fem import Form, Function, IntegralType, form_cpp_class, functionspace
 from dolfinx.mesh import create_unit_square
 
 numba = pytest.importorskip("numba")
-ufcx_signature = ffcx.codegeneration.utils.numba_ufcx_kernel_signature
+from ffcx.codegeneration.numba.utils import ufcx_kernel_signature as ufcx_signature  # noqa: E402
 
 sys.path.append(os.getcwd())