Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -2163,4 +2163,4 @@
-0.9127054018053962
],
"sample_rate": 48000
}
}
10 changes: 5 additions & 5 deletions generate_weights_a2.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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",
Expand Down
20 changes: 10 additions & 10 deletions tools/test/test_container.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tools/test/test_get_dsp.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<std::string> 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;
Expand Down
Loading