mplang-nightly 0.1.dev269__py3-none-any.whl → 0.1.dev271__py3-none-any.whl

mplang/{v2/backends → backends}/simp_driver/values.py

@@ -18,8 +18,8 @@ from __future__ import annotations
 
 from typing import Any, ClassVar, Self
 
-from mplang.v2.edsl import serde
-from mplang.v2.runtime.value import Value
+from mplang.edsl import serde
+from mplang.runtime.value import Value
 
 
 @serde.register_class

mplang/{v2/backends → backends}/simp_worker/__init__.py

@@ -17,9 +17,9 @@
 Provides Worker-side state and ops for the simp dialect.
 """
 
-from mplang.v2.backends.simp_worker.mem import LocalMesh, ThreadCommunicator
-from mplang.v2.backends.simp_worker.ops import WORKER_HANDLERS
-from mplang.v2.backends.simp_worker.state import SimpWorker
+from mplang.backends.simp_worker.mem import LocalMesh, ThreadCommunicator
+from mplang.backends.simp_worker.ops import WORKER_HANDLERS
+from mplang.backends.simp_worker.state import SimpWorker
 
 __all__ = [
     "WORKER_HANDLERS",

mplang/{v2/backends → backends}/simp_worker/http.py

@@ -21,7 +21,7 @@ This module contains:
 
 Usage:
     # Start a worker server
-    from mplang.v2.backends.simp_http_worker import create_worker_app
+    from mplang.backends.simp_http_worker import create_worker_app
     import uvicorn
 
     app = create_worker_app(rank=0, world_size=3, endpoints=[...])
@@ -47,16 +47,16 @@ import httpx
 from fastapi import FastAPI, HTTPException
 from pydantic import BaseModel
 
-from mplang.v2.backends import spu_impl as _spu_impl  # noqa: F401
-from mplang.v2.backends import tensor_impl as _tensor_impl  # noqa: F401
+from mplang.backends import spu_impl as _spu_impl  # noqa: F401
+from mplang.backends import tensor_impl as _tensor_impl  # noqa: F401
 
 # Register operation implementations (side-effect imports)
-from mplang.v2.backends.simp_worker import SimpWorker
-from mplang.v2.backends.simp_worker import ops as _simp_worker_ops  # noqa: F401
-from mplang.v2.edsl import serde
-from mplang.v2.edsl.graph import Graph
-from mplang.v2.runtime.interpreter import ExecutionTracer, Interpreter
-from mplang.v2.runtime.object_store import ObjectStore
+from mplang.backends.simp_worker import SimpWorker
+from mplang.backends.simp_worker import ops as _simp_worker_ops  # noqa: F401
+from mplang.edsl import serde
+from mplang.edsl.graph import Graph
+from mplang.runtime.interpreter import ExecutionTracer, Interpreter
+from mplang.runtime.object_store import ObjectStore
 
 logger = logging.getLogger(__name__)
 
@@ -250,7 +250,7 @@ def create_worker_app(
     from collections.abc import Callable
     from typing import cast
 
-    from mplang.v2.backends.simp_worker.ops import WORKER_HANDLERS
+    from mplang.backends.simp_worker.ops import WORKER_HANDLERS
 
     # func_impl is already imported at module level for side-effects
     handlers: dict[str, Callable[..., Any]] = {**WORKER_HANDLERS}  # type: ignore[dict-item]

mplang/{v2/backends → backends}/simp_worker/mem.py

@@ -53,7 +53,7 @@ class ThreadCommunicator:
     def send(self, to: int, key: str, data: Any) -> None:
         assert 0 <= to < self.world_size
         if self.use_serde:
-            from mplang.v2.edsl import serde
+            from mplang.edsl import serde
 
             data = serde.loads(serde.dumps(data))
         self.peers[to]._on_receive(self.rank, key, data)

mplang/{v2/backends → backends}/simp_worker/ops.py

@@ -22,9 +22,9 @@ from __future__ import annotations
 
 from typing import Any
 
-from mplang.v2.dialects import simp
-from mplang.v2.edsl.graph import Operation
-from mplang.v2.runtime.interpreter import Interpreter
+from mplang.dialects import simp
+from mplang.edsl.graph import Operation
+from mplang.runtime.interpreter import Interpreter
 
 
 def _ensure_worker_context(interpreter: Any, op_name: str) -> Any:
@@ -111,7 +111,7 @@ def _uniform_cond_worker_impl(
     interpreter: Interpreter, op: Operation, pred: Any, *args: Any
 ) -> Any:
     """Worker implementation of simp.uniform_cond."""
-    from mplang.v2.backends.tensor_impl import TensorValue
+    from mplang.backends.tensor_impl import TensorValue
 
     if op.attrs.get("verify_uniform", True):
         pass  # TODO: Implement AllReduce verification
@@ -128,7 +128,7 @@ def _uniform_cond_worker_impl(
 
 def _while_loop_worker_impl(interpreter: Interpreter, op: Operation, *args: Any) -> Any:
     """Worker implementation of simp.while_loop."""
-    from mplang.v2.backends.tensor_impl import TensorValue
+    from mplang.backends.tensor_impl import TensorValue
 
     cond_graph = op.regions[0]
     body_graph = op.regions[1]

mplang/{v2/backends → backends}/simp_worker/state.py

@@ -18,10 +18,8 @@ from __future__ import annotations
 
 from typing import Any
 
-import mplang.v2.backends.field_impl  # noqa: F401
-import mplang.v2.backends.tensor_impl  # noqa: F401
-from mplang.v2.runtime.dialect_state import DialectState
-from mplang.v2.runtime.object_store import ObjectStore
+from mplang.runtime.dialect_state import DialectState
+from mplang.runtime.object_store import ObjectStore
 
 
 class SimpWorker(DialectState):

mplang/{v2/backends → backends}/spu_impl.py

@@ -26,13 +26,13 @@ import numpy as np
 import spu.api as spu_api
 import spu.libspu as libspu
 
-from mplang.v2.backends.spu_state import SPUState
-from mplang.v2.backends.tensor_impl import TensorValue
-from mplang.v2.dialects import spu
-from mplang.v2.edsl import serde
-from mplang.v2.edsl.graph import Operation
-from mplang.v2.runtime.interpreter import Interpreter
-from mplang.v2.runtime.value import WrapValue
+from mplang.backends.spu_state import SPUState
+from mplang.backends.tensor_impl import TensorValue
+from mplang.dialects import spu
+from mplang.edsl import serde
+from mplang.edsl.graph import Operation
+from mplang.runtime.interpreter import Interpreter
+from mplang.runtime.value import WrapValue
 
 # =============================================================================
 # SPU Share Wrapper
@@ -160,7 +160,7 @@ def exec_impl(interpreter: Interpreter, op: Operation, *args: Any) -> Any:
     The SPU config must contain parties info to correctly map global rank
     to local SPU rank and determine SPU world size.
     """
-    from mplang.v2.backends.simp_worker.state import SimpWorker
+    from mplang.backends.simp_worker.state import SimpWorker
 
     # Get SPU config from attrs (passed through from run_jax)
     config: spu.SPUConfig = op.attrs["config"]

mplang/{v2/backends → backends}/spu_state.py

@@ -25,10 +25,10 @@ from typing import TYPE_CHECKING, Any
 import spu.api as spu_api
 import spu.libspu as libspu
 
-from mplang.v2.runtime.dialect_state import DialectState
+from mplang.runtime.dialect_state import DialectState
 
 if TYPE_CHECKING:
-    from mplang.v2.dialects import spu
+    from mplang.dialects import spu
 
 
 class SPUState(DialectState):
@@ -74,7 +74,7 @@ class SPUState(DialectState):
         Returns:
             A tuple of (Runtime, Io) for this party.
         """
-        from mplang.v2.backends.spu_impl import to_runtime_config
+        from mplang.backends.spu_impl import to_runtime_config
 
         # Determine link mode
         if communicator is not None:
@@ -143,7 +143,7 @@ class SPUState(DialectState):
         Returns:
             libspu link context using BaseChannel adapters
         """
-        from mplang.v2.backends.channel import BaseChannel
+        from mplang.backends.channel import BaseChannel
 
         # Get this worker's global rank
         global_rank = parties[local_rank]

mplang/{v2/backends → backends}/store_impl.py

@@ -18,9 +18,9 @@ from __future__ import annotations
 
 from typing import Any
 
-from mplang.v2.dialects import store
-from mplang.v2.edsl.graph import Operation
-from mplang.v2.runtime.interpreter import Interpreter
+from mplang.dialects import store
+from mplang.edsl.graph import Operation
+from mplang.runtime.interpreter import Interpreter
 
 
 def _get_uri(uri_base: str) -> str:

mplang/{v2/backends → backends}/table_impl.py

@@ -28,13 +28,13 @@ import duckdb
 import pandas as pd
 import pyarrow as pa
 
-import mplang.v2.edsl.typing as elt
-from mplang.v2.backends.tensor_impl import TensorValue
-from mplang.v2.dialects import table
-from mplang.v2.edsl import serde
-from mplang.v2.edsl.graph import Operation
-from mplang.v2.runtime.interpreter import Interpreter
-from mplang.v2.runtime.value import WrapValue
+import mplang.edsl.typing as elt
+from mplang.backends.tensor_impl import TensorValue
+from mplang.dialects import table
+from mplang.edsl import serde
+from mplang.edsl.graph import Operation
+from mplang.runtime.interpreter import Interpreter
+from mplang.runtime.value import WrapValue
 
 
 class BatchReader(ABC):
@@ -631,7 +631,7 @@ def table2tensor_impl(interpreter: Interpreter, op: Operation, table_val: Any) -
 
     Returns TensorValue if tensor_impl is available, otherwise raw np.ndarray.
     """
-    from mplang.v2.backends.tensor_impl import TensorValue
+    from mplang.backends.tensor_impl import TensorValue
 
     tbl = _unwrap(table_val)
     df = tbl.to_pandas()

mplang/{v2/backends → backends}/tee_impl.py

@@ -31,14 +31,14 @@ from typing import TYPE_CHECKING, Any, ClassVar
 
 import numpy as np
 
-from mplang.v2.backends.crypto_impl import BytesValue, PublicKeyValue
-from mplang.v2.dialects import tee
-from mplang.v2.edsl import serde
-from mplang.v2.runtime.value import Value
+from mplang.backends.crypto_impl import BytesValue, PublicKeyValue
+from mplang.dialects import tee
+from mplang.edsl import serde
+from mplang.runtime.value import Value
 
 if TYPE_CHECKING:
-    from mplang.v2.edsl.graph import Operation
-    from mplang.v2.runtime.interpreter import Interpreter
+    from mplang.edsl.graph import Operation
+    from mplang.runtime.interpreter import Interpreter
 
 
 # ==============================================================================

mplang/{v2/backends → backends}/tensor_impl.py

@@ -32,12 +32,12 @@ import numpy as np
 from jax._src import compiler
 from numpy.typing import ArrayLike
 
-import mplang.v2.edsl.typing as elt
-from mplang.v2.dialects import dtypes, tensor
-from mplang.v2.edsl import serde
-from mplang.v2.edsl.graph import Operation
-from mplang.v2.runtime.interpreter import Interpreter
-from mplang.v2.runtime.value import Value, WrapValue
+import mplang.edsl.typing as elt
+from mplang.dialects import dtypes, tensor
+from mplang.edsl import serde
+from mplang.edsl.graph import Operation
+from mplang.runtime.interpreter import Interpreter
+from mplang.runtime.value import Value, WrapValue
 
 # =============================================================================
 # TensorValue Wrapper

mplang/{v2/cli.py → cli.py}

@@ -18,19 +18,19 @@ Command-line interface for MPLang2 clusters and jobs.
 
 Examples:
     # Generate a cluster config file
-    python -m mplang.v2.cli config gen -w 3 -p 8100 -o cluster.yaml
+    python -m mplang.cli config gen -w 3 -p 8100 -o cluster.yaml
 
     # Start a single worker (production usage)
-    python -m mplang.v2.cli worker --rank 0 -c cluster.yaml
+    python -m mplang.cli worker --rank 0 -c cluster.yaml
 
     # Start 3 local workers (development usage)
-    python -m mplang.v2.cli up -c cluster.yaml
+    python -m mplang.cli up -c cluster.yaml
 
     # Check cluster status
-    python -m mplang.v2.cli status -c cluster.yaml
+    python -m mplang.cli status -c cluster.yaml
 
     # Run a job
-    python -m mplang.v2.cli run -c cluster.yaml -f my_job.py
+    python -m mplang.cli run -c cluster.yaml -f my_job.py
 """
 
 import argparse
@@ -62,7 +62,7 @@ def run_worker(
     signal.signal(signal.SIGINT, signal.SIG_DFL)
     signal.signal(signal.SIGTERM, signal.SIG_DFL)
 
-    from mplang.v2.backends.simp_worker.http import create_worker_app
+    from mplang.backends.simp_worker.http import create_worker_app
 
     app = create_worker_app(rank, world_size, endpoints, spu_endpoints)
 
@@ -323,9 +323,9 @@ def parse_spu_endpoints(
 
 def cmd_run(args: argparse.Namespace) -> None:
     """Run a user job via HTTP cluster or local simulator."""
-    from mplang.v2 import make_driver, make_simulator
-    from mplang.v2.edsl.context import pop_context, push_context
-    from mplang.v2.libs.device import ClusterSpec
+    from mplang import make_driver, make_simulator
+    from mplang.edsl.context import pop_context, push_context
+    from mplang.libs.device import ClusterSpec
 
     cluster: ClusterSpec
 

mplang/{v2/cli_guide.md → cli_guide.md}

@@ -26,7 +26,7 @@ First, generate a `cluster.yaml` file. This defines the topology of your MPLang
 
 ```bash
 # Generate a config for 2 workers starting at port 8100
-python -m mplang.v2.cli config gen -w 2 -p 8100 -o cluster.yaml
+python -m mplang.cli config gen -w 2 -p 8100 -o cluster.yaml
 ```
 
 ### 2. Start the Cluster (Terminal 1)
@@ -35,7 +35,7 @@ In your **first terminal**, start the cluster using the `up` command. This will
 
 ```bash
 # Terminal 1
-python -m mplang.v2.cli up -c cluster.yaml
+python -m mplang.cli up -c cluster.yaml
 ```
 
 You should see logs indicating that workers have started (e.g., `[Worker 0] INFO: Started server process...`). Keep this terminal open.
@@ -46,7 +46,7 @@ Create a Python script (e.g., `my_job.py`) that defines the computation you want
 
 ```python
 # my_job.py
-from mplang.v2.dialects import simp
+from mplang.dialects import simp
 import numpy as np
 
 def main():
@@ -71,7 +71,7 @@ In your **second terminal**, use the `run` command to submit the script to the r
 
 ```bash
 # Terminal 2
-python -m mplang.v2.cli run -c cluster.yaml -f my_job.py
+python -m mplang.cli run -c cluster.yaml -f my_job.py
 ```
 
 The CLI will connect to the driver, which orchestrates the execution across the workers.
@@ -82,7 +82,7 @@ You can check the health and latency of your workers at any time.
 
 ```bash
 # Terminal 2
-python -m mplang.v2.cli status -c cluster.yaml
+python -m mplang.cli status -c cluster.yaml
 ```
 
 **Output Example:**
@@ -99,7 +99,7 @@ To debug or verify intermediate results, you can list the objects currently stor
 
 ```bash
 # Terminal 2
-python -m mplang.v2.cli objects -c cluster.yaml
+python -m mplang.cli objects -c cluster.yaml
 ```
 
 **Output Example:**
@@ -114,9 +114,9 @@ Rank   | Endpoint                  | Count  | Objects
 
 | Command | Description | Usage |
 | :--- | :--- | :--- |
-| `config gen` | Generate cluster config file | `python -m mplang.v2.cli config gen -w <workers> -o <file>` |
-| `up` | Start all workers locally | `python -m mplang.v2.cli up -c <config>` |
-| `run` | Submit a job script | `python -m mplang.v2.cli run -c <config> -f <script>` |
-| `status` | Check worker health | `python -m mplang.v2.cli status -c <config>` |
-| `objects` | List objects on workers | `python -m mplang.v2.cli objects -c <config>` |
-| `worker` | Start a single worker (prod) | `python -m mplang.v2.cli worker --rank <id> -c <config>` |
+| `config gen` | Generate cluster config file | `python -m mplang.cli config gen -w <workers> -o <file>` |
+| `up` | Start all workers locally | `python -m mplang.cli up -c <config>` |
+| `run` | Submit a job script | `python -m mplang.cli run -c <config> -f <script>` |
+| `status` | Check worker health | `python -m mplang.cli status -c <config>` |
+| `objects` | List objects on workers | `python -m mplang.cli objects -c <config>` |
+| `worker` | Start a single worker (prod) | `python -m mplang.cli worker --rank <id> -c <config>` |

mplang/{v2/dialects → dialects}/__init__.py

@@ -29,8 +29,8 @@ from __future__ import annotations
 
 # Import dialects to trigger their type registrations
 # Each dialect module registers its types at import time via _register_*_types()
-from mplang.v2.dialects import bfv as _bfv  # noqa: F401
-from mplang.v2.dialects import crypto as _crypto  # noqa: F401
-from mplang.v2.dialects import spu as _spu  # noqa: F401
-from mplang.v2.dialects import store as _store  # noqa: F401
-from mplang.v2.dialects import tee as _tee  # noqa: F401
+from mplang.dialects import bfv as _bfv  # noqa: F401
+from mplang.dialects import crypto as _crypto  # noqa: F401
+from mplang.dialects import spu as _spu  # noqa: F401
+from mplang.dialects import store as _store  # noqa: F401
+from mplang.dialects import tee as _tee  # noqa: F401

mplang/{v2/dialects → dialects}/bfv.py

@@ -54,8 +54,8 @@ Architecture:
 
 Example:
 ```python
-from mplang.v2.dialects import tensor, bfv
-import mplang.v2.edsl.typing as elt
+from mplang.dialects import tensor, bfv
+import mplang.edsl.typing as elt
 import numpy as np
 
 # 1. Setup
@@ -91,9 +91,9 @@ from __future__ import annotations
 
 from typing import Any, ClassVar, Literal, cast
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
-from mplang.v2.edsl import serde
+import mplang.edsl as el
+import mplang.edsl.typing as elt
+from mplang.edsl import serde
 
 # ==============================================================================
 # --- Type Definitions
@@ -369,7 +369,7 @@ def _batch_encode_trace(
     encoder: el.Object,
     key: el.Object,
 ) -> tuple[el.Object, ...]:
-    from mplang.v2.edsl.tracer import TraceObject, Tracer
+    from mplang.edsl.tracer import TraceObject, Tracer
 
     ctx = el.get_current_context()
     if not isinstance(ctx, Tracer):

mplang/{v2/dialects → dialects}/crypto.py

@@ -21,9 +21,9 @@ from __future__ import annotations
 
 from typing import Any, ClassVar
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
-from mplang.v2.edsl import serde
+import mplang.edsl as el
+import mplang.edsl.typing as elt
+from mplang.edsl import serde
 
 # ==============================================================================
 # --- Type Definitions
@@ -607,7 +607,7 @@ def random_tensor(shape: tuple[int, ...], dtype: elt.ScalarType) -> el.Object:
     import math
     from typing import cast
 
-    from mplang.v2.dialects import dtypes, tensor
+    from mplang.dialects import dtypes, tensor
 
     # Get byte size from numpy dtype
     np_dtype = dtypes.to_numpy(dtype)
@@ -644,7 +644,7 @@ def random_bits(n: int) -> el.Object:
 
     import jax.numpy as jnp
 
-    from mplang.v2.dialects import tensor
+    from mplang.dialects import tensor
 
     # Generate enough bytes to cover n bits
     num_bytes = (n + 7) // 8

mplang/{v2/dialects → dialects}/dtypes.py

@@ -18,7 +18,7 @@ This module provides bidirectional conversion between MPLang's type system
 (ScalarType hierarchy) and external library types (NumPy, JAX, PyArrow, Pandas).
 
 Usage:
-    from mplang.v2.dialects import dtypes
+    from mplang.dialects import dtypes
 
     # MPLang ScalarType → JAX/NumPy
     jax_dtype = dtypes.to_jax(scalar_types.f32)    # → jnp.float32
@@ -40,7 +40,7 @@ from typing import Any
 import jax.numpy as jnp
 import numpy as np
 
-import mplang.v2.edsl.typing as scalar_types
+import mplang.edsl.typing as scalar_types
 
 # ==============================================================================
 # MPLang ScalarType → JAX/NumPy conversion

mplang/{v2/dialects → dialects}/field.py

@@ -29,9 +29,9 @@ from typing import Any, cast
 
 import jax.numpy as jnp
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
-from mplang.v2.dialects import tensor
+import mplang.edsl as el
+import mplang.edsl.typing as elt
+from mplang.dialects import tensor
 
 # =============================================================================
 # Primitives

mplang/{v2/dialects → dialects}/func.py

@@ -24,8 +24,8 @@ from __future__ import annotations
 from collections.abc import Callable
 from typing import Any
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
+import mplang.edsl as el
+import mplang.edsl.typing as elt
 
 func_def_p = el.Primitive[el.TraceObject]("func.func")
 call_p = el.Primitive[Any]("func.call")

mplang/{v2/dialects → dialects}/phe.py

@@ -35,8 +35,8 @@ Architecture:
 
 Example:
 ```python
-from mplang.v2.dialects import tensor, phe
-import mplang.v2.edsl.typing as elt
+from mplang.dialects import tensor, phe
+import mplang.edsl.typing as elt
 import numpy as np
 
 # 1. Generate keys (cryptographic only)
@@ -75,9 +75,9 @@ from __future__ import annotations
 from collections.abc import Callable
 from typing import Any, NamedTuple
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
-from mplang.v2.dialects import tensor
+import mplang.edsl as el
+import mplang.edsl.typing as elt
+from mplang.dialects import tensor
 
 # ==============================================================================
 # --- Type Definitions
@@ -415,7 +415,7 @@ def create_encoder(
         PHE encoder configured for the specified dtype
 
     Example:
-        >>> import mplang.v2.edsl.typing as elt
+        >>> import mplang.edsl.typing as elt
         >>>
         >>> # Float encoder with 16-bit fractional precision
         >>> encoder_f64 = phe.create_encoder(dtype=elt.f64, fxp_bits=16)

mplang/{v2/dialects → dialects}/simp.py

@@ -36,8 +36,8 @@ from typing import Any, cast
 
 from jax.tree_util import tree_flatten, tree_unflatten
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
+import mplang.edsl as el
+import mplang.edsl.typing as elt
 
 # ---------------------------------------------------------------------------
 # Global configuration
@@ -809,7 +809,7 @@ def constant(parties: tuple[int, ...], data: Any) -> el.Object:
     import jax.numpy as jnp
     import numpy as np
 
-    from mplang.v2.dialects import table, tensor
+    from mplang.dialects import table, tensor
 
     # 1. Scalars (int, float, bool, numpy scalars)
     if isinstance(data, (int, float, bool, np.number, np.bool_)):
@@ -888,11 +888,11 @@ def make_simulator(
         ...     result = my_func()
     """
     if enable_profiling:
-        from mplang.v2.edsl import registry
+        from mplang.edsl import registry
 
         registry.enable_profiling()
 
-    from mplang.v2.backends.simp_driver.mem import make_simulator as _make_sim
+    from mplang.backends.simp_driver.mem import make_simulator as _make_sim
 
     return _make_sim(
         world_size, cluster_spec=cluster_spec, enable_tracing=enable_tracing
@@ -917,7 +917,7 @@ def make_driver(endpoints: list[str], *, cluster_spec: Any = None) -> Any:
         >>> with interp:
         ...     result = my_func()
     """
-    from mplang.v2.backends.simp_driver.http import make_driver as _make_drv
+    from mplang.backends.simp_driver.http import make_driver as _make_drv
 
     return _make_drv(endpoints, cluster_spec=cluster_spec)
 

mplang/{v2/dialects → dialects}/spu.py

@@ -27,8 +27,8 @@ Concepts:
 Example:
 ```python
 import jax.numpy as jnp
-from mplang.v2.dialects import spu, tensor, simp
-import mplang.v2.edsl.typing as elt
+from mplang.dialects import spu, tensor, simp
+import mplang.edsl.typing as elt
 
 # 0. Setup
 spu_device = spu.SPUDevice(parties=(0, 1, 2))
@@ -83,11 +83,11 @@ import spu.utils.frontend as spu_fe
 from jax import ShapeDtypeStruct
 from jax.tree_util import tree_flatten, tree_unflatten
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
-from mplang.v1.utils.func_utils import normalize_fn
-from mplang.v2.dialects import dtypes
-from mplang.v2.edsl import serde
+import mplang.edsl as el
+import mplang.edsl.typing as elt
+from mplang.dialects import dtypes
+from mplang.edsl import serde
+from mplang.utils import normalize_fn
 
 # ==============================================================================
 # --- Configuration

mplang/{v2/dialects → dialects}/store.py

@@ -16,8 +16,8 @@
 
 from __future__ import annotations
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
+import mplang.edsl as el
+import mplang.edsl.typing as elt
 
 save_p: el.Primitive[el.Object] = el.Primitive("store.save")
 load_p: el.Primitive[el.Object] = el.Primitive("store.load")

mplang/{v2/dialects → dialects}/table.py

@@ -18,8 +18,8 @@ from __future__ import annotations
 
 from typing import Any, cast
 
-import mplang.v2.edsl as el
-import mplang.v2.edsl.typing as elt
+import mplang.edsl as el
+import mplang.edsl.typing as elt
 
 run_sql_p: el.Primitive[Any] = el.Primitive("table.run_sql")
 table2tensor_p: el.Primitive[el.Object] = el.Primitive("table.table2tensor")
@@ -182,7 +182,7 @@ def _constant_ae(*, data: Any) -> elt.TableType:
     import pandas as pd
     import pyarrow as pa
 
-    from mplang.v2.dialects import dtypes
+    from mplang.dialects import dtypes
 
     # Handle PyArrow Table directly
     if isinstance(data, pa.Table):