From ebb953a13f19863b478dd0695e72913ecca2977e Mon Sep 17 00:00:00 2001 From: monkey-w1n5t0n Date: Sun, 28 Jun 2026 20:47:15 +0200 Subject: [PATCH] feat(inputs): single/double controller toggle (shared core + manifold) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Toggle between one and two 2-D controllers without rebuilding the MLP. Shared core (nisps/modes/base.hpp): - ModeBase per-channel pin mask + pin_value (default 0.5). Pinned channels feed the neutral value to the MLP via effective_input(); tick_control/setup use it. Single-controller mode pins the second controller's two channels — the net is never resized, so trained state survives toggling. Manifold/browser: - Widen the WASM head MLP<2,…> -> MLP<4,10,14,18,126> (4 inputs = two 2-D controllers). All bindings are dimension-driven via DefaultMLP::kInput. - Spine holds a full N-axis input vector: axes 0,1 = primary pad (existing input pipeline), axes 2+ = secondary controller, unused axes default to neutral 0.5. engine-api.setInputs feeds the whole vector; input-layer passthrough pads 0.5 (the lossy 4->2 blend is now only a fallback for >4 axes). - Inputs dock: Controllers Single/Double(+gamepad) toggle, default single. - build-wasm.sh mirrors nisps.{js,wasm} into manifold/public. Tests/docs: - test_mode_paf_synth: pinned-inputs-neutralized covers the pin contract. - parity_check.cpp + parity_wasm.mjs exercise all 4 inputs; native↔WASM parity PASS (max delta 2.4e-7). - CLAUDE.md / MAP.md / nisps/wasm/README.md updated (no longer "fixed MLP<2,…>"). Firmware settings-menu toggle (Phase 3) still pending. --- CLAUDE.md | 4 +-- MAP.md | 2 +- manifold/public/nisps.wasm | Bin 105285 -> 103957 bytes manifold/src/console/Drawers.tsx | 34 +++++++++++++----- manifold/src/engine/engine-api.ts | 8 +++-- manifold/src/engine/spine.ts | 52 ++++++++++++++++++++++++--- manifold/src/inputs/input-layer.ts | 39 +++++++++----------- nisps/modes/base.hpp | 37 +++++++++++++++++-- nisps/wasm/README.md | 9 +++-- nisps/wasm/bindings.cpp | 33 +++++++++-------- playground/public/nisps.wasm | Bin 105285 -> 103957 bytes scripts/build-wasm.sh | 9 +++++ tests/cpp/parity_check.cpp | 19 ++++++---- tests/cpp/parity_wasm.mjs | 26 +++++++++----- tests/cpp/test_mode_paf_synth.cpp | 56 +++++++++++++++++++++++++++++ 15 files changed, 253 insertions(+), 75 deletions(-) diff --git a/CLAUDE.md b/CLAUDE.md index 7fb1284..9749837 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -118,9 +118,9 @@ Two WASM instances at runtime: 1. **Main thread** (`playground/src/ml/wasm-iml.ts`): ML inference + sync training + RL primitives. Update store after each call. Async training via disposable Web Worker (`wasm-worker.ts`). 2. **AudioWorklet** (`playground/src/audio/worklet/nisps-processor.ts`): runs engine `process_block` per audio block. Loads `nisps.wasm` directly via `WebAssembly.compile` (no Emscripten glue in worklet). Bytes posted from main thread. -C API is in `nisps/wasm/bindings.cpp`. Build: `bash scripts/build-wasm.sh` (~94KB output to `playground/public/`). +C API is in `nisps/wasm/bindings.cpp`. Build: `bash scripts/build-wasm.sh` (~100KB output, mirrored to `playground/public/` and `manifold/public/`). -The WASM target is fixed at `MLP<2, 10, 14, 18, 126>`. Modes with smaller `output_size` use the first N outputs only. +The WASM target is built as `MLP<4, 10, 14, 18, 126>` — 4 inputs = two 2-D controllers (primary pad on axes 0,1; optional second controller, e.g. gamepad, on axes 2,3). Single-controller mode pins axes 2,3 to the neutral 0.5 on the JS side (no rebuild). Modes with smaller `output_size` use the first N outputs only. ### Known limitations diff --git a/MAP.md b/MAP.md index 83120ac..b4376bc 100644 --- a/MAP.md +++ b/MAP.md @@ -138,7 +138,7 @@ the "BUILD DELTAS" block at the top of `vcv/SPEC.md`). `src/MEMLNaut.cpp` (modul - C++ identifiers: `PascalCase` types, `snake_case` functions/variables, `kPascalCase` constexpr. JSON keys `snake_case`. TS types `PascalCase`, components `PascalCase.tsx`, modules `kebab-case.ts`. - `Curve` enum lives in `nisps/core/math.hpp` (lowercase: `linear/exp/log/square/sqrt/sigmoid/cubic`); generated mode headers re-export via `using Curve = ::nisps::Curve;`. TS mirror at `playground/src/output/curves.ts` with same names. - Modes are TSX components composed of primitives; mode parameter contracts are JSON schemas with codegen → C++/TS types. **No declarative JSON UI.** -- WASM and firmware share the same C++; WASM is fixed at `MLP<2, 10, 14, 18, 126>` and modes use a slice of outputs based on schema's `output_size`. +- WASM and firmware share the same C++; WASM is built as `MLP<4, 10, 14, 18, 126>` (4 inputs = two 2-D controllers; single-controller mode pins axes 2,3 to 0.5 in JS) and modes use a slice of outputs based on schema's `output_size`. - Cross-platform parity: `scripts/parity-check.sh` enforces native vs WASM agreement within 1e-5. ## Gotchas diff --git a/manifold/public/nisps.wasm b/manifold/public/nisps.wasm index d2226c2075364b0a39d6b372d04540c1a9eec6fb..bdc70cc67c8ca025e99aee83ee0a879fad257eb1 100755 GIT binary patch delta 18540 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 delta 20309 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 s.enabled).length; const reshaping = inp.axisCount > inp.engineInputSize; + const gamepadOn = inp.sources.find((s) => s.kind === 'gamepad')?.enabled ?? false; return ( <> @@ -252,6 +253,22 @@ function InputsDrawer(ctx: ConsoleCtx, depth: DrawerDepth) { {reshaping && blended → {inp.engineInputSize}} + {/* ---- Controllers: 1 (pad) vs 2 (pad + gamepad). Default single. ---- */} + Controllers + inp.setEnabled('gamepad', m === 'double')} + options={[ + { value: 'single', label: 'Single' }, + { value: 'double', label: 'Double (+gamepad)' }, + ]} + /> +

+ {gamepadOn + ? 'Two 2-D controllers feed the model (pad → axes 0,1; gamepad → axes 2,3).' + : 'One 2-D controller (the pad). The second controller’s axes stay neutral (0.5).'} +

+ Sources
{inp.sources.map((s) => ( @@ -382,16 +399,15 @@ function InputsDrawer(ctx: ConsoleCtx, depth: DrawerDepth) { )}

- The active sources concatenate into one input vector at the head of the spine. + The active sources concatenate into one input vector at the head of the spine. The + browser WASM is a {inp.engineInputSize}-input head (two 2-D controllers), so up to + {' '}{inp.engineInputSize} axes each get their own genuine input dimension; unused axes + stay neutral (0.5). {reshaping - ? ` The browser WASM is a fixed ${inp.engineInputSize}-input head (MLP<2,…>), so the - ${inp.axisCount} axes are blended down to ${inp.engineInputSize} (even→X / odd→Y mean).` - : ''}{' '} - {/* TODO(workstream F, docs/redesign/inputs-spec.md — "multiple WASM modules + - warm-start"): give every axis its own genuine input dimension by (re)loading a - WASM module whose MLP arity matches axisCount and warm-starting from the prior - net. Deferred — the reduction lives in InputLayer.compose(). */} - True per-axis dimensions land with the multi-WASM reshape (inputs-spec). + ? ` Right now ${inp.axisCount} axes exceed the ${inp.engineInputSize}-input head, so + the surplus is blended down (chunked mean) — drop a source to give every axis its + own dimension.` + : ''}

)} diff --git a/manifold/src/engine/engine-api.ts b/manifold/src/engine/engine-api.ts index 3b19719..d0a27aa 100644 --- a/manifold/src/engine/engine-api.ts +++ b/manifold/src/engine/engine-api.ts @@ -164,9 +164,13 @@ export class EngineApi { this.spine.setInput(x, y); } - /** Set an arbitrary input vector (first two used as XY for the fixed 2→N MLP). */ + /** + * Set the full composed input vector from the modular InputLayer. Axes 0,1 + * are the primary controller; axes 2+ feed additional controllers (the WASM + * head is 4-wide = two 2-D controllers). Omitted axes stay neutral. + */ setInputs(arr: ReadonlyArray): void { - this.spine.setInput(arr[0] ?? 0.5, arr[1] ?? 0.5); + this.spine.setInputs(arr); } /** Live post-ML output vector (reused buffer — read, don't retain). */ diff --git a/manifold/src/engine/spine.ts b/manifold/src/engine/spine.ts index 70186a0..d9ab366 100644 --- a/manifold/src/engine/spine.ts +++ b/manifold/src/engine/spine.ts @@ -18,6 +18,7 @@ * Float32Array threaded through the output pipeline and handed to the backend. */ +import { clamp } from './curves'; import { defaultInputConfig, defaultInputState, @@ -91,6 +92,11 @@ export class Spine implements EngineSink { // Reused per-frame buffers — NO per-frame allocation in the hot path. private rawInput: [number, number] = [0.5, 0.5]; + // Full input vector fed to the MLP. Axes 0,1 = primary pad (post input + // pipeline); axes 2+ = secondary controller(s), or the neutral 0.5 when no + // second controller is active (single-controller mode). Sized to the WASM + // head's input arity; defaults all-neutral. + private inputs: number[] = [0.5, 0.5]; // Last raw input, so `EngineApi.process()` can re-tick after a weight change. lastRawX = 0.5; lastRawY = 0.5; @@ -108,7 +114,11 @@ export class Spine implements EngineSink { setState(patch: EngineStatePatch): void { let changed = false; const s = this.state_; - if (patch.inputSize !== undefined && patch.inputSize !== s.inputSize) { s.inputSize = patch.inputSize; changed = true; } + if (patch.inputSize !== undefined && patch.inputSize !== s.inputSize) { + s.inputSize = patch.inputSize; + this.resizeInputs_(patch.inputSize); + changed = true; + } if (patch.outputSize !== undefined && patch.outputSize !== s.outputSize) { s.outputSize = patch.outputSize; // Resize hot buffers to the resolved output size. @@ -155,6 +165,16 @@ export class Spine implements EngineSink { if (this.routedBuf === null || this.routedBuf.length !== iml.architecture.outputSize) { this.routedBuf = new Float32Array(iml.architecture.outputSize); } + this.resizeInputs_(iml.architecture.inputSize); + } + + /** Resize the full input vector to the WASM head arity, neutral-filling. */ + private resizeInputs_(size: number): void { + if (size < 1) size = 1; + if (this.inputs.length === size) return; + const next = new Array(size).fill(0.5); + for (let i = 0; i < Math.min(size, this.inputs.length); i++) next[i] = this.inputs[i]!; + this.inputs = next; } setBackendSend(backendSend: BackendSend | null): void { @@ -169,6 +189,22 @@ export class Spine implements EngineSink { * Returns the routed buffer (live, reused — do not retain across calls). */ setInput(x: number, y: number): Float32Array | null { + return this.tick_(x, y, null); + } + + /** + * Drive the full composed input vector (from the modular InputLayer). Axes + * 0,1 are the primary controller (run through the input pipeline); axes 2+ + * are secondary controllers, written through with a plain [0,1] clamp. Any + * axis the caller omits keeps its previous value (neutral 0.5 by default), so + * single-controller mode — where only axes 0,1 are supplied — leaves the + * second pair pinned at the neutral value. + */ + setInputs(arr: ReadonlyArray): Float32Array | null { + return this.tick_(arr[0] ?? 0.5, arr[1] ?? 0.5, arr); + } + + private tick_(x: number, y: number, arr: ReadonlyArray | null): Float32Array | null { const iml = this.iml; if (!iml) return null; @@ -176,17 +212,25 @@ export class Spine implements EngineSink { const dt = this.lastTickMs > 0 ? (now - this.lastTickMs) / 1000 : 1 / 60; this.lastTickMs = now; - // 1. processed (pure input pipeline) + // 1. processed (pure input pipeline) — primary controller, axes 0,1. this.rawInput[0] = x; this.rawInput[1] = y; this.lastRawX = x; this.lastRawY = y; const proc = processInput(this.rawInput, this.inputConfig, this.inputState, dt); this.inputState = proc.state; + this.inputs[0] = proc.x; + this.inputs[1] = proc.y; + // Secondary axes (2+): pass through with a [0,1] clamp. Omitted axes keep + // their prior value (neutral 0.5 in single-controller mode). + if (arr) { + for (let i = 2; i < this.inputs.length; i++) { + if (i < arr.length) this.inputs[i] = clamp(arr[i]!, 0, 1); + } + } // 2. ml (inference into the reused buffer; no alloc) - iml.setInput(0, proc.x); - iml.setInput(1, proc.y); + for (let i = 0; i < this.inputs.length; i++) iml.setInput(i, this.inputs[i]!); iml.processInto(this.mlBuf); // Mirror to liveOutputs for imperative reads + bump. this.liveOutputs.set(this.mlBuf.subarray(0, this.liveOutputs.length)); diff --git a/manifold/src/inputs/input-layer.ts b/manifold/src/inputs/input-layer.ts index a59ed2b..4d4b89e 100644 --- a/manifold/src/inputs/input-layer.ts +++ b/manifold/src/inputs/input-layer.ts @@ -13,24 +13,19 @@ * its value), but routing everything through one compose path keeps sources * composable and the channel layout coherent. * - * ── Arity mismatch (the WASM reshape TODO) ────────────────────────────────── - * The browser WASM is fixed at MLP<2, …, 126> — a TWO-input head. When the - * composed vector has > 2 axes (double-stick gamepad = 4, MIDI learn-map = many) - * we must reduce to 2 to feed today's engine. We do NOT fake a wider net. + * ── Arity: 4-input head ───────────────────────────────────────────────────── + * The browser WASM head is MLP<4, …, 126> — TWO 2-D controllers. The primary + * controller (on-screen pad) occupies axes 0,1; an optional second controller + * (gamepad) occupies axes 2,3. `compose()` passes axes through 1:1 when the + * head is at least as wide as the composed axis count (the common cases — + * single pad = 2, pad + single-stick gamepad = 4), padding any unused axes with + * the neutral 0.5. Single-controller mode is therefore just "no second source": + * axes 2,3 stay neutral, slicing the 4-D manifold at the centre of controller 2. * - * chosen reduction (this pass): pairwise BLEND. - * inX = mean(axis[0], axis[2], axis[4], …) // even axes - * inY = mean(axis[1], axis[3], axis[5], …) // odd axes - * so a single stick passes straight through (axis0→X, axis1→Y), a double - * stick averages L/R into one XY, and MIDI axes fold into X/Y by parity. - * - * TODO(workstream F, docs/redesign/inputs-spec.md — "multiple WASM modules + - * warm-start"): the real fix is to (re)load a WASM module whose MLP input arity - * matches the composed axis count and warm-start its weights from the prior net, - * so every axis gets its own genuine input dimension instead of being blended. - * That is a larger build (multiple .wasm artefacts or a runtime-variadic head) - * and is deliberately deferred — this layer is wired so that swapping the - * reduction for a true reshape is a localised change in `compose()`. + * Over-subscription (composed axes > head width — e.g. pad + dual-stick gamepad + * = 6, or a large MIDI learn-map) still falls back to a chunked-mean blend; the + * net is never rebuilt. That blend is the documented lossy path for unusual + * source combinations, not the default. */ import type { InputAction, InputSource } from './types'; @@ -147,15 +142,15 @@ export class InputLayer { } /** - * Reduce the composed N-axis vector to the engine's input arity. + * Map the composed N-axis vector to the engine's input arity. * - * For the fixed 2-input WASM, fold by parity (even→X, odd→Y) via mean. If a - * future multi-module engine reports inputSize >= n, this passes axes through - * 1:1 (truncated/padded) — the seam where the real reshape lands. + * Common case: the 4-input head is at least as wide as the composed axes, so + * pass through 1:1 and pad unused axes with the neutral 0.5. Over-subscription + * (axes > head width) folds by parity / chunked mean — the lossy fallback. */ private compose(n: number, inputSize: number): number[] { if (inputSize >= n) { - // True passthrough path (future multi-module head). Pad with 0.5. + // Passthrough: each axis gets its own input dimension. Pad with 0.5. const out = new Array(inputSize); for (let i = 0; i < inputSize; i++) out[i] = i < n ? this.vector[i] : 0.5; return out; diff --git a/nisps/modes/base.hpp b/nisps/modes/base.hpp index 9053bfd..d5702a1 100644 --- a/nisps/modes/base.hpp +++ b/nisps/modes/base.hpp @@ -141,7 +141,7 @@ class ModeBase { // Run an inference at default inputs so engine has params on first // process() call, even if no input has been touched. for (std::size_t i = 0u; i < NInputs; ++i) { - ml_.set_input(i, input_channels_[i]); + ml_.set_input(i, effective_input(i)); } ml_.process(); if constexpr (kRouteOutputsToEngine) { @@ -160,13 +160,42 @@ class ModeBase { input_dirty_ = true; } + // ---- Input neutralization (single/double controller toggle) ---- + // + // A pinned channel feeds `pin_value_` (neutral, default 0.5) to the MLP + // instead of its live value, without rebuilding/resizing the network. + // Glue toggles which channels are pinned (e.g. single-joystick mode pins + // the second 2D controller's two channels). The stored live value is left + // untouched, so unpinning resumes from the controller's current position. + NISPS_FORCE_INLINE void set_input_pinned(std::size_t idx, bool pinned) noexcept { + if (idx >= NInputs) return; + input_pinned_[idx] = pinned; + input_dirty_ = true; + } + NISPS_FORCE_INLINE bool is_input_pinned(std::size_t idx) const noexcept { + return idx < NInputs && input_pinned_[idx]; + } + NISPS_FORCE_INLINE void set_pin_value(float v) noexcept { + if (v < 0.f) v = 0.f; + else if (v > 1.f) v = 1.f; + pin_value_ = v; + input_dirty_ = true; + } + float pin_value() const noexcept { return pin_value_; } + + // Effective value fed to the MLP for channel i (pin override applied). + NISPS_FORCE_INLINE float effective_input(std::size_t i) const noexcept { + return input_pinned_[i] ? pin_value_ : input_channels_[i]; + } + NISPS_HOT void tick_control() noexcept { if constexpr (requires(Derived& d) { d.on_pre_inference(); }) { static_cast(*this).on_pre_inference(); } - // Forward (possibly Derived-mutated) channels into the MLP. + // Forward (possibly Derived-mutated) channels into the MLP, applying + // the per-channel pin override. for (std::size_t i = 0u; i < NInputs; ++i) { - ml_.set_input(i, input_channels_[i]); + ml_.set_input(i, effective_input(i)); } ml_.process(); if constexpr (kRouteOutputsToEngine) { @@ -235,6 +264,8 @@ class ModeBase { EngineT engine_{}; MLPType ml_; std::array input_channels_{}; + std::array input_pinned_{}; // false => live + float pin_value_ = 0.5f; // neutral bool input_dirty_ = false; std::size_t voice_space_idx_ = 0u; RingBuffer events_{}; diff --git a/nisps/wasm/README.md b/nisps/wasm/README.md index 0ce7871..6fd7f76 100644 --- a/nisps/wasm/README.md +++ b/nisps/wasm/README.md @@ -32,10 +32,13 @@ The MLP class template is parametrised on `(input_size, hidden1, hidden2, hidden3, output_size)`. WASM cannot recompile templates at runtime, so this build instantiates exactly ONE configuration: - nisps::ml::MLP<2, 10, 14, 18, 126> + nisps::ml::MLP<4, 10, 14, 18, 126> -That serves the playground use case (2-D joystick → up to 126 synth -parameters). `nisps_ml_create()` accepts caller-supplied dimensions for +That serves the manifold/playground use case: two 2-D controllers (primary +pad on axes 0,1; optional second controller — e.g. gamepad — on axes 2,3) +→ up to 126 synth parameters. Single-controller mode pins axes 2,3 to the +neutral 0.5 on the JS side, so the net is never rebuilt when toggling +between one and two controllers. `nisps_ml_create()` accepts caller-supplied dimensions for forward compatibility but currently ignores them — see comment at the top of `bindings.cpp`. The schemas in `schemas/modes/*.json` use up to `output_size=126`; modes whose output_size is < 126 simply ignore the diff --git a/nisps/wasm/bindings.cpp b/nisps/wasm/bindings.cpp index 0404e68..5f00b6e 100644 --- a/nisps/wasm/bindings.cpp +++ b/nisps/wasm/bindings.cpp @@ -5,24 +5,26 @@ // 2. AudioWorklet processor (playground/src/audio/worklet/...) — engine // calls. (Each instance owns its own WASM module instance.) // -// FIXED-ARCHITECTURE LIMITATION (VERY IMPORTANT) -// ---------------------------------------------- +// COMPILE-TIME ARCHITECTURE +// ------------------------- // The C++ MLP class is templated on layer sizes (architecture.md §4.1, §6.2). // We instantiate ONE concrete configuration here: // -// using DefaultMLP = nisps::ml::MLP<2, 10, 14, 18, 126>; +// using DefaultMLP = nisps::ml::MLP<4, 10, 14, 18, 126>; // -// This was chosen as the union of the playground use case (2-D joystick → -// 126 synth params) and the largest hidden-layer footprint that still fits -// firmware budgets. `nisps_ml_create()` accepts caller-supplied input_size, -// output_size, hidden[], n_hidden but ONLY validates them against the -// compile-time defaults — extra inputs/outputs are clipped at the boundary. -// If the caller passes incompatible dimensions we still create the module: -// extra inputs are zero-padded, extra outputs are truncated, and the -// hidden-layer override is silently ignored. +// FOUR inputs = two 2-D controllers (primary on-screen pad on axes 0,1; an +// optional second controller — gamepad — on axes 2,3). Single-controller mode +// pins the second pair to the neutral value 0.5 on the JS side (see +// manifold/src/engine/spine.ts), so the network is never rebuilt/resized when +// toggling between one and two controllers. 126 outputs covers C15 and every +// current schema. // -// Future work: ship multiple WASM modules (one per common architecture) or -// rebuild on demand. See architecture.md "open questions" — Stream 7 punts. +// `nisps_ml_create()` accepts caller-supplied input_size, output_size, +// hidden[], n_hidden but ONLY validates them against the compile-time +// defaults — extra inputs/outputs are clipped at the boundary. If the caller +// passes incompatible dimensions we still create the module: extra inputs are +// zero-padded, extra outputs are truncated, and the hidden-layer override is +// silently ignored. The TS side reads the real dims back via nisps_ml_describe. // // WIRE FORMAT FOR WEIGHTS // ----------------------- @@ -78,14 +80,15 @@ namespace { // Compile-time default architecture. See header comment. // // Choice rationale: -// * 2 inputs — playground virtual joystick (X, Y). +// * 4 inputs — two 2-D controllers (primary pad axes 0,1; optional +// second controller axes 2,3). Single-controller mode pins axes 2,3 to 0.5. // * [10, 14, 18] hidden — covers the largest schema layouts in // `schemas/modes/*.json` (channel_strip variants, verb_fx, breakor, // elysiamorf, memlcelium). // * 126 outputs — enough for the C15 mode and any current schema. // // The MLP also has dataset slots, loss history etc. — see mlp.hpp. -using DefaultMLP = nisps::ml::MLP<2u, 10u, 14u, 18u, 126u>; +using DefaultMLP = nisps::ml::MLP<4u, 10u, 14u, 18u, 126u>; constexpr std::size_t kDefaultInputs = DefaultMLP::kInput; constexpr std::size_t kDefaultOutputs = DefaultMLP::kOutput; diff --git a/playground/public/nisps.wasm b/playground/public/nisps.wasm index d2226c2075364b0a39d6b372d04540c1a9eec6fb..bdc70cc67c8ca025e99aee83ee0a879fad257eb1 100755 GIT binary patch delta 18540 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 delta 20309 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 +// MLP<4, 10, 14, 18, 126> // // Output blob format // ------------------ @@ -62,7 +62,7 @@ namespace { -using ParityMLP = nisps::ml::MLP<2u, 10u, 14u, 18u, 126u>; +using ParityMLP = nisps::ml::MLP<4u, 10u, 14u, 18u, 126u>; // The WASM bindings (nisps/wasm/bindings.cpp) sign-extend the 32-bit JS // seed via `s ^ (s << 32)`. To get bit-equal output between native and @@ -73,6 +73,9 @@ constexpr std::uint64_t kSeed = static_cast(kSeed32) ^ (static_cast(kSeed32) << 32); constexpr float kInputX = 0.25f; constexpr float kInputY = 0.75f; +// Second controller (axes 2,3) — exercised so the 4-input head is fully probed. +constexpr float kInputZ = 0.40f; +constexpr float kInputW = 0.60f; constexpr float kSampleRate = 48000.0f; constexpr std::size_t kSynthFrames = 128u; @@ -118,6 +121,8 @@ int main(int argc, char** argv) { mlp.draw_weights(0.5f); mlp.set_input(0u, kInputX); mlp.set_input(1u, kInputY); + mlp.set_input(2u, kInputZ); + mlp.set_input(3u, kInputW); mlp.process(); { const auto outs = mlp.outputs(); @@ -133,8 +138,8 @@ int main(int argc, char** argv) { } // ---- Stage 2: training ---- - constexpr std::array, 3u> features = {{ - {{0.1f, 0.9f}}, {{0.5f, 0.5f}}, {{0.9f, 0.1f}}, + constexpr std::array, 3u> features = {{ + {{0.1f, 0.9f, 0.3f, 0.7f}}, {{0.5f, 0.5f, 0.5f, 0.5f}}, {{0.9f, 0.1f, 0.7f, 0.3f}}, }}; auto label_for = [](std::size_t i) { std::array out{}; @@ -146,13 +151,15 @@ int main(int argc, char** argv) { }; for (std::size_t i = 0; i < features.size(); ++i) { const auto label = label_for(i); - mlp.add_example(std::span(features[i].data(), 2u), + mlp.add_example(std::span(features[i].data(), 4u), std::span(label.data(), 126u)); } const float final_loss = mlp.train(0.3f, 50u, 0.0f); mlp.set_input(0u, kInputX); mlp.set_input(1u, kInputY); + mlp.set_input(2u, kInputZ); + mlp.set_input(3u, kInputW); mlp.process(); { const auto outs = mlp.outputs(); diff --git a/tests/cpp/parity_wasm.mjs b/tests/cpp/parity_wasm.mjs index 840242b..f83bd68 100644 --- a/tests/cpp/parity_wasm.mjs +++ b/tests/cpp/parity_wasm.mjs @@ -43,6 +43,8 @@ const VERSION = 3; // v3 adds stage 5d (ExploreAndPlace lifecycle) const SEED = 42 >>> 0; const INPUT_X = 0.25; const INPUT_Y = 0.75; +const INPUT_Z = 0.40; // second controller axes 2,3 (must match parity_check.cpp) +const INPUT_W = 0.60; const SAMPLE_RATE = 48000; const SYNTH_FRAMES = 128; const PROBE_IDX = [0, 5, 19, 31, 73, 137, 251, 491, 999, 1583, 2401, 3289]; @@ -191,8 +193,8 @@ async function main() { api.describe(dimsBuf); const dims = new Int32Array(Module.HEAP32.buffer, dimsBuf, 6).slice(); api.free(dimsBuf); - // Expect: [2, 10, 14, 18, 126, 4] - const expectedDims = [2, 10, 14, 18, 126, 4]; + // Expect: [inputs, h1, h2, h3, outputs, numLayers] = [4, 10, 14, 18, 126, 4] + const expectedDims = [4, 10, 14, 18, 126, 4]; for (let i = 0; i < expectedDims.length; ++i) { if (dims[i] !== expectedDims[i]) { console.error(`[parity_wasm] WASM build has dim[${i}]=${dims[i]}, native expected ${expectedDims[i]}`); @@ -203,10 +205,12 @@ async function main() { const N_OUT = dims[4]; // --- Stage 1: ML inference --- - const ml = api.create(2, N_OUT, 0, 0, SEED); + const ml = api.create(4, N_OUT, 0, 0, SEED); api.drawWeights(ml, 0.5); api.setInput(ml, 0, INPUT_X); api.setInput(ml, 1, INPUT_Y); + api.setInput(ml, 2, INPUT_Z); + api.setInput(ml, 3, INPUT_W); api.process(ml); const outsStage1 = getOutputsCopy(api, ml, N_OUT); @@ -216,9 +220,9 @@ async function main() { // --- Stage 2: training --- const features = [ - [0.1, 0.9], - [0.5, 0.5], - [0.9, 0.1], + [0.1, 0.9, 0.3, 0.7], + [0.5, 0.5, 0.5, 0.5], + [0.9, 0.1, 0.7, 0.3], ]; const labelFor = (i) => { const out = new Float32Array(N_OUT); @@ -226,12 +230,14 @@ async function main() { for (let j = 0; j < N_OUT; ++j) out[j] = a + 0.005 * j; return out; }; - const featBuf = api.malloc(2 * 4); - const featF32 = new Float32Array(api.HEAPF32.buffer, featBuf, 2); + const featBuf = api.malloc(4 * 4); + const featF32 = new Float32Array(api.HEAPF32.buffer, featBuf, 4); const labelBuf = api.malloc(N_OUT * 4); for (let i = 0; i < features.length; ++i) { featF32[0] = features[i][0]; featF32[1] = features[i][1]; + featF32[2] = features[i][2]; + featF32[3] = features[i][3]; const label = labelFor(i); new Float32Array(api.HEAPF32.buffer, labelBuf, N_OUT).set(label); api.addExample(ml, featBuf, labelBuf); @@ -243,6 +249,8 @@ async function main() { api.setInput(ml, 0, INPUT_X); api.setInput(ml, 1, INPUT_Y); + api.setInput(ml, 2, INPUT_Z); + api.setInput(ml, 3, INPUT_W); api.process(ml); const outsStage2 = getOutputsCopy(api, ml, N_OUT); @@ -301,6 +309,8 @@ async function main() { api.feedbackUndo(ml); // pop nudge api.setInput(ml, 0, INPUT_X); api.setInput(ml, 1, INPUT_Y); + api.setInput(ml, 2, INPUT_Z); + api.setInput(ml, 3, INPUT_W); api.process(ml); api.feedbackLike(ml); // begin place: freeze scratchpad output { diff --git a/tests/cpp/test_mode_paf_synth.cpp b/tests/cpp/test_mode_paf_synth.cpp index 737ba2f..9d18662 100644 --- a/tests/cpp/test_mode_paf_synth.cpp +++ b/tests/cpp/test_mode_paf_synth.cpp @@ -88,6 +88,62 @@ NISPS_TEST(paf_synth_mode_input_clamping) { m.set_input(99u, 0.5f); } +NISPS_TEST(paf_synth_mode_pinned_inputs_neutralized) { + // Single-joystick mode pins the second 2D controller's channels (2,3). + // A pinned channel must feed the neutral pin value (default 0.5) to the + // MLP regardless of its live value, and pinning must not resize the model. + PAFSynthMode m; + m.setup(48000.f); + NISPS_EXPECT(m.pin_value() == 0.5f); + + // Reference: channels 2,3 driven live to 0.5 (the neutral value). + m.set_input(0, 0.2f); + m.set_input(1, 0.8f); + m.set_input(2, 0.5f); + m.set_input(3, 0.5f); + m.tick_control(); + std::array ref{}; + { + const auto outs = m.ml().outputs(); + for (std::size_t i = 0u; i < outs.size(); ++i) ref[i] = outs[i]; + } + + // Pin channels 2,3, then drive them to arbitrary values. Output must match + // the reference (they are neutralized to 0.5). + m.set_input_pinned(2, true); + m.set_input_pinned(3, true); + NISPS_EXPECT(m.is_input_pinned(2)); + m.set_input(2, 0.0f); + m.set_input(3, 1.0f); + m.tick_control(); + for (std::size_t i = 0u; i < 33u; ++i) { + NISPS_EXPECT(std::fabs(m.ml().outputs()[i] - ref[i]) < 1e-6f); + } + + // The active controller (channels 0,1) still affects the output. + m.set_input(0, 0.9f); + m.tick_control(); + bool changed = false; + for (std::size_t i = 0u; i < 33u; ++i) { + if (std::fabs(m.ml().outputs()[i] - ref[i]) > 1e-6f) { changed = true; break; } + } + NISPS_EXPECT(changed); + + // Unpinning restores sensitivity on channels 2,3. + m.set_input_pinned(2, false); + m.set_input_pinned(3, false); + m.set_input(0, 0.2f); // restore active channels to the reference pose + m.set_input(1, 0.8f); + m.set_input(2, 0.0f); + m.set_input(3, 1.0f); + m.tick_control(); + bool differs = false; + for (std::size_t i = 0u; i < 33u; ++i) { + if (std::fabs(m.ml().outputs()[i] - ref[i]) > 1e-6f) { differs = true; break; } + } + NISPS_EXPECT(differs); +} + NISPS_TEST(paf_synth_mode_engine_and_ml_accessors) { PAFSynthMode m; m.setup(48000.f);