fluxfem 0.1.3__py3-none-any.whl → 0.2.0__py3-none-any.whl

fluxfem/core/space.py

@@ -1,11 +1,47 @@
 from __future__ import annotations
 import operator
 from dataclasses import dataclass, field
-from typing import Protocol
+from typing import Any, Callable, Protocol, TYPE_CHECKING, TypeVar
 import jax
 import jax.numpy as jnp
 import numpy as np
+import warnings
+
+P = TypeVar("P")
+
+if TYPE_CHECKING:
+    from .assembly import (
+        ElementBilinearKernel,
+        ElementJacobianKernel,
+        ElementLinearKernel,
+        ElementResidualKernel,
+        Kernel,
+        ResidualForm,
+    )
+else:
+    Kernel = Callable[..., Any]
+    ResidualForm = Callable[..., Any]
+    ElementBilinearKernel = Callable[..., Any]
+    ElementLinearKernel = Callable[..., Any]
+    ElementResidualKernel = Callable[..., Any]
+    ElementJacobianKernel = Callable[..., Any]
+
+_WARNED_UNTAGGED_KERNELS: set[int] = set()
+
+
+def _warn_untagged_kernel(form) -> None:
+    key = id(form)
+    if key in _WARNED_UNTAGGED_KERNELS:
+        return
+    _WARNED_UNTAGGED_KERNELS.add(key)
+    warnings.warn(
+        "Raw kernel has no _ff_kind metadata; prefer tagging with ff.kernel(...) or "
+        "set _ff_kind/_ff_domain on the callable.",
+        category=UserWarning,
+        stacklevel=3,
+    )
 
+from .dtypes import INDEX_DTYPE
 from ..mesh import (
     BaseMesh,
     BaseMeshPytree,
@@ -79,12 +115,14 @@ class FESpaceClosure:
     """
     mesh: BaseMesh
     basis: Basis3D
-    elem_dofs: jnp.ndarray  # (n_elems, n_ldofs) int32
+    elem_dofs: jnp.ndarray  # (n_elems, n_ldofs) int64
     value_dim: int = 1      # 1=scalar, 3=vector, etc.
     _n_dofs: int | None = None
     _n_ldofs: int | None = None
     data: SpaceData | None = None
     _pattern_cache: dict[bool, object] = field(default_factory=dict, repr=False)
+    _kernel_cache: dict[tuple, object] = field(default_factory=dict, repr=False)
+    _elem_rows_cache: jnp.ndarray | None = field(default=None, repr=False)
 
     def __post_init__(self):
         # Ensure value_dim is a Python int (avoid tracers).
@@ -116,6 +154,15 @@ class FESpaceClosure:
         assert self._n_ldofs is not None
         return self._n_ldofs
 
+    def get_elem_rows(self) -> jnp.ndarray:
+        cached = self._elem_rows_cache
+        if cached is not None:
+            return cached
+        rows = self.elem_dofs.reshape(-1)
+        if jax.core.trace_ctx.is_top_level():
+            self._elem_rows_cache = rows
+        return rows
+
     def build_form_contexts(self, dep: jnp.ndarray | None = None) -> FormContext:
         def _tie_in(x, y):
             if x is None:
@@ -148,43 +195,240 @@ class FESpaceClosure:
                 )
 
         test = jax.vmap(make_field)(elem_coords)
-        trial = jax.vmap(make_field)(elem_coords)
+        # Test/trial share the same field data for single-space bilinear forms.
+        trial = test
 
         return FormContext(
             test=test, trial=trial, x_q=x_q,
             w=w, elem_id=jnp.arange(elem_coords.shape[0])
         )
 
+    def make_batched_assembler(self, *, dep: jnp.ndarray | None = None, pattern=None):
+        from .assembly import BatchedAssembler
+        if pattern is None:
+            pattern = self.get_sparsity_pattern(with_idx=True)
+        return BatchedAssembler.from_space(self, dep=dep, pattern=pattern)
+
+    def build_cg_operator(
+        self,
+        A,
+        *,
+        matvec: str = "flux",
+        preconditioner=None,
+        solver: str = "cg",
+        dof_per_node: int | None = None,
+        block_sizes=None,
+    ):
+        from ..solver.cg import build_cg_operator
+
+        if dof_per_node is None:
+            dof_per_node = int(self.value_dim)
+        return build_cg_operator(
+            A,
+            matvec=matvec,
+            preconditioner=preconditioner,
+            solver=solver,
+            dof_per_node=dof_per_node,
+            block_sizes=block_sizes,
+        )
+
+    def _kernel_cache_key(self, kind: str, form, params, *, jit: bool):
+        if not jit:
+            return None
+        form_key = getattr(form, "__wrapped__", form)
+        try:
+            params_key = hash(params)
+        except Exception:
+            return None
+        return (kind, id(form_key), params_key, True)
+
+    def _get_cached_kernel(self, kind: str, form, params, *, jit: bool, maker):
+        key = self._kernel_cache_key(kind, form, params, jit=jit)
+        if key is None:
+            return maker(form, params, jit=jit)
+        cached = self._kernel_cache.get(key)
+        if cached is not None:
+            return cached
+        kernel = maker(form, params, jit=jit)
+        if jax.core.trace_ctx.is_top_level():
+            self._kernel_cache[key] = kernel
+        return kernel
+
+    def assemble(
+        self,
+        form,
+        params=None,
+        *,
+        kind: str | None = None,
+        n_chunks: int | None = None,
+        dep: jnp.ndarray | None = None,
+        jit: bool = True,
+        pattern: str | object | None = "auto",
+        kernel=None,
+        **kwargs,
+    ):
+        """
+        High-level assembly entry point with optional kernel caching.
+
+        kind: "bilinear" or "linear". If None, inferred from LinearForm/BilinearForm
+            or compiled/kernels tagged with _ff_kind metadata.
+        pattern: "auto" to reuse cached sparsity pattern for bilinear assembly.
+        """
+        from .weakform import BilinearForm, LinearForm
+        from .assembly import make_element_bilinear_kernel, make_element_linear_kernel
+
+        if kind is None:
+            if isinstance(form, BilinearForm):
+                kind = "bilinear"
+                form = form.get_compiled()
+            elif isinstance(form, LinearForm):
+                kind = "linear"
+                form = form.get_compiled()
+            else:
+                inferred_kind = getattr(form, "_ff_kind", None)
+                inferred_domain = getattr(form, "_ff_domain", None)
+                if inferred_kind is None:
+                    raise ValueError(
+                        f"kind is required for raw kernels without metadata (got {form!r}). "
+                        "Use @ff.kernel(kind=..., domain=...) or pass kind=."
+                    )
+                if inferred_domain not in (None, "volume"):
+                    raise ValueError(
+                        f"Unsupported form domain '{inferred_domain}' for Space.assemble. "
+                        "Use assemble_surface_linear_form or assemble_surface_bilinear_form."
+                    )
+                kind = inferred_kind
+        else:
+            inferred_kind = getattr(form, "_ff_kind", None)
+            inferred_domain = getattr(form, "_ff_domain", None)
+            if inferred_kind is None:
+                _warn_untagged_kernel(form)
+            if inferred_kind is not None and inferred_kind != kind:
+                raise ValueError(
+                    f"assemble kind '{kind}' does not match form kind '{inferred_kind}' "
+                    f"for {form!r}. "
+                    "Align kind= with the kernel metadata (or retag the kernel)."
+                )
+            if inferred_domain not in (None, "volume"):
+                raise ValueError(
+                    f"Unsupported form domain '{inferred_domain}' for Space.assemble. "
+                    "Use assemble_surface_linear_form or assemble_surface_bilinear_form."
+                )
+
+        if kind == "bilinear":
+            if kernel is None:
+                kernel = self._get_cached_kernel(
+                    "bilinear",
+                    form,
+                    params,
+                    jit=jit,
+                    maker=make_element_bilinear_kernel,
+                )
+            pattern_use = None
+            if pattern == "auto":
+                pattern_use = self.get_sparsity_pattern(with_idx=True)
+            else:
+                pattern_use = pattern
+            return self.assemble_bilinear_form(
+                form,
+                params,
+                n_chunks=n_chunks,
+                dep=dep,
+                kernel=kernel,
+                pattern=pattern_use,
+                **kwargs,
+            )
+        if kind == "linear":
+            if kernel is None:
+                kernel = self._get_cached_kernel(
+                    "linear",
+                    form,
+                    params,
+                    jit=jit,
+                    maker=make_element_linear_kernel,
+                )
+            return self.assemble_linear_form(
+                form,
+                params,
+                n_chunks=n_chunks,
+                dep=dep,
+                kernel=kernel,
+                **kwargs,
+            )
+        raise ValueError(f"Unsupported assemble kind: {kind}")
+
     # --- Thin wrappers over functional assembly APIs (kept functional for JAX friendliness) ---
-    def assemble_bilinear_form(self, form, params, *, chunk_size=None, dep=None, **kwargs):
+    def assemble_bilinear_form(
+        self,
+        form: Kernel[P],
+        params: P,
+        *,
+        n_chunks: int | None = None,
+        dep: jnp.ndarray | None = None,
+        kernel: ElementBilinearKernel | None = None,
+        **kwargs,
+    ):
+        """Assemble bilinear form; kernel(ctx) -> (n_ldofs, n_ldofs) if provided."""
         from .assembly import assemble_bilinear_form
         if "pattern" not in kwargs or kwargs.get("pattern") is None:
             kwargs["pattern"] = self.get_sparsity_pattern(with_idx=True)
-        return assemble_bilinear_form(self, form, params, chunk_size=chunk_size, dep=dep, **kwargs)
+        return assemble_bilinear_form(
+            self, form, params, n_chunks=n_chunks, dep=dep, kernel=kernel, **kwargs
+        )
 
-    def assemble_linear_form(self, form, params, *, chunk_size=None, dep=None, **kwargs):
+    def assemble_linear_form(
+        self,
+        form: Kernel[P],
+        params: P,
+        *,
+        n_chunks: int | None = None,
+        dep: jnp.ndarray | None = None,
+        kernel: ElementLinearKernel | None = None,
+        **kwargs,
+    ):
+        """Assemble linear form; kernel(ctx) -> (n_ldofs,) if provided."""
         from .assembly import assemble_linear_form
-        return assemble_linear_form(self, form, params, chunk_size=chunk_size, dep=dep, **kwargs)
+        return assemble_linear_form(
+            self, form, params, n_chunks=n_chunks, dep=dep, kernel=kernel, **kwargs
+        )
 
     def assemble_functional(self, form, params):
         from .assembly import assemble_functional
         return assemble_functional(self, form, params)
 
-    def assemble_mass_matrix(self, *, chunk_size=None, **kwargs):
+    def assemble_mass_matrix(self, *, n_chunks=None, **kwargs):
         from .assembly import assemble_mass_matrix
-        return assemble_mass_matrix(self, chunk_size=chunk_size, **kwargs)
+        return assemble_mass_matrix(self, n_chunks=n_chunks, **kwargs)
 
     def assemble_bilinear_dense(self, kernel, params, **kwargs):
         from .assembly import assemble_bilinear_dense
         return assemble_bilinear_dense(self, kernel, params, **kwargs)
 
-    def assemble_residual(self, res_form, u, params, **kwargs):
+    def assemble_residual(
+        self,
+        res_form: ResidualForm[P],
+        u: jnp.ndarray,
+        params: P,
+        *,
+        kernel: ElementResidualKernel | None = None,
+        **kwargs,
+    ):
+        """Assemble residual; kernel(ctx, u_elem) -> (n_ldofs,) if provided."""
         from .assembly import assemble_residual
-        return assemble_residual(self, res_form, u, params, **kwargs)
-
-    def assemble_jacobian(self, res_form, u, params, **kwargs):
+        return assemble_residual(self, res_form, u, params, kernel=kernel, **kwargs)
+
+    def assemble_jacobian(
+        self,
+        res_form: ResidualForm[P],
+        u: jnp.ndarray,
+        params: P,
+        *,
+        kernel: ElementJacobianKernel | None = None,
+        **kwargs,
+    ):
+        """Assemble Jacobian; kernel(u_elem, ctx) -> (n_ldofs, n_ldofs) if provided."""
         from .assembly import assemble_jacobian
-        return assemble_jacobian(self, res_form, u, params, **kwargs)
+        return assemble_jacobian(self, res_form, u, params, kernel=kernel, **kwargs)
 
     def get_sparsity_pattern(self, *, with_idx: bool = True):
         cached = self._pattern_cache.get(with_idx)
@@ -192,7 +436,8 @@ class FESpaceClosure:
             return cached
         from .assembly import make_sparsity_pattern
         pat = make_sparsity_pattern(self, with_idx=with_idx)
-        self._pattern_cache[with_idx] = pat
+        if jax.core.trace_ctx.is_top_level():
+            self._pattern_cache[with_idx] = pat
         return pat
 
 
@@ -251,7 +496,7 @@ def make_space(
     return FESpace(
         mesh=mesh,
         basis=basis,
-        elem_dofs=jnp.asarray(elem_dofs, dtype=jnp.int32),
+        elem_dofs=jnp.asarray(elem_dofs, dtype=INDEX_DTYPE),
         value_dim=value_dim
     )
 
@@ -320,7 +565,7 @@ def make_space_pytree(
     return FESpacePytree(
         mesh=mesh_py,
         basis=basis_py,
-        elem_dofs=jnp.asarray(elem_dofs, dtype=jnp.int32),
+        elem_dofs=jnp.asarray(elem_dofs, dtype=INDEX_DTYPE),
         value_dim=value_dim,
     )