1603ea798e
NISPS is a controller, not a synth: the object of study is the mapping
f: control-space -> parameter-space and how a musician's gestures deform
it. Loss measures fit to points the user dictated, which is the one thing
they never experience. So this measures geometry and gesture-response.
tests/cpp/ml_bench.cpp 61 scenarios, REPORTS never asserts (same
discipline as engine_bench.cpp). Shape-
agnostic via MLPCore<DynamicStorage>
(--shape, default 2,16,16,16,8), seeded
RNG throughout, branch points replayed
from scratch rather than snapshotted.
tests/cpp/test_ml_behaviour.cpp 20 asserting invariants, wired into
nisps_core_tests.
scripts/bench-ml.sh native + WASM from one source; --compare,
--sweep-shape, --smoke, --scenario, --seed.
Documents two contracts that fail SILENTLY (both now pinned by tests):
a thumbs-up must call BOTH mlp.add_example() and fb.store_positive(),
since dislike_geometric k-NNs the replay buffer and not the MLP dataset;
and placed_output() is valid only while state == Placing, after which an
empty span whose l2() is 0 scores a broken lifecycle as a perfect place.
ALIGNMENT defect 6 re-ranked (SGD-vs-RMSProp is not a research axis - it
silently invalidated every ported hyperparameter) and split into 6b (the
geometric dislike was ported from a superseded upstream design) and 6c
(InterfaceRL, the reference impl, is not in the tree).
Gates: build-cpp-tests (138 tests, ctest 4/4), parity-check PASS,
lint-cpp clean, bench-ml.sh --smoke runs end to end.
236 lines
11 KiB
CMake
236 lines
11 KiB
CMake
cmake_minimum_required(VERSION 3.20)
|
|
project(nisps_core CXX)
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Toolchain / standard
|
|
# ---------------------------------------------------------------------------
|
|
set(CMAKE_CXX_STANDARD 20)
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
|
|
|
# Default to a Release build when invoked without -DCMAKE_BUILD_TYPE so host
|
|
# tests get optimized math; flip with `-DCMAKE_BUILD_TYPE=Debug` for stepping.
|
|
if(NOT CMAKE_BUILD_TYPE)
|
|
set(CMAKE_BUILD_TYPE Release CACHE STRING "" FORCE)
|
|
endif()
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Core interface library — header-only. Other parts of the build (ml/, dsp/,
|
|
# engines/, modes/) will link against this once they exist.
|
|
# ---------------------------------------------------------------------------
|
|
add_library(nisps_core INTERFACE)
|
|
target_include_directories(nisps_core
|
|
INTERFACE
|
|
${CMAKE_CURRENT_SOURCE_DIR}
|
|
)
|
|
target_compile_features(nisps_core INTERFACE cxx_std_20)
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Emscripten / WASM target detection
|
|
# ---------------------------------------------------------------------------
|
|
# When building for WASM via emcmake, ${EMSCRIPTEN} is set automatically. We
|
|
# don't actually emit a WASM binary from this CMakeLists yet — the WASM build
|
|
# script (scripts/build-wasm.sh) assembles its own
|
|
# Emscripten link command. Here we just gate the host-only test executable so
|
|
# `emcmake cmake -S nisps -B build-wasm` configures cleanly.
|
|
if(EMSCRIPTEN)
|
|
message(STATUS "nisps_core: configuring for Emscripten/WASM target")
|
|
endif()
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Test scaffold — only built on the host. We use a hand-rolled assertion-
|
|
# based harness (see tests/cpp/test_helpers.hpp) rather than Catch2/doctest;
|
|
# the rationale is in test_helpers.hpp.
|
|
# ---------------------------------------------------------------------------
|
|
if(NOT EMSCRIPTEN)
|
|
set(NISPS_TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../tests/cpp)
|
|
|
|
add_executable(nisps_core_tests
|
|
${NISPS_TEST_DIR}/test_main.cpp
|
|
${NISPS_TEST_DIR}/test_ring_buffer.cpp
|
|
${NISPS_TEST_DIR}/test_rng.cpp
|
|
${NISPS_TEST_DIR}/test_math.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_init.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_inference.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_training.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_loss.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_rl.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_storage_parity.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_storage_defaults.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_jolt.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_ou_noise.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_feedback.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_geo_dislike.cpp
|
|
${NISPS_TEST_DIR}/test_ml_behaviour.cpp
|
|
${NISPS_TEST_DIR}/test_mlp_serialize.cpp
|
|
${NISPS_TEST_DIR}/test_pipeline.cpp
|
|
${NISPS_TEST_DIR}/test_vcv_iml_parity.cpp
|
|
)
|
|
target_link_libraries(nisps_core_tests PRIVATE nisps_core)
|
|
|
|
# Chris's rule: the core compiles cleanly under -Wall -Wextra -Werror.
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
|
|
target_compile_options(nisps_core_tests PRIVATE
|
|
-Wall -Wextra -Werror -Wpedantic
|
|
)
|
|
elseif(MSVC)
|
|
target_compile_options(nisps_core_tests PRIVATE /W4 /WX)
|
|
endif()
|
|
|
|
enable_testing()
|
|
add_test(NAME nisps_core_tests COMMAND nisps_core_tests)
|
|
|
|
# ---------------------------------------------------------------------
|
|
# DSP + engines tests (stream 3). Built as a separate executable so
|
|
# failures here don't take core/ML tests with them.
|
|
# ---------------------------------------------------------------------
|
|
add_executable(nisps_dsp_engine_tests
|
|
${NISPS_TEST_DIR}/test_main.cpp
|
|
${NISPS_TEST_DIR}/test_dsp_biquad.cpp
|
|
${NISPS_TEST_DIR}/test_dsp_delay.cpp
|
|
${NISPS_TEST_DIR}/test_dsp_reverb.cpp
|
|
${NISPS_TEST_DIR}/test_dsp_pitch_shift.cpp
|
|
${NISPS_TEST_DIR}/test_dsp_seq_shared.cpp
|
|
${NISPS_TEST_DIR}/test_engine_no_op.cpp
|
|
${NISPS_TEST_DIR}/test_engine_paf_synth.cpp
|
|
${NISPS_TEST_DIR}/test_engine_channel_strip.cpp
|
|
${NISPS_TEST_DIR}/test_engine_xiasri.cpp
|
|
${NISPS_TEST_DIR}/test_engine_verb_fx.cpp
|
|
${NISPS_TEST_DIR}/test_engine_memlcelium.cpp
|
|
${NISPS_TEST_DIR}/test_engine_breakor.cpp
|
|
${NISPS_TEST_DIR}/test_engine_elysiamorf.cpp
|
|
${NISPS_TEST_DIR}/test_engine_analysis.cpp
|
|
)
|
|
target_link_libraries(nisps_dsp_engine_tests PRIVATE nisps_core)
|
|
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
|
|
target_compile_options(nisps_dsp_engine_tests PRIVATE
|
|
-Wall -Wextra -Werror -Wpedantic
|
|
)
|
|
elseif(MSVC)
|
|
target_compile_options(nisps_dsp_engine_tests PRIVATE /W4 /WX)
|
|
endif()
|
|
|
|
add_test(NAME nisps_dsp_engine_tests COMMAND nisps_dsp_engine_tests)
|
|
|
|
# ---------------------------------------------------------------------
|
|
# Mode tests (stream 4). Cover concept satisfaction, voice space
|
|
# dispatch, control-event pumping, and end-to-end inference→audio.
|
|
# ---------------------------------------------------------------------
|
|
add_executable(nisps_modes_tests
|
|
${NISPS_TEST_DIR}/test_main.cpp
|
|
${NISPS_TEST_DIR}/test_mode_concepts.cpp
|
|
${NISPS_TEST_DIR}/test_mode_paf_synth.cpp
|
|
${NISPS_TEST_DIR}/test_mode_voice_space.cpp
|
|
${NISPS_TEST_DIR}/test_mode_breakor_events.cpp
|
|
${NISPS_TEST_DIR}/test_mode_learning.cpp
|
|
${NISPS_TEST_DIR}/test_mode_curve_overrides.cpp
|
|
${NISPS_TEST_DIR}/test_mode_driver_config.cpp
|
|
)
|
|
target_link_libraries(nisps_modes_tests PRIVATE nisps_core)
|
|
# test_mode_driver_config.cpp also covers the firmware-side codec clamping
|
|
# (firmware/MEMLNaut-NISPS/glue/codec_config.hpp — deliberately Arduino-free
|
|
# so it is host-testable). That header includes "nisps/core/types.hpp" the
|
|
# way the firmware does, so the repo root has to be on the include path.
|
|
target_include_directories(nisps_modes_tests PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
|
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
|
|
target_compile_options(nisps_modes_tests PRIVATE
|
|
-Wall -Wextra -Werror -Wpedantic
|
|
)
|
|
elseif(MSVC)
|
|
target_compile_options(nisps_modes_tests PRIVATE /W4 /WX)
|
|
endif()
|
|
|
|
add_test(NAME nisps_modes_tests COMMAND nisps_modes_tests)
|
|
|
|
# ---------------------------------------------------------------------
|
|
# Stream 11 verification suite (golden vectors + engine impulse).
|
|
# Lives in tests/cpp/, registered separately so a regression here can
|
|
# be diagnosed without rebuilding the world.
|
|
# ---------------------------------------------------------------------
|
|
add_executable(nisps_golden_tests
|
|
${NISPS_TEST_DIR}/test_main.cpp
|
|
${NISPS_TEST_DIR}/ml_golden_vectors.cpp
|
|
${NISPS_TEST_DIR}/engine_impulse.cpp
|
|
)
|
|
target_link_libraries(nisps_golden_tests PRIVATE nisps_core)
|
|
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
|
|
target_compile_options(nisps_golden_tests PRIVATE
|
|
-Wall -Wextra -Werror -Wpedantic
|
|
)
|
|
elseif(MSVC)
|
|
target_compile_options(nisps_golden_tests PRIVATE /W4 /WX)
|
|
endif()
|
|
|
|
add_test(NAME nisps_golden_tests COMMAND nisps_golden_tests)
|
|
# Run the impulse test from the repo root so the relative baseline path
|
|
# in `engine_impulse.cpp` resolves to tests/cpp/engine_impulse_baseline.bin.
|
|
set_tests_properties(nisps_golden_tests PROPERTIES
|
|
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/..
|
|
)
|
|
|
|
# ---------------------------------------------------------------------
|
|
# Standalone engine throughput benchmark. NOT registered with ctest: it
|
|
# measures time and asserts nothing, so it has no pass/fail to report and
|
|
# a per-block timing loop has no place in a gate every change pays for.
|
|
# Driven by scripts/bench-engines.sh, which also compiles the SAME source
|
|
# to WASM via emcc for the cross-target comparison.
|
|
# ---------------------------------------------------------------------
|
|
add_executable(nisps_engine_bench
|
|
${NISPS_TEST_DIR}/engine_bench.cpp
|
|
)
|
|
target_link_libraries(nisps_engine_bench PRIVATE nisps_core)
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
|
|
target_compile_options(nisps_engine_bench PRIVATE
|
|
-Wall -Wextra -Werror -Wpedantic -O3
|
|
)
|
|
elseif(MSVC)
|
|
target_compile_options(nisps_engine_bench PRIVATE /W4 /WX)
|
|
endif()
|
|
|
|
# ---------------------------------------------------------------------
|
|
# Standalone ML BEHAVIOUR benchmark. Same discipline as nisps_engine_bench:
|
|
# it reports numbers and asserts nothing, so it is not a ctest gate. It
|
|
# measures the shape of the control mapping and how interaction journeys
|
|
# deform it — see MAP.md § `tests/cpp/`. Driven by
|
|
# scripts/bench-ml.sh, which compiles the SAME source to WASM via emcc.
|
|
#
|
|
# Uses MLPCore<DynamicStorage>, so it is host-only by construction
|
|
# (dynamic_storage.hpp #errors on RP2350). That is correct: the point is
|
|
# arbitrary runtime shapes, which firmware deliberately cannot have.
|
|
# ---------------------------------------------------------------------
|
|
add_executable(nisps_ml_bench
|
|
${NISPS_TEST_DIR}/ml_bench.cpp
|
|
)
|
|
target_link_libraries(nisps_ml_bench PRIVATE nisps_core)
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
|
|
target_compile_options(nisps_ml_bench PRIVATE
|
|
-Wall -Wextra -Werror -Wpedantic -O3
|
|
)
|
|
elseif(MSVC)
|
|
target_compile_options(nisps_ml_bench PRIVATE /W4 /WX)
|
|
endif()
|
|
|
|
# Standalone parity-check runner. NOT registered with ctest — it's
|
|
# invoked from scripts/parity-check.sh which orchestrates native+WASM
|
|
# together.
|
|
add_executable(nisps_parity_check
|
|
${NISPS_TEST_DIR}/parity_check.cpp
|
|
)
|
|
target_link_libraries(nisps_parity_check PRIVATE nisps_core)
|
|
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang|AppleClang")
|
|
target_compile_options(nisps_parity_check PRIVATE
|
|
-Wall -Wextra -Werror -Wpedantic
|
|
# Disable FP multiply-add contraction so native matches the WASM
|
|
# build, which has no FMA instruction. Without this, native clang/gcc
|
|
# fuses MACs in the training backprop and the (chaotic) loop amplifies
|
|
# the rounding difference past the 1e-5 parity tolerance — pronounced
|
|
# since the input layer widened to 32 for mix-and-match inputs.
|
|
-ffp-contract=off
|
|
)
|
|
elseif(MSVC)
|
|
target_compile_options(nisps_parity_check PRIVATE /W4 /WX /fp:precise)
|
|
endif()
|
|
endif()
|