105f1dc09e
Implements ADR-0027 Phase 2 end-to-end. All 559 tests pass (was 523 + 1 xfail; ring_default_ws strict-xfail is now resolved). D0 — Worker-wait generalization (context.py): - _pending_worker_waits queue on RuntimeContext. - ctx.wait(h) in worker context defers to main via g.parent.switch(). Fast-path for already-completed handles. - Worker API is unchanged: tensor deploy, launch, etc. still look synchronous; they're transparently cooperatively scheduled. - Solves ADR-0024 Phase B kernel-greenlet orphan bug (env.run now only ever drives from main; kernel _parent is always main). D0.5 — Host-read barrier (tensor.py): - Explicit _HOST_READ_BARRIERS registry (T5.g closed-set via code review, not reflection-magic). - numpy/data/__getitem__/__repr__ drain pending worker-waits before host-observable read. - copy_: source-side barrier via source.numpy(). Target-side write barrier is intentionally NOT applied — global pending target barrier prematurely drains cross-rank collectives → deadlock. - Collective pending is excluded from barrier drain condition (collective is cross-rank; its own yield in all_reduce covers the invariant naturally). D1 — torch.multiprocessing.spawn (runtime_api/multiprocessing.py): - API signature parity with real PyTorch spawn; execution is cooperative greenlet scheduler (process isolation etc. are explicit non-goals per D1.0). - _drain_pending drains worker-waits then collectives in one barrier, loop-until-empty. - Round-based exception handling with SystemExit sibling abort + SpawnException(errors) wrapping root-cause ranks. - RuntimeContext attaches ctx.multiprocessing in __post_init__. - benches/ccl_allreduce.py hand-rolled loop collapses to one torch.multiprocessing.spawn call. D2–D6 — kernbench.tp package: - parallel_state: initialize_model_parallel, get_*_rank, get_*_world_size, with weak active-ctx registry in context.py. - layers: ColumnParallelLinear, RowParallelLinear (shape-only primitives — fp16 gemm via tl.load + tl.dot + tl.store). - kernels: _gemm_kernel used by TP layers (self-contained; no bench dependency). - primitives / mappings stubs per D6/D8. Data-path fixes (surfaced by TP gemm + all_reduce sequence): - sim_engine/op_log.py: dma_write snapshot is skipped for TCM sources (PE scratch is repopulated by Phase 2 math/gemm replay — capturing Phase-1-time snapshot picked up STALE data from prior kernel's output aliased at the same scratch addr, causing the later kernel's dma_write to overwrite Phase 2 result with stale value). - sim_engine/op_log.py + sim_engine/data_executor.py: per-operand space recorded on GemmCmd and composite gemm records so HBM-resident operands (tl.load output) don't default to TCM during replay. - runtime_api/context.py: ctx.zeros writes zero-init to MemoryStore at VA keys so kernels reading via VA see deterministic init even without explicit copy_(). Tests (Phase 1 + Phase 2): - test_worker_wait_drain (T3): orphan invariant + resume + multi-rank drain + idempotency + exception propagation. - test_mp_spawn (T4): spawn shape + bind + SpawnException scope. - test_host_read_barrier (T5): barrier contract per entry-point + closed-set registry check. - test_tp_parallel_state (T1): initialize + rank lookup. - test_tp_layers (T2): shape + deterministic numerical correctness (concat-matmul equality for RowParallel, not mean-only). - test_tp_mlp (T6): full 2-layer MLP with deterministic weight numerical match + rank-consistency post all-reduce. - test_ccl_allreduce_matrix: ring_default_ws xfail removed (T7). Regression: 523 pre + 35 new + 1 ex-xfail = 559 passed, 1 intentional skip (T3.e historical failure documentation). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
239 lines
9.0 KiB
Python
239 lines
9.0 KiB
Python
"""ADR-0027 T6: End-to-end 2-layer MLP with TP.
|
|
|
|
Phase 1: fails at imports. Phase 2 lands the TP package + D7 bench pattern
|
|
and these pass with numerical-correctness checks.
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import numpy as np
|
|
import pytest
|
|
|
|
|
|
def _make_ctx(topology):
|
|
from kernbench.runtime_api.context import RuntimeContext
|
|
from kernbench.runtime_api.types import DeviceSelector
|
|
from kernbench.sim_engine.engine import GraphEngine
|
|
|
|
engine = GraphEngine(topology.topology_obj, enable_data=True)
|
|
return RuntimeContext(
|
|
engine=engine,
|
|
target_device=DeviceSelector("all"),
|
|
correlation_id="test_t6",
|
|
spec=topology.topology_obj.spec,
|
|
)
|
|
|
|
|
|
def _replicate_dp():
|
|
from kernbench.policy.placement.dp import DPPolicy
|
|
return DPPolicy(cube="replicate", pe="replicate", num_cubes=1, num_pes=1)
|
|
|
|
|
|
# ── T6.a: zero-weight smoke ──────────────────────────────────────────
|
|
|
|
|
|
def test_mlp_zero_weight_produces_zero_output(topology):
|
|
"""T6.a: zero-init weight → output ≈ 0 for every rank."""
|
|
import kernbench.tp as tp
|
|
|
|
with _make_ctx(topology) as ctx:
|
|
ctx.distributed.init_process_group(backend="ahbm")
|
|
ws = ctx.distributed.get_world_size()
|
|
tp.initialize_model_parallel(ws)
|
|
|
|
B, D_in, D_hidden, D_out = 1, 32, 32 * ws, 32
|
|
outputs: dict[int, np.ndarray] = {}
|
|
|
|
def _worker(rank: int):
|
|
ctx.ahbm.set_device(rank)
|
|
fc1 = tp.ColumnParallelLinear(D_in, D_hidden, torch=ctx)
|
|
fc2 = tp.RowParallelLinear(D_hidden, D_out, torch=ctx)
|
|
|
|
x = ctx.zeros((B, D_in), dtype="f16",
|
|
dp=_replicate_dp(), name=f"t6a_x_r{rank}")
|
|
from kernbench.runtime_api.tensor import Tensor
|
|
hx = Tensor(shape=(B, D_in), dtype="f16", name="host_x")
|
|
hx._host_buffer = np.full((B, D_in), 0.1, dtype=np.float16)
|
|
x.copy_(hx)
|
|
|
|
h = fc1.forward(x)
|
|
y = fc2.forward(h)
|
|
outputs[rank] = y.numpy()
|
|
|
|
ctx.multiprocessing.spawn(_worker, args=(), nprocs=ws)
|
|
|
|
for r, out in outputs.items():
|
|
assert np.allclose(out, 0.0, atol=1e-2), (
|
|
f"rank {r}: zero-weight output should be ~0; got mean={out.mean()}"
|
|
)
|
|
|
|
|
|
# ── T6.b: deterministic weight + numerical check ─────────────────────
|
|
|
|
|
|
def test_mlp_deterministic_weight_matches_reference(topology):
|
|
"""T6.b: non-zero deterministic weights → output matches numpy reference."""
|
|
import kernbench.tp as tp
|
|
from kernbench.runtime_api.tensor import Tensor
|
|
|
|
with _make_ctx(topology) as ctx:
|
|
ctx.distributed.init_process_group(backend="ahbm")
|
|
ws = ctx.distributed.get_world_size()
|
|
tp.initialize_model_parallel(ws)
|
|
|
|
B, D_in, D_hidden, D_out = 1, 16, 16 * ws, 16
|
|
# W1 (D_in, D_hidden) — column-sharded; per rank: (D_in, D_hidden/ws)
|
|
# W2 (D_hidden, D_out) — row-sharded; per rank: (D_hidden/ws, D_out)
|
|
# Constant values: W1 = 0.02, W2 = 0.03, x = 0.1 (all fp16).
|
|
X_VAL, W1_VAL, W2_VAL = 0.1, 0.02, 0.03
|
|
|
|
outputs: dict[int, np.ndarray] = {}
|
|
|
|
def _worker(rank: int):
|
|
ctx.ahbm.set_device(rank)
|
|
fc1 = tp.ColumnParallelLinear(D_in, D_hidden, torch=ctx)
|
|
fc2 = tp.RowParallelLinear(D_hidden, D_out, torch=ctx)
|
|
|
|
# W1 slice (per rank column slice)
|
|
k_local_1 = D_hidden // ws
|
|
w1_np = np.full((D_in, k_local_1), W1_VAL, dtype=np.float16)
|
|
src1 = Tensor(shape=w1_np.shape, dtype="f16", name="host_w1")
|
|
src1._host_buffer = w1_np
|
|
fc1.weight.copy_(src1)
|
|
|
|
# W2 slice (per rank row slice)
|
|
n_local_2 = D_hidden // ws
|
|
w2_np = np.full((n_local_2, D_out), W2_VAL, dtype=np.float16)
|
|
src2 = Tensor(shape=w2_np.shape, dtype="f16", name="host_w2")
|
|
src2._host_buffer = w2_np
|
|
fc2.weight.copy_(src2)
|
|
|
|
# Input x (full-replicated constant)
|
|
x = ctx.zeros((B, D_in), dtype="f16",
|
|
dp=_replicate_dp(), name=f"t6b_x_r{rank}")
|
|
hx = Tensor(shape=(B, D_in), dtype="f16", name="host_x")
|
|
hx._host_buffer = np.full((B, D_in), X_VAL, dtype=np.float16)
|
|
x.copy_(hx)
|
|
|
|
h = fc1.forward(x)
|
|
y = fc2.forward(h)
|
|
outputs[rank] = y.numpy().astype(np.float32)
|
|
|
|
ctx.multiprocessing.spawn(_worker, args=(), nprocs=ws)
|
|
|
|
# Host reference: y = x @ W1_full @ W2_full
|
|
w1_full = np.full((D_in, D_hidden), W1_VAL, dtype=np.float32)
|
|
w2_full = np.full((D_hidden, D_out), W2_VAL, dtype=np.float32)
|
|
x_full = np.full((B, D_in), X_VAL, dtype=np.float32)
|
|
expected = x_full @ w1_full @ w2_full
|
|
|
|
for r, out in outputs.items():
|
|
assert out.shape == (B, D_out)
|
|
assert np.allclose(out, expected, rtol=1e-2, atol=1e-2), (
|
|
f"rank {r}: MLP output != reference "
|
|
f"(got mean={out.mean():.4f}, expected={expected.mean():.4f})"
|
|
)
|
|
|
|
|
|
# ── T6.c: rank-consistency after final all_reduce ────────────────────
|
|
|
|
|
|
def test_mlp_rank_consistency_after_all_reduce(topology):
|
|
"""T6.c: all ranks see elementwise-identical final output."""
|
|
import kernbench.tp as tp
|
|
from kernbench.runtime_api.tensor import Tensor
|
|
|
|
with _make_ctx(topology) as ctx:
|
|
ctx.distributed.init_process_group(backend="ahbm")
|
|
ws = ctx.distributed.get_world_size()
|
|
tp.initialize_model_parallel(ws)
|
|
|
|
B, D_in, D_hidden, D_out = 1, 16, 16 * ws, 16
|
|
outputs: dict[int, np.ndarray] = {}
|
|
|
|
def _worker(rank: int):
|
|
ctx.ahbm.set_device(rank)
|
|
fc1 = tp.ColumnParallelLinear(D_in, D_hidden, torch=ctx)
|
|
fc2 = tp.RowParallelLinear(D_hidden, D_out, torch=ctx)
|
|
|
|
# Zero weights OK for this check — just need all_reduce to run.
|
|
x = ctx.zeros((B, D_in), dtype="f16",
|
|
dp=_replicate_dp(), name=f"t6c_x_r{rank}")
|
|
hx = Tensor(shape=(B, D_in), dtype="f16", name="host_x")
|
|
hx._host_buffer = np.full((B, D_in), 0.1, dtype=np.float16)
|
|
x.copy_(hx)
|
|
|
|
h = fc1.forward(x)
|
|
y = fc2.forward(h)
|
|
outputs[rank] = y.numpy()
|
|
|
|
ctx.multiprocessing.spawn(_worker, args=(), nprocs=ws)
|
|
|
|
ref = outputs[0]
|
|
for r, out in outputs.items():
|
|
assert np.array_equal(out, ref), (
|
|
f"rank {r} output differs from rank 0 — all-reduce should "
|
|
f"make every rank see the same final tensor"
|
|
)
|
|
|
|
|
|
# ── T6.d: shape contract ─────────────────────────────────────────────
|
|
|
|
|
|
def test_mlp_shape_contract(topology):
|
|
"""T6.d: ColumnParallel → (B, D_hidden/ws); RowParallel → (B, D_out)."""
|
|
import kernbench.tp as tp
|
|
|
|
with _make_ctx(topology) as ctx:
|
|
ctx.distributed.init_process_group(backend="ahbm")
|
|
ws = ctx.distributed.get_world_size()
|
|
tp.initialize_model_parallel(ws)
|
|
|
|
B, D_in, D_hidden, D_out = 1, 16, 16 * ws, 16
|
|
|
|
def _worker(rank: int):
|
|
ctx.ahbm.set_device(rank)
|
|
fc1 = tp.ColumnParallelLinear(D_in, D_hidden, torch=ctx)
|
|
fc2 = tp.RowParallelLinear(D_hidden, D_out, torch=ctx)
|
|
|
|
x = ctx.zeros((B, D_in), dtype="f16",
|
|
dp=_replicate_dp(), name=f"t6d_x_r{rank}")
|
|
h = fc1.forward(x)
|
|
assert h.shape == (B, D_hidden // ws), (
|
|
f"ColumnParallel output shape: {h.shape} != (B, D_hidden/ws)"
|
|
)
|
|
y = fc2.forward(h)
|
|
assert y.shape == (B, D_out), (
|
|
f"RowParallel output shape: {y.shape} != (B, D_out)"
|
|
)
|
|
|
|
ctx.multiprocessing.spawn(_worker, args=(), nprocs=ws)
|
|
|
|
|
|
# ── liveness: deadlock 없음 (pytest timeout 간접 검증) ───────────────
|
|
|
|
|
|
def test_mlp_completes_without_deadlock(topology):
|
|
"""Structural: full E2E spawn returns within a reasonable wall-clock.
|
|
|
|
Relies on the test suite's overall timeout harness. If this hangs
|
|
beyond ~60s it would surface as a pytest timeout — a deadlock
|
|
regression in the scheduler loop would manifest here."""
|
|
import kernbench.tp as tp
|
|
|
|
with _make_ctx(topology) as ctx:
|
|
ctx.distributed.init_process_group(backend="ahbm")
|
|
ws = ctx.distributed.get_world_size()
|
|
tp.initialize_model_parallel(ws)
|
|
|
|
def _worker(rank: int):
|
|
ctx.ahbm.set_device(rank)
|
|
fc1 = tp.ColumnParallelLinear(16, 16 * ws, torch=ctx)
|
|
fc2 = tp.RowParallelLinear(16 * ws, 16, torch=ctx)
|
|
x = ctx.zeros((1, 16), dtype="f16",
|
|
dp=_replicate_dp(), name=f"t6live_r{rank}")
|
|
h = fc1.forward(x)
|
|
y = fc2.forward(h)
|
|
_ = y.numpy()
|
|
|
|
ctx.multiprocessing.spawn(_worker, args=(), nprocs=ws)
|