b16f26e6ab
The operator's call: "there should be one default learning rate and one
default max iterations and they should both be configurable at runtime."
There were SIX copies, not the four the audit described, and they did not
agree:
nisps/ml/mlp.hpp no-arg train() hardcoding 1.f / 1000u / 0.001f —
and firmware's ONLY training path calls exactly
this, so firmware had no runtime knob at all
wasm-iml.ts train() and trainAsync() TS default params (x2)
engine-api.ts learningRate ?? 1.0, with no maxIterations knob
vcv/src/iml.hpp 200 / 0.1 / 0.00001 — silently divergent
external_synth_midi.hpp its own kDefaultLearningRate/kDefaultMaxIterations
schemas/modes/*.json x9, identical, read by nobody at runtime
Now: schemas/ml_defaults.json is the single declaration (validated against a
sibling meta-schema, matching the midi_device.schema.json convention), codegen
emits it to C++ and TS in the same run, and MLPCore carries a TrainConfig whose
default member initialisers read the generated constant.
set_train_config()/nisps_ml_set_train_config() make it runtime-overridable on
every target; the explicit-argument train() overload is untouched. min_error
joins the tuple — it was duplicated identically and belongs with the other two.
The per-mode ml block loses default_learning_rate/default_max_iterations.
default_spread stays (genuinely wired on both targets) and input_channels stays
(codegen-time validated, real information for sound_analysis_midi).
VCV BEHAVIOUR CHANGE, deliberate: MEMLNaut.cpp constructs IML positionally and
relies on those defaults, so the module moves to 1000/1.0/0.001 — 5x the max
iterations, 10x the learning rate, and a 100x looser early-stop threshold. The
old values were never justified anywhere; they arrived with fbc68eb alongside
an unrelated module rewrite and no tuning rationale. Firmware and WASM have
shipped 1.0/1000 all along. It is now runtime-settable if this turns out worse.
The generated header lands in nisps/ml/generated/, not nisps/modes/generated/
where the rest of codegen output lives: training hyperparameters are an ML
fact, and nisps/ml sits below nisps/modes, so emitting them there would make
mlp.hpp include upward. The agent that built this flagged the directory-crossing
rather than hiding it; this is the fix. CI's generated-freshness gate learns the
new directory.
Gates: run-all-tests.sh ALL GREEN — 4/4 ctest, parity PASS (max delta 2.38e-7),
lint clean, manifold typecheck + 17 unit + 33 e2e (which exercise train() and
trainAsync() through a real browser).
102 lines
3.9 KiB
Bash
Executable file
102 lines
3.9 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# scripts/build-wasm.sh — compile nisps/wasm/bindings.cpp via Emscripten and
|
|
# write the result to manifold/public/.
|
|
#
|
|
# Requires emcc. Defaults to /usr/lib/emscripten/emcc; override via the EMCC
|
|
# env var. Sample invocation:
|
|
#
|
|
# EMCC=$(which emcc) scripts/build-wasm.sh
|
|
#
|
|
# Output:
|
|
# manifold/public/nisps.js — Emscripten glue, MODULARIZE factory
|
|
# manifold/public/nisps.wasm — the compiled module
|
|
|
|
set -euo pipefail
|
|
|
|
EMCC="${EMCC:-$(command -v emcc || echo /usr/lib/emscripten/emcc)}"
|
|
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
|
OUT="$ROOT/manifold/public"
|
|
SRC="$ROOT/nisps/wasm/bindings.cpp"
|
|
|
|
# EMCC may be a bare command name on PATH (emsdk installs it that way) or an
|
|
# absolute path. Resolve the former before the existence check, which otherwise
|
|
# looks for a file of that name in the CWD and always fails.
|
|
if [[ "$EMCC" != */* ]]; then
|
|
EMCC="$(command -v "$EMCC" || echo "$EMCC")"
|
|
fi
|
|
|
|
if [[ ! -x "$EMCC" && ! -f "$EMCC" ]]; then
|
|
echo "[build-wasm] emcc not found at $EMCC" >&2
|
|
echo "[build-wasm] set EMCC=/path/to/emcc (or put emcc on PATH) and retry." >&2
|
|
exit 2
|
|
fi
|
|
|
|
mkdir -p "$OUT"
|
|
|
|
# Exported C functions. Keep this list synchronised with the
|
|
# EMSCRIPTEN_KEEPALIVE annotations in bindings.cpp; the build will not
|
|
# fail if extras are listed but it WILL fail (or silently strip) if any
|
|
# function is missing.
|
|
EXPORTED_FUNCS='[
|
|
"_malloc","_free",
|
|
"_nisps_ml_create","_nisps_ml_destroy","_nisps_ml_reshape",
|
|
"_nisps_ml_set_input","_nisps_ml_process","_nisps_ml_outputs","_nisps_ml_infer_batch",
|
|
"_nisps_ml_add_example","_nisps_ml_train","_nisps_ml_set_train_config","_nisps_ml_eval_loss",
|
|
"_nisps_ml_clear_examples",
|
|
"_nisps_ml_weight_count","_nisps_ml_get_weights","_nisps_ml_set_weights",
|
|
"_nisps_ml_draw_weights",
|
|
"_nisps_ml_feedback_set_mode","_nisps_ml_feedback_get_mode",
|
|
"_nisps_ml_feedback_exploring",
|
|
"_nisps_ml_feedback_set_focus","_nisps_ml_feedback_down",
|
|
"_nisps_ml_feedback_up","_nisps_ml_feedback_static_output",
|
|
"_nisps_ml_feedback_enter_explore","_nisps_ml_feedback_exit_explore",
|
|
"_nisps_ml_feedback_reroll","_nisps_ml_feedback_nudge","_nisps_ml_feedback_undo",
|
|
"_nisps_ml_feedback_like","_nisps_ml_feedback_commit_place","_nisps_ml_feedback_cancel_place",
|
|
"_nisps_ml_feedback_undo_depth",
|
|
"_nisps_ml_feedback_placed_output",
|
|
"_nisps_ml_feedback_dislike_geometric","_nisps_ml_feedback_store_positive",
|
|
"_nisps_ml_feedback_positive_count","_nisps_ml_feedback_negative_count",
|
|
"_nisps_ml_feedback_set_avoid_style",
|
|
"_nisps_ml_jolt_press","_nisps_ml_jolt_step","_nisps_ml_jolt_release",
|
|
"_nisps_ml_jolt_active",
|
|
"_nisps_ml_explore_intensity","_nisps_ml_explore_get_intensity","_nisps_ml_explore_apply",
|
|
"_nisps_pipeline_create","_nisps_pipeline_destroy",
|
|
"_nisps_input_set_config","_nisps_input_process","_nisps_input_reset",
|
|
"_nisps_output_set_config","_nisps_output_set_freeze_mask",
|
|
"_nisps_output_process","_nisps_output_reset",
|
|
"_nisps_curve_apply","_nisps_curve_apply_batch",
|
|
"_nisps_ml_get_layer_stats","_nisps_ml_describe",
|
|
"_nisps_engine_create","_nisps_engine_destroy",
|
|
"_nisps_engine_set_params","_nisps_engine_process_block"
|
|
]'
|
|
|
|
# Runtime helpers we want exposed on the JS module. HEAP* views are needed by
|
|
# wasm-iml.ts/wasm-worker.ts/nisps-processor.ts to copy buffers in and out.
|
|
EXPORTED_RUNTIME='[
|
|
"HEAP8","HEAP16","HEAP32","HEAPU8","HEAPU16","HEAPU32","HEAPF32","HEAPF64",
|
|
"ccall","cwrap"
|
|
]'
|
|
|
|
set -x
|
|
"$EMCC" "$SRC" \
|
|
-std=c++20 -O3 \
|
|
-I "$ROOT/nisps" \
|
|
-fno-exceptions \
|
|
-fno-rtti \
|
|
-s WASM=1 \
|
|
-s MODULARIZE=1 \
|
|
-s EXPORT_NAME=createNispsModule \
|
|
-s ENVIRONMENT=web,worker \
|
|
-s ALLOW_MEMORY_GROWTH=1 \
|
|
-s INITIAL_MEMORY=8388608 \
|
|
-s STACK_SIZE=1048576 \
|
|
-s FILESYSTEM=0 \
|
|
-s SINGLE_FILE=0 \
|
|
-s ASSERTIONS=0 \
|
|
-s EXPORTED_FUNCTIONS="$EXPORTED_FUNCS" \
|
|
-s EXPORTED_RUNTIME_METHODS="$EXPORTED_RUNTIME" \
|
|
-o "$OUT/nisps.js"
|
|
{ set +x; } 2>/dev/null
|
|
|
|
echo "[build-wasm] wrote $OUT/nisps.js + $OUT/nisps.wasm"
|
|
ls -lh "$OUT/nisps.js" "$OUT/nisps.wasm"
|