mplang-nightly 0.1.dev146__py3-none-any.whl → 0.1.dev148__py3-none-any.whl

mplang/backend/base.py

@@ -12,20 +12,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Backend kernel registry & per-participant runtime (explicit op->kernel binding).
+"""Backend kernel registry: mapping kernel_id -> implementation.
 
-This version decouples *kernel implementation registration* from *operation binding*.
+This module provides a lightweight registry for backend kernel implementations.
+It does not track or decide which kernel handles a given semantic operation;
+that policy (op -> kernel_id) is managed externally by each ``RuntimeContext``.
 
-Concepts:
-    * kernel_id: unique identifier of a concrete backend implementation.
-    * op_type: semantic operation name carried by ``PFunction.fn_type``.
-    * bind_op(op_type, kernel_id): performed by higher layer (see ``backend.context``)
-        to select which implementation handles an op. Runtime dispatch is now a 2-step:
-        pfunc.fn_type -> active kernel_id -> KernelSpec.fn
+Exposed primitives:
+* ``@kernel_def(kernel_id)``: decorator to register a kernel implementation.
+* ``get_kernel_spec(kernel_id)``: look up a previously registered kernel.
+* ``cur_kctx()`` / ``KernelContext``: execution context available only
+    inside a kernel body (rank, world_size, per-backend state pockets, and a
+    runtime-wide cache shared by kernels of the same runtime instance).
 
-The previous implicit "import == register+bind" coupling is removed. Kernel
-modules only call ``@kernel_def(kernel_id)``. Default bindings are established
-centrally (lazy) the first time a runtime executes a kernel.
+No global op binding table exists here; callers resolve an op to a kernel_id
+before invoking the kernel function.
 """
 
 from __future__ import annotations
@@ -38,12 +39,10 @@ from typing import Any
 __all__ = [
     "KernelContext",
     "KernelSpec",
-    "bind_op",
     "cur_kctx",
-    "get_kernel_for_op",
+    "get_kernel_spec",
+    "kernel_exists",
     "list_kernels",
-    "list_ops",
-    "unbind_op",
 ]
 
 
@@ -116,9 +115,6 @@ class KernelSpec:
 # All registered kernel implementations: kernel_id -> spec
 _KERNELS: dict[str, KernelSpec] = {}
 
-# Active op bindings: op_type -> kernel_id
-_BINDINGS: dict[str, str] = {}
-
 
 def kernel_def(kernel_id: str, /, **meta: Any) -> Callable[[KernelFn], KernelFn]:
     """Decorator to register a concrete kernel implementation.
@@ -136,34 +132,11 @@ def kernel_def(kernel_id: str, /, **meta: Any) -> Callable[[KernelFn], KernelFn]
     return _decorator
 
 
-def bind_op(op_type: str, kernel_id: str, *, force: bool = True) -> None:
-    """Bind an op_type to a registered kernel implementation.
-
-    Args:
-        op_type: Semantic operation name.
-        kernel_id: Previously registered kernel identifier.
-        force: If False and op_type already bound, keep existing binding.
-               If True (default), overwrite.
-    """
-    if kernel_id not in _KERNELS:
+def get_kernel_spec(kernel_id: str) -> KernelSpec:
+    """Return KernelSpec for a registered kernel_id (no op binding lookup)."""
+    spec = _KERNELS.get(kernel_id)
+    if spec is None:
         raise KeyError(f"kernel_id {kernel_id} not registered")
-    if not force and op_type in _BINDINGS:
-        return
-    _BINDINGS[op_type] = kernel_id
-
-
-def unbind_op(op_type: str) -> None:
-    _BINDINGS.pop(op_type, None)
-
-
-def get_kernel_for_op(op_type: str) -> KernelSpec:
-    kid = _BINDINGS.get(op_type)
-    if kid is None:
-        # Tests expect NotImplementedError for unsupported operations
-        raise NotImplementedError(f"no backend kernel registered for op {op_type}")
-    spec = _KERNELS.get(kid)
-    if spec is None:  # inconsistent state
-        raise RuntimeError(f"active kernel_id {kid} missing spec")
     return spec
 
 
@@ -171,5 +144,6 @@ def list_kernels() -> list[str]:
     return sorted(_KERNELS.keys())
 
 
-def list_ops() -> list[str]:
-    return sorted(_BINDINGS.keys())
+def kernel_exists(kernel_id: str) -> bool:
+    """Return True if a kernel_id has been registered."""
+    return kernel_id in _KERNELS

mplang/backend/context.py

@@ -15,11 +15,10 @@
 from __future__ import annotations
 
 from collections.abc import Mapping
-from dataclasses import dataclass, field
 from typing import Any
 
 from mplang.backend import base
-from mplang.backend.base import KernelContext, bind_op, get_kernel_for_op
+from mplang.backend.base import KernelContext, get_kernel_spec, kernel_exists
 from mplang.core.dtype import UINT8, DType
 from mplang.core.pfunc import PFunction
 from mplang.core.table import TableLike, TableType
@@ -100,30 +99,57 @@ _DEFAULT_BINDINGS: dict[str, str] = {
 # --- RuntimeContext ---
 
 
-@dataclass
 class RuntimeContext:
-    rank: int
-    world_size: int
-    bindings: Mapping[str, str] | None = None  # optional overrides
-    state: dict[str, dict[str, Any]] = field(default_factory=dict)
-    cache: dict[str, Any] = field(default_factory=dict)
-    stats: dict[str, Any] = field(default_factory=dict)
-
-    def __post_init__(self) -> None:
+    """Per-runtime execution context with isolated op->kernel bindings.
+
+    Parameters
+    ----------
+    rank : int
+        Local rank of this participant.
+    world_size : int
+        Total number of participants.
+    initial_bindings : Mapping[str, str] | None, optional
+        Optional partial overrides applied on top of the default binding table
+        during construction (override semantics, not replace). After
+        initialization, all (re)binding must go through ``bind_op`` /
+        ``rebind_op``.
+    state / cache / stats : dict, optional
+        Mutable pockets reused across kernel invocations. If omitted, new
+        dictionaries are created.
+    """
+
+    __slots__ = ("_ibindings", "cache", "rank", "state", "stats", "world_size")
+
+    def __init__(
+        self,
+        rank: int,
+        world_size: int,
+        initial_bindings: Mapping[str, str] | None = None,
+        *,
+        state: dict[str, dict[str, Any]] | None = None,
+        cache: dict[str, Any] | None = None,
+        stats: dict[str, Any] | None = None,
+    ) -> None:
         _ensure_impl_imported()
-        if self.bindings is not None:
-            for op, kid in self.bindings.items():
-                bind_op(op, kid)
-        else:
-            for op, kid in _DEFAULT_BINDINGS.items():
-                bind_op(op, kid)
-        # Initialize stats pocket
+        self.rank = rank
+        self.world_size = world_size
+        # Merge defaults with user overrides (override semantics)
+        self._ibindings: dict[str, str] = {
+            **_DEFAULT_BINDINGS,
+            **(initial_bindings or {}),
+        }
+        self.state = state if state is not None else {}
+        self.cache = cache if cache is not None else {}
+        self.stats = stats if stats is not None else {}
         self.stats.setdefault("op_calls", {})
 
     def run_kernel(self, pfunc: PFunction, arg_list: list[Any]) -> list[Any]:
         fn_type = pfunc.fn_type
-        spec = get_kernel_for_op(fn_type)
-        fn = spec.fn
+        kid = self._ibindings.get(fn_type)
+        if kid is None:
+            raise NotImplementedError(f"no backend kernel registered for op {fn_type}")
+        spec = get_kernel_spec(kid)
+        fn = spec.fn  # kernel implementation
         if len(arg_list) != len(pfunc.ins_info):
             raise ValueError(
                 f"kernel {fn_type} arg count mismatch: got {len(arg_list)}, expect {len(pfunc.ins_info)}"
@@ -186,17 +212,32 @@ class RuntimeContext:
 
     # ---- explicit (re)binding API ----
     def bind_op(self, op_type: str, kernel_id: str, *, force: bool = False) -> None:
-        """Bind an operation to a kernel at runtime.
+        """Bind an operation to a kernel for THIS context only.
 
-        force=False (default) preserves any existing binding to avoid accidental
-        silent overrides. Use ``rebind_op`` or ``force=True`` to intentionally
-        change a binding.
+        force=False (default) keeps existing binding (no silent override).
         """
-        base.bind_op(op_type, kernel_id, force=force)
+        if not kernel_exists(kernel_id):
+            raise KeyError(f"kernel_id {kernel_id} not registered")
+        if not force and op_type in self._ibindings:
+            return
+        self._ibindings[op_type] = kernel_id
 
     def rebind_op(self, op_type: str, kernel_id: str) -> None:
         """Force rebind an operation to a different kernel (shorthand)."""
-        base.bind_op(op_type, kernel_id, force=True)
+        self.bind_op(op_type, kernel_id, force=True)
+
+    # Introspection helpers
+    def list_bound_ops(self) -> list[str]:  # pragma: no cover - convenience
+        return sorted(self._ibindings.keys())
+
+    def get_binding(self, op_type: str) -> str | None:  # pragma: no cover
+        return self._ibindings.get(op_type)
+
+    def __repr__(self) -> str:  # pragma: no cover - debug aid
+        return (
+            f"RuntimeContext(rank={self.rank}, world_size={self.world_size}, "
+            f"bound_ops={len(self._ibindings)})"
+        )
 
 
 def _validate_table_arg(

mplang/core/expr/evaluator.py

@@ -196,6 +196,28 @@ class EvalSemantic:
                     "uniform_cond: predicate is not uniform across parties"
                 )
 
+    # ------------------------------ While helpers ------------------------------
+    def _check_while_predicate(self, cond_result: list[Any]) -> Any:
+        """Validate while_loop predicate evaluation result.
+
+        Ensures the condition function returns exactly one value and that value
+        is non-None. Returns the boolean predicate value for convenience.
+
+        Raises:
+            AssertionError: If condition function returns != 1 value.
+            RuntimeError: If the single predicate value is None.
+        """
+        assert len(cond_result) == 1, (
+            f"Condition function must return a single value, got {cond_result}"
+        )
+        cond_value = cond_result[0]
+        if cond_value is None:
+            raise RuntimeError(
+                "while_loop condition produced None on rank "
+                f"{self.rank}; ensure the predicate yields a boolean for every party."
+            )
+        return cond_value
+
 
 class RecursiveEvaluator(EvalSemantic, ExprVisitor):
     """Recursive visitor-based evaluator."""
@@ -307,12 +329,8 @@ class RecursiveEvaluator(EvalSemantic, ExprVisitor):
             cond_env = dict(zip(expr.cond_fn.params, state, strict=True))
             cond_evaluator = self._fork(cond_env)
             cond_result = expr.cond_fn.body.accept(cond_evaluator)
-
-            assert len(cond_result) == 1, (
-                f"Condition function must return a single value, got {cond_result}"
-            )
-
-            if not cond_result[0]:
+            cond_value = self._check_while_predicate(cond_result)
+            if not cond_value:
                 break
 
             # Call body function with same arguments
@@ -445,8 +463,8 @@ class IterativeEvaluator(EvalSemantic):
                     cond_vals = self._iter_eval_graph(
                         node.cond_fn.body, {**env, **cond_env}
                     )
-                    assert len(cond_vals) == 1
-                    if not bool(cond_vals[0]):
+                    cond_val = self._check_while_predicate(cond_vals)
+                    if not bool(cond_val):
                         break
                     body_env = dict(zip(node.body_fn.params, state, strict=True))
                     new_state = self._iter_eval_graph(

mplang/core/primitive.py

@@ -483,6 +483,20 @@ def uniform_cond(
     if pred_ty.dtype != BOOL:
         raise TypeError(f"uniform_cond predicate must be boolean, got {pred_ty.dtype}")
 
+    # Static pmask rule:
+    # If predicate has a static pmask (not None), it must equal the current trace
+    # context mask. Otherwise some parties would execute a branch without a
+    # defined predicate value (unsafe). To run on a subset either:
+    #   1. Trace the entire uniform_cond under a subset TraceContext (ctx.fork(mask=...))
+    #   2. Broadcast / lift predicate to full mask (e.g. pshfl_s)
+    # Pred pmask None => dynamic: defer to runtime uniformity (if verify_uniform=True).
+    pred_pmask = pred_ty.pmask
+    if pred_pmask is not None and pred_pmask != cur_tracer.mask:
+        raise ValueError(
+            "uniform_cond predicate static pmask mismatch: predicate pmask="
+            f"{pred_pmask} trace mask={cur_tracer.mask}. Trace under a subset "
+            "context (ctx.fork(mask=...)) or broadcast predicate (pshfl_s) to all parties."
+        )
     # Step 1: Trace both branches in separate contexts
     then_tracer = cur_tracer.fork()
     then_tfn = trace(then_tracer, then_fn, *args)
@@ -706,6 +720,22 @@ def while_loop(
             f"Condition function must return a boolean scalar, got dtype {cond_out_var.mptype.dtype}"
         )
 
+    # Static pmask rule:
+    # If the predicate's pmask is statically known it must match the trace context
+    # mask. Otherwise some parties in this context would lack a boolean to drive
+    # control flow (previously could lead to hang via None). To restrict to a subset:
+    #   1. Trace the entire while_loop under a subset context (ctx.fork(mask=submask)), or
+    #   2. Broadcast predicate to full mask (e.g. pshfl_s) before while_loop.
+    # Dynamic predicates (pmask=None) are allowed; runtime guard (evaluator) raises
+    # if any participating party observes None.
+    pred_pmask = cond_out_var.mptype.pmask
+    if pred_pmask is not None and pred_pmask != cur_tracer.mask:
+        raise ValueError(
+            "while_loop predicate static pmask mismatch: predicate pmask="
+            f"{pred_pmask} trace mask={cur_tracer.mask}. Trace under subset context "
+            "or broadcast predicate to all parties."
+        )
+
     # Validate body returns same number of leaves and same dtype/shape per leaf
     if len(body_tfn.out_vars) != len(cond_tfn.in_vars):
         raise ValueError(

{mplang_nightly-0.1.dev146.dist-info → mplang_nightly-0.1.dev148.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mplang-nightly
-Version: 0.1.dev146
+Version: 0.1.dev148
 Summary: Multi-Party Programming Language
 Author-email: SecretFlow Team <secretflow-contact@service.alipay.com>
 License:                                  Apache License

{mplang_nightly-0.1.dev146.dist-info → mplang_nightly-0.1.dev148.dist-info}/RECORD

@@ -4,9 +4,9 @@ mplang/device.py,sha256=Iz_YFKkrbTFKtTQdGqkQZfc0NQH9dIxXP7-fUkIQOa4,12568
 mplang/analysis/__init__.py,sha256=CTHFvRsi-nFngojqjn08UaR3RY9i7CJ7T2UdR95kCrk,1056
 mplang/analysis/diagram.py,sha256=ffwgD12gL1_KH1uJ_EYkjmIlDrfxYJJkWj-wHl09_Xk,19520
 mplang/backend/__init__.py,sha256=2WE4cmW96Xkzyq2yRRYNww4kZ5o6u6NbPV0BxqZG698,581
-mplang/backend/base.py,sha256=Rp4Ze1aF5dypdMOskXnQWE-rM5nc4vkdDogEoxQp7FU,5712
+mplang/backend/base.py,sha256=eizxj16sWkUvBvXWS0Zl-S9uuqalJmNUzB1xLhBg8S8,4920
 mplang/backend/builtin.py,sha256=Mk1uUO2Vpw3meqZ0B7B0hG-wndea6cmFv2Uk1vM_uTg,7052
-mplang/backend/context.py,sha256=e22JzsHydi1DLkjzOEYwGBaAoVHyf8aEFYH_SuN7oR4,9351
+mplang/backend/context.py,sha256=fVJ0w0cw15JEqJO048dncWg7DGNWqbHSUjq42Jsyvos,10952
 mplang/backend/crypto.py,sha256=H_s5HI7lUP7g0xz-a9qMbSn6dhJStUilKbn3-7SIh0I,3812
 mplang/backend/phe.py,sha256=uNqmrbDAbd97TWS_O6D5sopastHy6J20R7knFE4M4uc,65247
 mplang/backend/spu.py,sha256=QT1q5uv-5P_nBGtTvtA_yI2h3h3zIqNSnvzGT7Shua4,9307
@@ -24,13 +24,13 @@ mplang/core/mpir.py,sha256=V6S9RqegaI0yojhLkHla5nGBi27ASoxlrEs1k4tGubM,37980
 mplang/core/mpobject.py,sha256=0pHSd7SrAFTScCFcB9ziDztElYQn-oIZOKBx47B3QX0,3732
 mplang/core/mptype.py,sha256=09LbMyJp68W0IkbD0s9YLeVssPg3Rl-rcwjTaCfidIQ,15243
 mplang/core/pfunc.py,sha256=PAr8qRhVveWO5HOI0TgdsWjpi4PFi2iEyuTlr9UVKSY,5106
-mplang/core/primitive.py,sha256=PON1EvE8n5hgz1FiKkza7PMWyv9N8Fwjwj8tQag0_LE,38764
+mplang/core/primitive.py,sha256=C1HMbqmkAvLbdgXiHrWPTQ2v2t1uwC_vsGCtI0TEqHY,40574
 mplang/core/table.py,sha256=BqTBZn7Tfwce4vzl3XYhaX5hVmKagVq9-YoERDta6d8,5892
 mplang/core/tensor.py,sha256=86u6DogSZMoL0w5XjtTmQm2PhA_VjwybN1b6U4Zzphg,2361
 mplang/core/tracer.py,sha256=dVMfUeCMmPz4o6tLXewGMW1Kpy5gpZORvr9w4MhwDtM,14288
 mplang/core/expr/__init__.py,sha256=qwiSTUOcanFJLyK8HZ13_L1ZDrybqpPXIlTHAyeumE8,1988
 mplang/core/expr/ast.py,sha256=KE46KTtlH9RA2V_EzWVKCKolsycgTmt7SotUrOc8Qxs,20923
-mplang/core/expr/evaluator.py,sha256=3rtfHVajmCUtkanzgiCWkepRRiTKehPcDF2i5EbcitI,20789
+mplang/core/expr/evaluator.py,sha256=OYmxkr4Lf2qMHnHK-aca-dfMsAAzGRVWuXrxNk_M_3U,21675
 mplang/core/expr/printer.py,sha256=VblKGnO0OUfzH7EBkszwRNxQUB8QyyC7BlJWJEUv9so,9546
 mplang/core/expr/transformer.py,sha256=TyL-8FjrVvDq_C9X7kAuKkiqt2XdZM-okjzVQj0A33s,4893
 mplang/core/expr/utils.py,sha256=VDTJ_-CsdHtVy9wDaGa7XdFxQ7o5lYYaeqcgsAhkbNI,2625
@@ -70,8 +70,8 @@ mplang/utils/crypto.py,sha256=rvPomBFtznRHc3RPi6Aip9lsU8zW2oxBqGv1K3vn7Rs,1052
 mplang/utils/func_utils.py,sha256=vCJcZmu0bEbqhOQKdpttV2_MBllIcPSN0b8U4WjNGGo,5164
 mplang/utils/spu_utils.py,sha256=S3L9RBkBe2AvSuMSQQ12cBY5Y1NPthubvErSX_7nj1A,4158
 mplang/utils/table_utils.py,sha256=aC-IZOKkSmFkpr3NZchLM0Wt0GOn-rg_xHBHREWBwAU,2202
-mplang_nightly-0.1.dev146.dist-info/METADATA,sha256=NUBg21yZ_atn4uNJ1SLljPt8ZwTuKhjDnuOMBXnlqPE,16547
-mplang_nightly-0.1.dev146.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mplang_nightly-0.1.dev146.dist-info/entry_points.txt,sha256=mG1oJT-GAjQR834a62_QIWb7litzWPPyVnwFqm-rWuY,55
-mplang_nightly-0.1.dev146.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-mplang_nightly-0.1.dev146.dist-info/RECORD,,
+mplang_nightly-0.1.dev148.dist-info/METADATA,sha256=3hkF4x8KZwg7PaGyfuAiDvp_qH9T1bhWS41rYWwl2Zs,16547
+mplang_nightly-0.1.dev148.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mplang_nightly-0.1.dev148.dist-info/entry_points.txt,sha256=mG1oJT-GAjQR834a62_QIWb7litzWPPyVnwFqm-rWuY,55
+mplang_nightly-0.1.dev148.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+mplang_nightly-0.1.dev148.dist-info/RECORD,,