mirror of
https://github.com/ruvnet/RuView
synced 2026-07-20 17:03:24 +00:00
17471e93ff
* feat(calibration): NodeGeometry transceiver-geometry recording (ADR-152 §2.1.1) PerceptAlign-motivated geometry capture at enrollment: per-node optional records (position, antenna orientation, inter-node distances, acquisition method) — recorded when known, never required. Event-sourced via EnrollmentEvent::GeometryRecorded (latest recording wins); persisted on SpecialistBank with serde defaults so pre-ADR-152 bank JSON loads cleanly (fixture-proven, and geometry-free banks serialize byte-shape-identical to the old schema); threaded through MultiNodeMixture as data only — the learned geometry embeddings and algorithmic fusion use are §2.1.2, deliberately deferred until the ADR-151 P6 LoRA heads exist. Geometry recorded from now on means banks captured today remain usable for layout-conditioned training later — you can't retroactively add geometry to data you didn't record. 8 new tests (3 geometry, 2 anchor, 2 bank, 1 multistatic) + full-loop extension (2-node geometry, one tape-measured + one unknown, surviving the bank JSON round-trip the runtime loads from). 50/50 calibration (both feature configs) + 23 CLI tests green. Co-Authored-By: RuFlo <ruv@ruv.net> * feat(training): two-checkerboard camera↔room calibration for ADR-079 labels (ADR-152 §2.1.3) Defends the camera-supervised pipeline against PerceptAlign's "coordinate overfitting": MediaPipe keypoints were emitted in raw camera coordinates with no shared frame and no transceiver-geometry metadata — the exact label shape that memorizes deployment layout and collapses cross-layout. - scripts/calibrate-camera-room.py + calibration_lib.py: OpenCV two-checkerboard calibration → versioned bundle JSON (intrinsics, camera→room extrinsics, checkerboard spec, transceiver geometry, sha256 calibration_id). Intrinsics resolve from file > cache > multi-view computation > loud-warning 2-view fallback. - collect-ground-truth.py --calibration <bundle>: every sample gains keypoints_room (unit bearing rays from the camera center in the room frame — documented projective alignment; raw image coords preserved so training chooses), camera_origin_room, calibration_id, and the transceiver geometry stamp. Without the flag, output is byte-identical to before (tested) + a one-line ADR-152 warning. Design finding (recorded for ADR-152): a single planar checkerboard's corner grid is centrosymmetric — the reversed corner ordering fits a ghost camera pose with IDENTICAL reprojection error, so per-board flip disambiguation is mathematically ill-posed. solve_two_board_extrinsics solves the joint wall+floor set over all 4 flip combinations, where the minimum is unique — an independent reason the TWO-checkerboard method is required, beyond what PerceptAlign states. 15 headless pytest tests green (synthetic corners: extrinsics recovery incl. ghost resolution, bundle round-trip + hash stability, ray transforms w/ distortion + cross-resolution, no-calibration byte identity). Co-Authored-By: RuFlo <ruv@ruv.net> * feat(benchmarks): WiFlow-STD reproduction harness + measurement (a) results (ADR-152 §2.2) Shipped checkpoint REFUTED (0.08% PCK@20, wrong keypoint normalization); 6 reproducibility defects documented (broken imports, corrupted dataset tail with float32-max garbage that NaN-poisons fp16 BatchNorm, unreachable test phase). After repairs, retraining with upstream defaults reproduces 96.09% PCK@20 full-test / 96.61% corruption-free (published 97.25%) on RTX 5080. Claims graded MEASURED-EQUIVALENT; 2.23M params + ~0.055 GFLOPs verified. Third-party code/weights/data stay out of tree (gitignored). Co-Authored-By: claude-flow <ruv@ruv.net> * feat: ADR-152 Rust integrations + ADR-153 802.11bf protocol model - calibration: GeometryEmbedding — 32-slot permutation-invariant NodeGeometry featurization for future LoRA-head conditioning (ADR-152 §2.1.2); derived SpecialistBank::geometry_embedding() accessor; 59 tests - train: MaePretrainConfig + patchify/random-mask with UNSW measured recipe (80% masking, (30,3) patches; ADR-152 §2.3, arXiv 2511.18792); strict no-truncate/no-NaN policy; proptest properties - train: WiFlowStdModel — tch-gated port of the verified ~96%-PCK@20 WiFlow-STD architecture (ADR-152 §2.2 beyond-SOTA); ungated param formula pinned to 2,225,042; 15/17-keypoint support; 239 crate tests - hardware: ieee80211bf forward-compatibility protocol model (ADR-153): SpecProfile gates, SensingCapabilities negotiation, required ConsentMode, session FSM, SensingTransport + SimTransport + OpportunisticCsiBridge; full acceptance checklist covered; 156+4 tests - deps: ruvector bumps per ADR-152 §2.6 survey (mincut/solver 2.0.6, attention 2.1.0, gnn 2.2.0); vendor/ruvector synced to a083bd77f - docs: ADR-153 accepted; ADR-152 §2.2 status, §2.4 amendment, §2.6 added Workspace: 162 test suites green (--no-default-features); Python proof PASS. Known pre-existing flake: homecore-api env_empty_falls_back_to_defaults (unserialized env-var mutation) — untouched, follow-up. Co-Authored-By: claude-flow <ruv@ruv.net> * docs: CHANGELOG + CLAUDE.md entries for ADR-152 integrations and ADR-153 Co-Authored-By: claude-flow <ruv@ruv.net> * fix(train): repair tch-backend bit-rot — gated path compiles and tests run again Mechanical API refresh against current tch: Vec::from(Tensor) -> try_from (+ explicit flatten), numel() usize cast, Rem/div ops -> remainder() / divide_scalar_mode(floor) — the latter fixed a silent true-division bug in heatmap argmax decoding; clamp(1.0, f64::MAX) -> clamp_min (torch 2.x scalar overflow panic); petgraph EdgeRef import; missing EvalMetrics and verify_checkpoint_dir APIs that tests documented. wiflow_std roundtrip test uses safetensors (.pt _save_parameters roundtrip broken in torch 2.11 Windows). Gated: 349 passed (incl. all 20 wiflow_std); ungated: unchanged. Known pre-existing: gaussian-heatmap convention mismatch (2 tests), proof seed race under parallel threads — documented, deliberate follow-ups. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(train): WiFlow-STD PyTorch->tch weight import + numerical parity proof export_to_safetensors.py maps the retrained checkpoint (295 tensors -> 248 mapped, param sum exactly 2,225,042; num_batches_tracked dropped) into a tch-loadable safetensors plus a deterministic parity fixture. Gated #[ignore] integration test loads it strictly and asserts forward-pass agreement: max abs diff 1.192e-7 on the seed-42 fixture. dump_variable_names test makes the tch name layout authoritative. Zero architecture discrepancies found. Co-Authored-By: claude-flow <ruv@ruv.net> * fix: workflow-review findings — BN gamma init, ThresholdParams serde, init docs Concurrent validation workflow (2 review lanes + adversarial verification, 13 agents): 5 confirmed findings, 3 refuted. Fixes: - wiflow_std: pin BatchNorm gamma to 1.0 (tch default draws Uniform(0,1) — silently halves activations in from-scratch training; loaded checkpoints unaffected, parity re-verified after the change) - wiflow_std: document the conv-init divergences vs the reference's effective kaiming_normal(fan_out) re-init (from-scratch dynamics only) - ieee80211bf: ThresholdParams deserialization validates via try_from so the <=100 invariant holds for untrusted payloads (+ rejection test) Benchmarks (release, ruvzen): GeometryEmbedding 1.84us/call (542k/s), MAE tokenization 7.38us/window (135k/s), 802.11bf FSM 8.9M events/s — nothing suspicious. Co-Authored-By: claude-flow <ruv@ruv.net> * docs(adr): ADR-152 §2.1.4 gate resolved — PerceptAlign repo MIT, dataset on HF Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): edge optimization measured + measurement (b) blocked + 92.9% retraction Edge optimization (ADR-152 optimize track): ONNX Runtime fp32 is the CPU latency win (3.2 ms/window, ~3.4x faster than torch, parity 2.4e-7); ORT dynamic int8 reaches 2.44 MB (paper's ~2.2 MB claim plausible only via conv-capable toolchains; -0.16pt PCK@20, +18% MPJPE, 2x slower); torch dynamic quant converts 0% of this conv-only model; fp16 halves storage free but is slower on CPU. Measurement (b) BLOCKED-ON-DATA: only 1,077 paired ESP32 windows exist (stop rule <2k). Forensic recheck of the surviving April holdout RETRACTS the ADR-079 '92.9% PCK@20' figure: constant-output model, absolute (not torso) threshold, 69 near-static frames — mean predictor scores 100% under that protocol; torso-PCK@20 is 19.1%. Corroborates PR #535. Stale citations removed from user-guide, readme-details, ADR-152 §2.1.3; no-citation rule extended to ADR-079 accuracy claims. Unblock: >=2k-window multi-pose paired session + torso-PCK re-baseline. Co-Authored-By: claude-flow <ruv@ruv.net> * docs(user-guide): corrected camera-supervised collection tutorial Step 0 CSI-rate check + session-length math (window yield = frames/20 — the May session's 8x under-delivery was a ~12 Hz CSI rate, not an aligner bug); two-checkerboard calibration step (ADR-152 §2.1.3); pose-variety and confidence guidance; torso-normalized PCK + temporal-split + pred-variance eval protocol (lessons from the 92.9% retraction); scale presets re-keyed to realistic window counts. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): static PTQ int8 (calibrated) results + overnight capture script Conv-only static QDQ beats dynamic int8 on accuracy (PCK@20 96.61-96.63% vs 96.52%, MPJPE +10% vs +18% over fp32) at ~equal size/latency; all-ops QDQ strictly worse (int8 activations through attention glue). Entropy calibration verified bit-identical to MinMax on this data. Deployment: ONNX fp32 for speed (3.2ms), static conv-only QDQ for smallest (2.53MB). Also: scripts/overnight-empty-capture.py — segmented UDP CSI recorder for empty-room baselines (no glob collisions, detach-safe). Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): measurement (b) MEASURED — optimization transfer only, mean-pose baseline wins WiFlow-STD fine-tuned on 2,046 fresh single-room ESP32 paired windows (temporal 70/15/15, 70->540 adapter, K=17): pretrained-init 65% PCK@20 vs scratch 0% (optimization transfer) but frozen-trunk ~0% (no feature transfer), and NOTHING beats the mean-pose baseline (95.9% PCK@20 — single subject, near-static normalized coords). Honesty gates held: pred std 0.0113 (non-constant model) but mean-baseline dominance means no citable CSI->pose capability from this data. ADR-152 open question 1 answered partially; definitive answer needs multi-subject/position data. Two new aligner findings: heterogeneous csi_shape with silent zero-padding (~20%), and extractCsiMatrix's transposed shape label (frame-major data, [nSc, nFrames] label) — fixes pending. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(benchmarks): efficiency sweep MEASURED — half model dominates full reference Compact WiFlow-STD variants on the same data/split/protocol: half (843,834 params, 0.38x) strictly dominates the 2.23M reference (PCK@20 96.62 vs 96.61, PCK@50 99.47 vs 99.11, MPJPE 0.00898 vs 0.0094) — the published architecture is over-parameterized for its own benchmark. quarter (338k) 96.05%; tiny (56,290 params, 1/39.5) holds 94.11% — a ~220KB fp32 edge candidate. In-domain caveats recorded; cross-domain untested. Co-Authored-By: claude-flow <ruv@ruv.net> * feat(train): compact WiFlow-STD presets in Rust + tiny edge artifact (ADR-152) WiFlowStdConfig gains half()/quarter()/tiny() mirroring the overnight sweep exactly: TcnGroupsMode (Fixed/Gcd/Depthwise), input_pw_groups, derived stride schedule and decoder-mid (all default to upstream behavior; legacy serde JSON unaffected). Param formulas pin to trained ground truth first try: 843,834 / 338,600 / 56,290; default 2,225,042 pin and 1.192e-7 parity unchanged. 248 tests green. Tiny edge artifact (tiny_edge_bench.py): ONNX fp32 = 295 KB, 0.66 ms/win (~1,500/s CPU), 94.11% PCK@20 (matches sweep clean-test exactly; parity 1.49e-7). Static int8 is a bad trade at this scale (-1.43pt, +19% MPJPE, -16% size, slower) — recorded as negative result. Export note: width-16 breaks AdaptiveAvgPool((15,1)) TorchScript export; replaced by exact mean+matmul equivalent, proven by parity. Co-Authored-By: claude-flow <ruv@ruv.net> * fix: resolve all 10 confirmed code-review findings (7-angle review, 20/20 verified) wiflow_std: min_feature_width (default 15) replaces the keypoints->stride coupling — for_keypoints(17) now provably builds the trained [2,2,2,2] graph and pools 15->17, matching the validated Python protocol (pinned by tests); param_count() total on invalid configs; random_mask returns Result and rejects non-finite/out-of-range ratios; trainer checkpoints switched to safetensors (.pt VarStore roundtrip broken on Windows torch 2.11). ieee80211bf: SBP proxy now re-triggers instances and relays reports via Action::RelaySbpReport -> SensingFrame::SbpReport (clients consume via their existing path); missed_instances reset on success = consecutive semantics; SessionTable gains a guarded SBP entry point + unknown-id drop counter; initiator-role sessions reject inbound setup/SBP requests (RejectedNotSupported) closing the idle hijack; StartSetup/StartSbp outside Idle return InvalidStateForCommand; SBP validation unified through evaluate_setup with a 1:1 SetupStatus->SbpStatus mapping. events.rs split out to honor the 500-line cap. calibration/cli: enrollment geometry now actually reaches trained banks — both production call sites attach .with_geometry; --geometry flag on train-room and POST /enroll/geometry + train-body geometry on calibrate-serve give production a recording surface; geometry-free banks log the ADR-152 §2.1.2 note. benchmarks: corruption masks committed as ground truth (unregenerable after in-place cleaning; verified bit-identical regeneration from the pristine copy) + generate_corruption_masks.py producer; _bench_common.py dedups the 5x-copied shim/evaluate/seed/remap (post-refactor PCK@20 re-verified equal to the last digit); remote scripts get the mmap patch; tiny_edge --calib validated multiple-of-64; onnx_bench --help no longer executes (and overwrote) the export — artifact restored byte-exact. Workspace: 2,963 tests passed, 0 failed; Python proof PASS. Co-Authored-By: claude-flow <ruv@ruv.net> * ci: build workspace tests without debuginfo — runner disk exhaustion The combined 38-crate debug target exceeds the GitHub runner's disk ('final link failed: No space left on device'); the same tree measured 151GB locally with full debuginfo. CARGO_PROFILE_{DEV,TEST}_DEBUG=0 shrinks the target ~5-10x; debuginfo serves no purpose in CI test runs. Co-Authored-By: claude-flow <ruv@ruv.net>
375 lines
17 KiB
Python
375 lines
17 KiB
Python
"""ADR-152 SS2.2 measurement (b): WiFlow-STD fine-tuned on our fresh ESP32 paired dataset.
|
|
|
|
Dataset: ~/wiflow-std-bench/paired-20260610.jsonl -- 2,046 paired windows collected
|
|
2026-06-10 22:10-22:40 (ONE subject, ONE room, ONE ESP32 node, varied poses).
|
|
Per record: csi = flat float32 list, csi_shape, kp = 17 COCO [x, y] normalized [0,1]
|
|
camera coords, conf (MediaPipe mean confidence, all > 0.5 in this set), ts_start/ts_end.
|
|
Aligner: scripts/align-ground-truth.js, non-overlapping 20-frame windows (~0.42 s each).
|
|
|
|
Dataset findings (MEASURED on this file, 2026-06-10):
|
|
- csi_shape is HETEROGENEOUS, not uniformly [70, 20]: 1,347x [70,20], 284x [134,20],
|
|
243x [26,20], 130x [12,20], 42x [20,20]. The ESP32 stream emits mixed frame types
|
|
and the aligner stamps each window's subcarrier count from frame[0]
|
|
(extractCsiMatrix: nSc = window[0].subcarriers), zero-padding/truncating the rest.
|
|
Even native-70 windows contain ~20.4% internally zero-padded short frames
|
|
(subcarriers 40..69 all-zero for those frames).
|
|
- LAYOUT BUG: the aligner fills matrix[f * nSc + s] (frame-major) but declares
|
|
shape [nSc, nFrames]. The true layout is (frame, subcarrier); we reshape
|
|
(nFrames, nSc) and transpose. Confirmed by coherent per-frame zero-tails.
|
|
- Handling here (primary suite, "all2046"): every frame's subcarrier axis is
|
|
linearly resampled to 70 bins (np.interp over a normalized index domain;
|
|
identity for native-70 frames) so the pre-registered n=2,046 and split sizes
|
|
hold. Secondary suite ("native70") restricts to the 1,347 native [70,20]
|
|
windows (temporal 70/15/15 of those) as a homogeneity robustness check.
|
|
|
|
Pre-registered protocol (followed exactly):
|
|
1. TEMPORAL split (records are time-sorted; asserted): first 70% train (1,432),
|
|
next 15% val (307), last 15% test (307). No shuffling across time. Seed 42
|
|
for everything else.
|
|
2. Model: upstream WiFlow-STD trunk (WiFlowPoseModel) with a learned 1x1 Conv1d
|
|
projection 70->540 prepended, and K=17 via the parameter-free adaptive pool
|
|
(AdaptiveAvgPool2d((17, 1)) instead of (15, 1)) -- pretrained weights load
|
|
for any K. CSI normalization: divide by the TRAIN-split 99th-percentile
|
|
amplitude, clip to [0, 1] (documented in output JSON).
|
|
3. Three runs, <=60 epochs, early-stop patience 8 on val MPJPE, batch 32,
|
|
AdamW, fp32 (no autocast):
|
|
(i) pretrained-init: trunk init from upstream/test/best_pose_model.pth
|
|
(the measurement-(a) retrained checkpoint, ~96% PCK@20 on WiFlow data;
|
|
key remap att.->attention. / final_conv.->decoder. applied defensively
|
|
as in eval_repro.py -- a no-op for this checkpoint, which already uses
|
|
the new names). Discriminative lr: adapter 1e-4, trunk 1e-5.
|
|
(ii) scratch: same architecture, random init, all params lr 1e-4.
|
|
(iii) frozen-trunk: pretrained trunk frozen (requires_grad=False AND held in
|
|
.eval() so BatchNorm running stats cannot drift -- pure transfer probe);
|
|
only the 70->540 adapter trains, lr 1e-4.
|
|
4. Metrics on the temporal TEST split: torso-normalized PCK@10/20/30/40/50 and
|
|
MPJPE. Upstream utils/metrics.py calculate_pck(use_torso_norm=True) hardcodes
|
|
NECK_IDX/PELVIS_IDX = 2, 12 -- a 15-keypoint convention that is WRONG for our
|
|
17 COCO keypoints (2 = right_eye, 12 = right_hip). We therefore reimplement the
|
|
identical math (per-frame norm distance, clamp min 0.01, mean over all
|
|
keypoints x frames) with torso = ||l_shoulder(5) - l_hip(11)||.
|
|
Also reported: prediction std across test frames (constant-pose detector;
|
|
must be > 0) and the mean-pose-predictor baseline (train-split mean pose
|
|
evaluated on test -- the honesty bar).
|
|
|
|
Usage (on ruvultra):
|
|
nice -n 10 nohup ~/wiflow-std-bench/venv/bin/python train_measb.py > train_measb.log 2>&1 &
|
|
|
|
NOTE: deployed to ruvultra as a standalone single file, so it deliberately
|
|
inlines its helpers. The reference implementations (upstream import shim,
|
|
np.load mmap patch, key-remap loader, canonical evaluate loop) live in
|
|
benchmarks/wiflow-std/_bench_common.py — keep copies in sync.
|
|
"""
|
|
|
|
import json
|
|
import os
|
|
import random
|
|
import sys
|
|
import time
|
|
|
|
import numpy as np
|
|
import torch
|
|
import torch.nn as nn
|
|
|
|
BENCH = os.path.expanduser("~/wiflow-std-bench")
|
|
UPSTREAM = os.path.join(BENCH, "upstream")
|
|
MEASB = os.path.join(BENCH, "measb")
|
|
DATA = os.path.join(BENCH, "paired-20260610.jsonl")
|
|
CHECKPOINT = os.path.join(UPSTREAM, "test", "best_pose_model.pth")
|
|
|
|
sys.path.insert(0, UPSTREAM)
|
|
|
|
# Upstream defect (1): models/__init__.py imports a name tcn.py does not define.
|
|
# Register a stub package so the broken __init__ never executes (as eval_repro.py).
|
|
import types # noqa: E402
|
|
|
|
_models_pkg = types.ModuleType("models")
|
|
_models_pkg.__path__ = [os.path.join(UPSTREAM, "models")]
|
|
sys.modules["models"] = _models_pkg
|
|
|
|
from models.pose_model import WiFlowPoseModel # noqa: E402
|
|
|
|
SEED = 42
|
|
K = 17
|
|
N_SUBC = 70
|
|
TRUNK_IN = 540
|
|
BATCH = 32 # <= 64 per protocol (GPU shared with the efficiency sweep)
|
|
MAX_EPOCHS = 60
|
|
PATIENCE = 8
|
|
LR_ADAPTER = 1e-4
|
|
LR_TRUNK_FT = 1e-5 # 10x lower for the pretrained trunk vs the fresh adapter
|
|
L_SHOULDER, L_HIP = 5, 11
|
|
THRESHOLDS = (0.1, 0.2, 0.3, 0.4, 0.5)
|
|
|
|
|
|
def set_seed(seed=SEED):
|
|
random.seed(seed)
|
|
np.random.seed(seed)
|
|
torch.manual_seed(seed)
|
|
if torch.cuda.is_available():
|
|
torch.cuda.manual_seed_all(seed)
|
|
torch.backends.cudnn.deterministic = True
|
|
torch.backends.cudnn.benchmark = False
|
|
|
|
|
|
def resample_subcarriers(frame_major, n_out=N_SUBC):
|
|
"""(nFrames, nSc) -> (nFrames, n_out) by per-frame linear interpolation.
|
|
|
|
Identity for nSc == n_out. Normalized index domain [0, 1] on both sides.
|
|
"""
|
|
nf, nsc = frame_major.shape
|
|
if nsc == n_out:
|
|
return frame_major
|
|
xi = np.linspace(0.0, 1.0, nsc)
|
|
xo = np.linspace(0.0, 1.0, n_out)
|
|
return np.stack([np.interp(xo, xi, frame_major[f]) for f in range(nf)]).astype(np.float32)
|
|
|
|
|
|
def load_dataset():
|
|
csi, kps, confs, ts, native70 = [], [], [], [], []
|
|
shape_counts = {}
|
|
with open(DATA) as f:
|
|
for line in f:
|
|
r = json.loads(line)
|
|
nsc, nf = r["csi_shape"]
|
|
shape_counts[f"{nsc}x{nf}"] = shape_counts.get(f"{nsc}x{nf}", 0) + 1
|
|
assert nf == 20, r["csi_shape"]
|
|
# Aligner layout bug: data is frame-major despite the declared
|
|
# [nSc, nFrames] shape -- reshape (nFrames, nSc), then resample the
|
|
# subcarrier axis to 70 and transpose to (70 subcarriers, 20 frames).
|
|
fm = np.asarray(r["csi"], dtype=np.float32).reshape(nf, nsc)
|
|
csi.append(resample_subcarriers(fm).T)
|
|
kp = np.asarray(r["kp"], dtype=np.float32)
|
|
assert kp.shape == (K, 2), kp.shape
|
|
kps.append(kp)
|
|
confs.append(r["conf"])
|
|
ts.append(r["ts_start"])
|
|
native70.append(nsc == N_SUBC)
|
|
assert all(ts[i] <= ts[i + 1] for i in range(len(ts) - 1)), "records not time-sorted"
|
|
return (np.stack(csi), np.stack(kps), np.asarray(confs, dtype=np.float32),
|
|
np.asarray(native70), shape_counts, ts[0], ts[-1])
|
|
|
|
|
|
def temporal_split(n):
|
|
n_train = int(round(n * 0.70))
|
|
n_val = int(round(n * 0.15))
|
|
return slice(0, n_train), slice(n_train, n_train + n_val), slice(n_train + n_val, n)
|
|
|
|
|
|
class AdaptedWiFlow(nn.Module):
|
|
"""1x1 Conv1d adapter 70->540 + upstream WiFlow-STD trunk with K=17 pool head."""
|
|
|
|
def __init__(self, k=K, dropout=0.5):
|
|
super().__init__()
|
|
self.adapter = nn.Conv1d(N_SUBC, TRUNK_IN, kernel_size=1)
|
|
nn.init.kaiming_normal_(self.adapter.weight, mode="fan_out", nonlinearity="relu")
|
|
nn.init.constant_(self.adapter.bias, 0)
|
|
self.trunk = WiFlowPoseModel(dropout=dropout)
|
|
# K=17 via the parameter-free adaptive pool: decoder emits [B, 2, 15, 20]
|
|
# spatial maps; pooling H->17 instead of 15 yields [B, 17, 2] with no new
|
|
# parameters, so the pretrained state_dict loads strict=True for any K.
|
|
self.trunk.avg_pool = nn.AdaptiveAvgPool2d((k, 1))
|
|
|
|
def forward(self, x):
|
|
return self.trunk(self.adapter(x))
|
|
|
|
|
|
def load_pretrained_trunk(trunk, path):
|
|
state = torch.load(path, map_location="cpu", weights_only=True)
|
|
# Defensive remap as in eval_repro.py (no-op for the retrained checkpoint).
|
|
renames = {"att.": "attention.", "final_conv.": "decoder."}
|
|
state = {next((new + k[len(old):] for old, new in renames.items()
|
|
if k.startswith(old)), k): v
|
|
for k, v in state.items()}
|
|
trunk.load_state_dict(state, strict=True)
|
|
|
|
|
|
def pck_torso(pred, target, thresholds=THRESHOLDS):
|
|
"""Upstream calculate_pck math, torso = l_shoulder(5)<->l_hip(11) for 17-kp COCO."""
|
|
norm = torch.sqrt(((target[:, L_SHOULDER] - target[:, L_HIP]) ** 2).sum(dim=1))
|
|
norm = torch.clamp(norm, min=0.01)
|
|
dist = torch.sqrt(((pred - target) ** 2).sum(dim=2)) / norm.unsqueeze(1)
|
|
return {f"pck@{int(t * 100)}": (dist <= t).float().mean().item() for t in thresholds}
|
|
|
|
|
|
def mpjpe(pred, target):
|
|
return torch.sqrt(((pred - target) ** 2).sum(dim=2)).mean().item()
|
|
|
|
|
|
@torch.no_grad()
|
|
def predict(model, x, batch=256):
|
|
model.eval()
|
|
return torch.cat([model(x[i:i + batch]) for i in range(0, len(x), batch)])
|
|
|
|
|
|
def eval_preds(pred, target):
|
|
out = pck_torso(pred, target)
|
|
out["mpjpe"] = mpjpe(pred, target)
|
|
# Constant-pose detector: std across test frames per coordinate, mean over
|
|
# the 17x2 coordinates. 0.0 == degenerate constant predictor.
|
|
out["pred_std"] = pred.std(dim=0).mean().item()
|
|
return out
|
|
|
|
|
|
def train_run(name, x_tr, y_tr, x_va, y_va, device, pretrained, freeze_trunk,
|
|
lr_trunk):
|
|
set_seed(SEED)
|
|
model = AdaptedWiFlow().to(device)
|
|
if pretrained:
|
|
load_pretrained_trunk(model.trunk, CHECKPOINT)
|
|
if freeze_trunk:
|
|
for p in model.trunk.parameters():
|
|
p.requires_grad = False
|
|
groups = [{"params": model.adapter.parameters(), "lr": LR_ADAPTER}]
|
|
else:
|
|
groups = [{"params": model.adapter.parameters(), "lr": LR_ADAPTER},
|
|
{"params": model.trunk.parameters(), "lr": lr_trunk}]
|
|
opt = torch.optim.AdamW(groups)
|
|
loss_fn = nn.MSELoss()
|
|
|
|
n = len(x_tr)
|
|
best_val, best_state, best_epoch, bad = float("inf"), None, -1, 0
|
|
history = []
|
|
t0 = time.time()
|
|
for epoch in range(MAX_EPOCHS):
|
|
model.train()
|
|
if freeze_trunk:
|
|
model.trunk.eval() # keep BatchNorm running stats fixed: pure transfer
|
|
perm = torch.randperm(n, device=device)
|
|
ep_loss = 0.0
|
|
for i in range(0, n, BATCH):
|
|
idx = perm[i:i + BATCH]
|
|
opt.zero_grad()
|
|
loss = loss_fn(model(x_tr[idx]), y_tr[idx])
|
|
loss.backward()
|
|
opt.step()
|
|
ep_loss += loss.item() * len(idx)
|
|
val_mpjpe = mpjpe(predict(model, x_va), y_va)
|
|
history.append({"epoch": epoch, "train_mse": ep_loss / n, "val_mpjpe": val_mpjpe})
|
|
marker = ""
|
|
if val_mpjpe < best_val:
|
|
best_val, best_epoch, bad = val_mpjpe, epoch, 0
|
|
best_state = {k: v.detach().cpu().clone() for k, v in model.state_dict().items()}
|
|
marker = " *"
|
|
else:
|
|
bad += 1
|
|
print(f"[{name}] epoch {epoch:02d} train_mse {ep_loss / n:.6f} "
|
|
f"val_mpjpe {val_mpjpe:.5f}{marker}", flush=True)
|
|
if bad >= PATIENCE:
|
|
print(f"[{name}] early stop at epoch {epoch} (best {best_epoch})", flush=True)
|
|
break
|
|
model.load_state_dict(best_state)
|
|
torch.save(best_state, os.path.join(MEASB, f"{name}_best.pth"))
|
|
return model, {"best_epoch": best_epoch, "best_val_mpjpe": best_val,
|
|
"epochs_run": len(history), "wall_seconds": round(time.time() - t0, 1),
|
|
"history": history}
|
|
|
|
|
|
def run_suite(tag, csi, kps, device):
|
|
"""Temporal 70/15/15 split, mean-pose baseline, three training runs."""
|
|
n = len(csi)
|
|
tr, va, te = temporal_split(n)
|
|
print(f"=== suite {tag}: n={n} train={tr.stop} val={va.stop - va.start} "
|
|
f"test={te.stop - te.start} ===", flush=True)
|
|
|
|
# CSI normalization constant from TRAIN split only.
|
|
train_p99 = float(np.percentile(csi[tr], 99))
|
|
train_max = float(csi[tr].max())
|
|
print(f"[{tag}] train p99={train_p99:.3f} max={train_max:.3f} -> /p99, clip [0,1]",
|
|
flush=True)
|
|
csi_n = np.clip(csi / train_p99, 0.0, 1.0).astype(np.float32)
|
|
|
|
x = torch.from_numpy(csi_n).to(device)
|
|
y = torch.from_numpy(kps).to(device)
|
|
x_tr, y_tr = x[tr], y[tr]
|
|
x_va, y_va = x[va], y[va]
|
|
x_te, y_te = x[te], y[te]
|
|
|
|
suite = {
|
|
"n_windows": n,
|
|
"split": {"n_train": int(tr.stop), "n_val": int(va.stop - va.start),
|
|
"n_test": int(te.stop - te.start)},
|
|
"csi_norm": {"method": "divide by train-split p99 amplitude, clip [0,1]",
|
|
"train_p99": train_p99, "train_max": train_max},
|
|
"runs": {},
|
|
}
|
|
|
|
# Honesty bar: mean-pose predictor fit on TRAIN, evaluated on TEST.
|
|
mean_pose = y_tr.mean(dim=0, keepdim=True).expand(len(y_te), -1, -1)
|
|
suite["mean_pose_baseline"] = eval_preds(mean_pose, y_te)
|
|
suite["mean_pose_baseline"]["note"] = "train-split mean pose; pred_std 0 by construction"
|
|
print(f"[{tag}] mean-pose baseline:", json.dumps(suite["mean_pose_baseline"]),
|
|
flush=True)
|
|
|
|
configs = [
|
|
("pretrained", dict(pretrained=True, freeze_trunk=False, lr_trunk=LR_TRUNK_FT)),
|
|
("scratch", dict(pretrained=False, freeze_trunk=False, lr_trunk=LR_ADAPTER)),
|
|
("frozen_trunk", dict(pretrained=True, freeze_trunk=True, lr_trunk=0.0)),
|
|
]
|
|
for name, cfg in configs:
|
|
print(f"=== run: {tag}/{name} {cfg} ===", flush=True)
|
|
model, train_info = train_run(f"{tag}_{name}", x_tr, y_tr, x_va, y_va,
|
|
device, **cfg)
|
|
test_metrics = eval_preds(predict(model, x_te), y_te)
|
|
n_trainable = sum(p.numel() for p in model.parameters() if p.requires_grad)
|
|
suite["runs"][name] = {"config": cfg, "trainable_params": n_trainable,
|
|
"train": {k: v for k, v in train_info.items()
|
|
if k != "history"},
|
|
"history": train_info["history"],
|
|
"test": test_metrics}
|
|
print(f"[{tag}/{name}] TEST:", json.dumps(test_metrics), flush=True)
|
|
return suite
|
|
|
|
|
|
def main():
|
|
device = torch.device("cuda" if torch.cuda.is_available() else "cpu")
|
|
print(f"device {device}, torch {torch.__version__}", flush=True)
|
|
set_seed(SEED)
|
|
|
|
csi, kps, confs, native70, shape_counts, ts_first, ts_last = load_dataset()
|
|
print(f"shape distribution: {shape_counts}", flush=True)
|
|
|
|
results = {
|
|
"protocol": {
|
|
"dataset": DATA, "n_windows": len(csi),
|
|
"ts_first": ts_first, "ts_last": ts_last,
|
|
"conf_mean": float(confs.mean()), "conf_min": float(confs.min()),
|
|
"csi_shape_distribution": shape_counts,
|
|
"csi_layout_note": "aligner stores frame-major data under a transposed "
|
|
"[nSc, nFrames] shape label; corrected on load",
|
|
"csi_resample": "per-frame linear interp of subcarrier axis to 70 bins "
|
|
"(identity for native-70 frames); native-70 windows still "
|
|
"contain ~20.4% internally zero-padded short frames",
|
|
"split": "temporal 70/15/15 (no shuffle across time)",
|
|
"model": "1x1 Conv1d 70->540 adapter + WiFlowPoseModel trunk, "
|
|
"AdaptiveAvgPool2d((17,1)) head (parameter-free K=17)",
|
|
"checkpoint": CHECKPOINT,
|
|
"checkpoint_note": "measurement-(a) retrained checkpoint (~96% PCK@20 on "
|
|
"WiFlow data); att./final_conv. remap applied "
|
|
"defensively (no-op, already new-style keys)",
|
|
"optimizer": f"AdamW, adapter lr {LR_ADAPTER}, fine-tuned trunk lr "
|
|
f"{LR_TRUNK_FT} (10x lower), scratch all {LR_ADAPTER}",
|
|
"batch": BATCH, "max_epochs": MAX_EPOCHS, "patience": PATIENCE,
|
|
"precision": "fp32", "seed": SEED,
|
|
"pck": "torso-normalized, torso = ||l_shoulder(5) - l_hip(11)||, "
|
|
"clamp min 0.01, mean over keypoints x frames "
|
|
"(upstream math; upstream 2/12 indices are a 15-kp convention)",
|
|
},
|
|
# Primary: all 2,046 windows (pre-registered n), subcarrier axis resampled.
|
|
"all2046": None,
|
|
# Secondary robustness check: the 1,347 native [70,20] windows only.
|
|
"native70": None,
|
|
}
|
|
|
|
results["all2046"] = run_suite("all2046", csi, kps, device)
|
|
results["native70"] = run_suite("native70", csi[native70], kps[native70], device)
|
|
|
|
out = os.path.join(MEASB, "measurement_b.json")
|
|
with open(out, "w") as f:
|
|
json.dump(results, f, indent=2)
|
|
print(f"wrote {out}", flush=True)
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|