-
Notifications
You must be signed in to change notification settings - Fork 155
Remove a per-call allocation and two redundant copies from the hot path #312
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+80
−12
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // Test to verify activation apply() overloads are real-time safe (no allocations/frees) | ||
|
|
||
| #include <Eigen/Dense> | ||
| #include <cassert> | ||
| #include <cmath> | ||
| #include <vector> | ||
|
|
||
| #include "NAM/activations.h" | ||
| #include "allocation_tracking.h" | ||
|
|
||
| namespace test_activations_realtime_safe | ||
| { | ||
| using namespace allocation_tracking; | ||
|
|
||
| // PReLU's matrix overload is reached once per sample from the gating/blending activations, so a | ||
| // heap allocation here lands directly on the audio thread. | ||
| void test_prelu_apply_matrix_realtime_safe() | ||
| { | ||
| const int channels = 8; | ||
| const int time_steps = 64; | ||
|
|
||
| std::vector<float> slopes; | ||
| for (int i = 0; i < channels; i++) | ||
| slopes.push_back(0.01f * static_cast<float>(i + 1)); | ||
|
|
||
| nam::activations::ActivationPReLU activation(slopes); | ||
|
|
||
| Eigen::MatrixXf matrix(channels, time_steps); | ||
| matrix.setConstant(-1.0f); | ||
|
|
||
| run_allocation_test_no_allocations( | ||
| nullptr, // No setup needed | ||
| [&]() { activation.apply(matrix); }, nullptr, // No teardown needed | ||
| "test_prelu_apply_matrix_realtime_safe"); | ||
|
|
||
| // Each channel should have been scaled by its own slope. | ||
| for (int c = 0; c < channels; c++) | ||
| assert(std::abs(matrix(c, 0) - (-slopes[c])) < 1e-6f); | ||
| } | ||
|
|
||
| // The pointer/length overload is the one used by the plain (non-gated) path. | ||
| void test_prelu_apply_pointer_realtime_safe() | ||
| { | ||
| const int channels = 4; | ||
| const int time_steps = 32; | ||
|
|
||
| std::vector<float> slopes; | ||
| for (int i = 0; i < channels; i++) | ||
| slopes.push_back(0.05f * static_cast<float>(i + 1)); | ||
|
|
||
| nam::activations::ActivationPReLU activation(slopes); | ||
|
|
||
| Eigen::MatrixXf matrix(channels, time_steps); | ||
| matrix.setConstant(-2.0f); | ||
|
|
||
| run_allocation_test_no_allocations( | ||
| nullptr, // No setup needed | ||
| [&]() { activation.apply(matrix.data(), static_cast<long>(channels) * time_steps); }, | ||
| nullptr, // No teardown needed | ||
| "test_prelu_apply_pointer_realtime_safe"); | ||
|
|
||
| for (int c = 0; c < channels; c++) | ||
| assert(std::abs(matrix(c, 0) - (-2.0f * slopes[c])) < 1e-6f); | ||
| } | ||
| } // namespace test_activations_realtime_safe |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very odd that this was like that. Wonder why...
At any rate, PReLU isn't a super-popular choice so I'm not too worried about missing something.