From f20d9e0b481d0683c55fd78934f2fdddbbf817ee Mon Sep 17 00:00:00 2001 From: schnellerhase <56360279+schnellerhase@users.noreply.github.com> Date: Thu, 23 Jul 2026 08:05:28 +0200 Subject: [PATCH 1/7] Adapt to FFCx numba relocation --- .github/workflows/fenicsx-refs.env | 2 +- python/test/unit/fem/test_custom_jit_kernels.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/fenicsx-refs.env b/.github/workflows/fenicsx-refs.env index 22c7e44a7e7..6a14adff7d1 100644 --- a/.github/workflows/fenicsx-refs.env +++ b/.github/workflows/fenicsx-refs.env @@ -3,4 +3,4 @@ basix_ref=main ufl_repository=FEniCS/ufl ufl_ref=main ffcx_repository=FEniCS/ffcx -ffcx_ref=main +ffcx_ref=schnellerhase/numba-opt diff --git a/python/test/unit/fem/test_custom_jit_kernels.py b/python/test/unit/fem/test_custom_jit_kernels.py index 242e8674695..fd68da79b28 100644 --- a/python/test/unit/fem/test_custom_jit_kernels.py +++ b/python/test/unit/fem/test_custom_jit_kernels.py @@ -15,7 +15,6 @@ 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 @@ -23,7 +22,7 @@ from dolfinx.mesh import create_unit_square numba = pytest.importorskip("numba") -ufcx_signature = ffcx.codegeneration.utils.numba_ufcx_kernel_signature +from ffcx.numba import numba_ufcx_kernel_signature as ufcx_signature # noqa: E402 sys.path.append(os.getcwd()) From 54931cb0ca30e137678841e285d4641eb50f5cde Mon Sep 17 00:00:00 2001 From: schnellerhase <56360279+schnellerhase@users.noreply.github.com> Date: Thu, 23 Jul 2026 08:35:00 +0200 Subject: [PATCH 2/7] Simplify import and fix --- python/test/unit/fem/test_custom_assembler.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/python/test/unit/fem/test_custom_assembler.py b/python/test/unit/fem/test_custom_assembler.py index eace1a5773a..67f019a2e2a 100644 --- a/python/test/unit/fem/test_custom_assembler.py +++ b/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.numba import get_void_pointer # noqa: E402 + ffi = cffi.FFI() From 0a6bd7e8f9774864ccf2d9f6d362785927b7e591 Mon Sep 17 00:00:00 2001 From: schnellerhase <56360279+schnellerhase@users.noreply.github.com> Date: Thu, 23 Jul 2026 10:21:06 +0200 Subject: [PATCH 3/7] Adapt demo --- python/demo/demo_static-condensation.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/demo/demo_static-condensation.py b/python/demo/demo_static-condensation.py index 3b594061bb4..bb96476fbf2 100644 --- a/python/demo/demo_static-condensation.py +++ b/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.numba import empty_void_pointer +from ffcx.numba import numba_ufcx_kernel_signature as ufcx_signature # - From 1c84dcec0b84016c959073dea85a98a4bb7a7ca1 Mon Sep 17 00:00:00 2001 From: schnellerhase <56360279+schnellerhase@users.noreply.github.com> Date: Thu, 23 Jul 2026 10:24:27 +0200 Subject: [PATCH 4/7] trigger From a710a9e9f98ee2ffd0bd9a8dc4df3ce4d1c10673 Mon Sep 17 00:00:00 2001 From: schnellerhase <56360279+schnellerhase@users.noreply.github.com> Date: Thu, 23 Jul 2026 11:15:15 +0200 Subject: [PATCH 5/7] Adapt to move and rename --- python/demo/demo_static-condensation.py | 4 ++-- python/test/unit/fem/test_custom_assembler.py | 2 +- python/test/unit/fem/test_custom_jit_kernels.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/demo/demo_static-condensation.py b/python/demo/demo_static-condensation.py index bb96476fbf2..c0f4f131309 100644 --- a/python/demo/demo_static-condensation.py +++ b/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.numba import empty_void_pointer -from ffcx.numba import numba_ufcx_kernel_signature as ufcx_signature +from ffcx.codegeneration.numba import empty_void_pointer +from ffcx.codegeneration.numba import ufcx_kernel_signature as ufcx_signature # - diff --git a/python/test/unit/fem/test_custom_assembler.py b/python/test/unit/fem/test_custom_assembler.py index 67f019a2e2a..8ea6a5bb2d5 100644 --- a/python/test/unit/fem/test_custom_assembler.py +++ b/python/test/unit/fem/test_custom_assembler.py @@ -22,7 +22,7 @@ cffi_support = pytest.importorskip("numba.core.typing.cffi_utils") numba = pytest.importorskip("numba") -from ffcx.numba import get_void_pointer # noqa: E402 +from ffcx.codegeneration.numba import get_void_pointer # noqa: E402 ffi = cffi.FFI() diff --git a/python/test/unit/fem/test_custom_jit_kernels.py b/python/test/unit/fem/test_custom_jit_kernels.py index fd68da79b28..be29e688160 100644 --- a/python/test/unit/fem/test_custom_jit_kernels.py +++ b/python/test/unit/fem/test_custom_jit_kernels.py @@ -22,7 +22,7 @@ from dolfinx.mesh import create_unit_square numba = pytest.importorskip("numba") -from ffcx.numba import numba_ufcx_kernel_signature as ufcx_signature # noqa: E402 +from ffcx.codegeneration.numba import ufcx_kernel_signature as ufcx_signature # noqa: E402 sys.path.append(os.getcwd()) From 0dd0fabe7a6991e70ece4460d5647c9b72db3012 Mon Sep 17 00:00:00 2001 From: schnellerhase <56360279+schnellerhase@users.noreply.github.com> Date: Thu, 23 Jul 2026 12:03:24 +0200 Subject: [PATCH 6/7] To utils --- python/demo/demo_static-condensation.py | 4 ++-- python/test/unit/fem/test_custom_assembler.py | 2 +- python/test/unit/fem/test_custom_jit_kernels.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python/demo/demo_static-condensation.py b/python/demo/demo_static-condensation.py index c0f4f131309..c111bac7039 100644 --- a/python/demo/demo_static-condensation.py +++ b/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.numba import empty_void_pointer -from ffcx.codegeneration.numba import 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 # - diff --git a/python/test/unit/fem/test_custom_assembler.py b/python/test/unit/fem/test_custom_assembler.py index 8ea6a5bb2d5..5809f20f969 100644 --- a/python/test/unit/fem/test_custom_assembler.py +++ b/python/test/unit/fem/test_custom_assembler.py @@ -22,7 +22,7 @@ cffi_support = pytest.importorskip("numba.core.typing.cffi_utils") numba = pytest.importorskip("numba") -from ffcx.codegeneration.numba import get_void_pointer # noqa: E402 +from ffcx.codegeneration.numba.utils import get_void_pointer # noqa: E402 ffi = cffi.FFI() diff --git a/python/test/unit/fem/test_custom_jit_kernels.py b/python/test/unit/fem/test_custom_jit_kernels.py index be29e688160..d3ea2655502 100644 --- a/python/test/unit/fem/test_custom_jit_kernels.py +++ b/python/test/unit/fem/test_custom_jit_kernels.py @@ -22,7 +22,7 @@ from dolfinx.mesh import create_unit_square numba = pytest.importorskip("numba") -from ffcx.codegeneration.numba import ufcx_kernel_signature as ufcx_signature # noqa: E402 +from ffcx.codegeneration.numba.utils import ufcx_kernel_signature as ufcx_signature # noqa: E402 sys.path.append(os.getcwd()) From 580adbc658cc42c37b4b9819bf84ca25aac05d9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20T=2E=20K=C3=BChner?= <56360279+schnellerhase@users.noreply.github.com> Date: Thu, 23 Jul 2026 15:56:08 +0200 Subject: [PATCH 7/7] Update .github/workflows/fenicsx-refs.env --- .github/workflows/fenicsx-refs.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fenicsx-refs.env b/.github/workflows/fenicsx-refs.env index 6a14adff7d1..22c7e44a7e7 100644 --- a/.github/workflows/fenicsx-refs.env +++ b/.github/workflows/fenicsx-refs.env @@ -3,4 +3,4 @@ basix_ref=main ufl_repository=FEniCS/ufl ufl_ref=main ffcx_repository=FEniCS/ffcx -ffcx_ref=schnellerhase/numba-opt +ffcx_ref=main