diff --git a/example_models/wavenet_a2_max.nam b/example_models/wavenet_a2_feature_test.nam similarity index 99% rename from example_models/wavenet_a2_max.nam rename to example_models/wavenet_a2_feature_test.nam index 6ee3b0f7..c1cf26dd 100644 --- a/example_models/wavenet_a2_max.nam +++ b/example_models/wavenet_a2_feature_test.nam @@ -1,6 +1,6 @@ { "notes": [ - "This model is meant as a 'test case' to contain all of the new features that are being considered for A2.", + "This model is meant as a test case containing all proposed A2 features; it is not the A2-Full architecture.", "It doesn't have slimmability." ], "version": "0.6.0", @@ -2163,4 +2163,4 @@ -0.9127054018053962 ], "sample_rate": 48000 -} \ No newline at end of file +} diff --git a/generate_weights_a2.py b/generate_weights_a2.py index bf091c43..af96e239 100644 --- a/generate_weights_a2.py +++ b/generate_weights_a2.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """ -Generate weights for wavenet_a2_max.nam file. +Generate weights for the wavenet_a2_feature_test.nam file. This script handles the full A2 architecture including: - FiLM (Feature-wise Linear Modulation) modules - head1x1 modules @@ -329,14 +329,14 @@ def main(): parser.add_argument( "--input", type=Path, - default=Path("example_models/wavenet_a2_max.nam"), - help="Input .nam file with empty weights (default: example_models/wavenet_a2_max.nam)" + default=Path("example_models/wavenet_a2_feature_test.nam"), + help="Input .nam feature-test file with empty weights (default: example_models/wavenet_a2_feature_test.nam)" ) parser.add_argument( "--output", type=Path, - default=Path("example_models/wavenet_a2_max_withweights.nam"), - help="Output .nam file (default: example_models/wavenet_a2_max_withweights.nam)" + default=Path("example_models/wavenet_a2_feature_test_withweights.nam"), + help="Output .nam file (default: example_models/wavenet_a2_feature_test_withweights.nam)" ) parser.add_argument( "--seed", diff --git a/tools/test/test_container.cpp b/tools/test/test_container.cpp index b4dc65c8..c12cdb96 100644 --- a/tools/test/test_container.cpp +++ b/tools/test/test_container.cpp @@ -140,24 +140,24 @@ void process_and_verify(nam::DSP* dsp, int num_buffers, int buffer_size) void test_container_loads_from_json() { - auto j = - build_container_json("example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_max.nam"); + auto j = build_container_json( + "example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_feature_test.nam"); auto dsp = nam::get_dsp(j); assert(dsp != nullptr); } void test_container_processes_audio() { - auto j = - build_container_json("example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_max.nam"); + auto j = build_container_json( + "example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_feature_test.nam"); auto dsp = nam::get_dsp(j); process_and_verify(dsp.get(), 3, 64); } void test_container_slimmable_selects_submodel() { - auto j = - build_container_json("example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_max.nam"); + auto j = build_container_json( + "example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_feature_test.nam"); auto dsp = nam::get_dsp(j); const double sample_rate = 48000.0; const int buffer_size = 64; @@ -198,8 +198,8 @@ void test_container_slimmable_selects_submodel() void test_container_boundary_values() { - auto j = - build_container_json("example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_max.nam"); + auto j = build_container_json( + "example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_feature_test.nam"); auto dsp = nam::get_dsp(j); const double sample_rate = 48000.0; const int buffer_size = 16; @@ -380,8 +380,8 @@ void test_container_load_from_file() void test_container_default_is_max_size() { - auto j = - build_container_json("example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_max.nam"); + auto j = build_container_json( + "example_models/lstm.nam", "example_models/wavenet.nam", "example_models/wavenet_a2_feature_test.nam"); auto dsp = nam::get_dsp(j); const double sample_rate = 48000.0; const int buffer_size = 64; diff --git a/tools/test/test_get_dsp.cpp b/tools/test/test_get_dsp.cpp index de20ce84..538f70c0 100644 --- a/tools/test/test_get_dsp.cpp +++ b/tools/test/test_get_dsp.cpp @@ -242,7 +242,7 @@ void test_load_and_process_nam_files() // Paths are relative to root directory where tests run (./build/tools/run_tests) const std::vector nam_files = {"example_models/wavenet.nam", "example_models/lstm.nam", "example_models/wavenet_condition_dsp.nam", - "example_models/wavenet_a2_max.nam"}; + "example_models/wavenet_a2_feature_test.nam"}; const int num_buffers = 3; const int buffer_size = 64;