Skip to content

[ENHANCEMENT] NeuralAmpModelerCore v0.4.0.rc1 #605

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.

Sign up for GitHub

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

Open
sdatkinson wants to merge 9 commits into
base: main
Choose a base branch
from
Open

[ENHANCEMENT] NeuralAmpModelerCore v0.4.0.rc1 #605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b707da2
Update core to current 0.4.0 work in progress
sdatkinson Jan 13, 2026
9b45a98
Update NeuralAmpModelerCore
sdatkinson Jan 14, 2026
a2a9ec2
Update NeuralAmpModelerCore
sdatkinson Jan 15, 2026
f5deb57
Update NeuralAmpModelerCore
sdatkinson Jan 17, 2026
68f9aee
Update NeuralAmpModelerCore to mimo, head 1x1
sdatkinson Jan 19, 2026
f9fc289
Temp last-touches branch
sdatkinson Jan 21, 2026
6660fc2
NeuralAmpModelerCore v0.4.0.rc1
sdatkinson Jan 22, 2026
c743e5d
Formatting
sdatkinson Jan 22, 2026
b7be112
Update NeuralAmpModelerCore integration: add missing files and upgrad…
sdatkinson Jan 22, 2026
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
14 changes: 13 additions & 1 deletion NeuralAmpModeler/NeuralAmpModeler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ void NeuralAmpModeler::ProcessBlock(iplug::sample** inputs, iplug::sample** outp

if (mModel != nullptr)
{
mModel->process(triggerOutput[0], mOutputPointers[0], nFrames);
mModel->process(triggerOutput, mOutputPointers, nFrames);
}
else
{
Expand Down Expand Up @@ -693,6 +693,18 @@ std::string NeuralAmpModeler::_StageModel(const WDL_String& modelPath)
{
auto dspPath = std::filesystem::u8path(modelPath.Get());
std::unique_ptr<nam::DSP> model = nam::get_dsp(dspPath);

// Check that the model has 1 input and 1 output channel
if (model->NumInputChannels() != 1)
{
throw std::runtime_error("Model must have 1 input channel, but has " + std::to_string(model->NumInputChannels()));
}
if (model->NumOutputChannels() != 1)
{
throw std::runtime_error("Model must have 1 output channel, but has "
+ std::to_string(model->NumOutputChannels()));
}

std::unique_ptr<ResamplingNAM> temp = std::make_unique<ResamplingNAM>(std::move(model), GetSampleRate());
temp->Reset(GetSampleRate(), GetBlockSize());
mStagedModel = std::move(temp);
Expand Down
8 changes: 4 additions & 4 deletions NeuralAmpModeler/NeuralAmpModeler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,13 +95,13 @@ class ResamplingNAM : public nam::DSP
public:
// Resampling wrapper around the NAM models
ResamplingNAM(std::unique_ptr<nam::DSP> encapsulated, const double expected_sample_rate)
: nam::DSP(expected_sample_rate)
: nam::DSP(encapsulated->NumInputChannels(), encapsulated->NumOutputChannels(), expected_sample_rate)
, mEncapsulated(std::move(encapsulated))
, mResampler(GetNAMSampleRate(mEncapsulated))
{
// Assign the encapsulated object's processing function to this object's member so that the resampler can use it:
auto ProcessBlockFunc = [&](NAM_SAMPLE** input, NAM_SAMPLE** output, int numFrames) {
mEncapsulated->process(input[0], output[0], numFrames);
mEncapsulated->process(input, output, numFrames);
};
mBlockProcessFunc = ProcessBlockFunc;

Expand Down Expand Up @@ -133,7 +133,7 @@ class ResamplingNAM : public nam::DSP

void prewarm() override { mEncapsulated->prewarm(); };

void process(NAM_SAMPLE* input, NAM_SAMPLE* output, const int num_frames) override
void process(NAM_SAMPLE** input, NAM_SAMPLE** output, const int num_frames) override
{
if (num_frames > mMaxExternalBlockSize)
// We can afford to be careful
Expand All @@ -145,7 +145,7 @@ class ResamplingNAM : public nam::DSP
}
else
{
mResampler.ProcessBlock(&input, &output, num_frames, mBlockProcessFunc);
mResampler.ProcessBlock(input, output, num_frames, mBlockProcessFunc);
}
};

Expand Down
9 changes: 8 additions & 1 deletion NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask TaskName="PaceFixLogs" AssemblyFile="$(PACE_FUSION_HOME)PaceFusionUi2013.dll" />
<ItemGroup Label="ProjectConfigurations">
Expand Down Expand Up @@ -416,6 +416,7 @@
<ClCompile Include="..\..\AudioDSPTools\dsp\wav.cpp" />
<ClCompile Include="..\NeuralAmpModeler.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\activations.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\conv1d.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\convnet.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\dsp.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
Expand All @@ -427,6 +428,7 @@
</ClCompile>
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\get_dsp.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\lstm.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\ring_buffer.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\util.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\wavenet.cpp" />
<ClCompile Include="..\ToneStack.cpp" />
Expand Down Expand Up @@ -528,10 +530,15 @@
<ClInclude Include="..\NeuralAmpModeler.h" />
<ClInclude Include="..\NeuralAmpModelerControls.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\activations.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\conv1d.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\convnet.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\dsp.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\film.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\gating_activations.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\get_dsp.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\lstm.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\registry.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\ring_buffer.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\util.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\version.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\wavenet.h" />
Expand Down
9 changes: 8 additions & 1 deletion NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<UsingTask TaskName="PaceFixLogs" AssemblyFile="$(PACE_FUSION_HOME)PaceFusionUi2013.dll" />
<ItemGroup Label="ProjectConfigurations">
Expand Down Expand Up @@ -335,10 +335,15 @@
<ClInclude Include="..\NeuralAmpModeler.h" />
<ClInclude Include="..\NeuralAmpModelerControls.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\activations.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\conv1d.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\convnet.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\dsp.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\film.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\gating_activations.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\get_dsp.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\lstm.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\registry.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\ring_buffer.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\util.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\version.h" />
<ClInclude Include="..\..\NeuralAmpModelerCore\NAM\wavenet.h" />
Expand Down Expand Up @@ -392,6 +397,7 @@
<ClCompile Include="..\..\AudioDSPTools\dsp\wav.cpp" />
<ClCompile Include="..\NeuralAmpModeler.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\activations.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\conv1d.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\convnet.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\dsp.cpp">
<ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(RelativeDir)</ObjectFileName>
Expand All @@ -403,6 +409,7 @@
</ClCompile>
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\get_dsp.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\lstm.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\ring_buffer.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\util.cpp" />
<ClCompile Include="..\..\NeuralAmpModelerCore\NAM\wavenet.cpp" />
<ClCompile Include="..\ToneStack.cpp" />
Expand Down
28 changes: 28 additions & 0 deletions NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,13 @@
4FBDC96329FFF143004FF203 /* activations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94A29FFF143004FF203 /* activations.cpp */; };
4FBDC96429FFF143004FF203 /* wavenet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94B29FFF143004FF203 /* wavenet.cpp */; };
4FBDC96529FFF143004FF203 /* get_dsp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94C29FFF143004FF203 /* get_dsp.cpp */; };
4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97029FFF143004FF203 /* conv1d.cpp */; };
4FBDC97829FFF143004FF203 /* conv1d.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97129FFF143004FF203 /* conv1d.h */; };
4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97229FFF143004FF203 /* ring_buffer.cpp */; };
4FBDC97A29FFF143004FF203 /* ring_buffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97329FFF143004FF203 /* ring_buffer.h */; };
4FBDC97B29FFF143004FF203 /* film.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97429FFF143004FF203 /* film.h */; };
4FBDC97C29FFF143004FF203 /* gating_activations.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97529FFF143004FF203 /* gating_activations.h */; };
4FBDC97D29FFF143004FF203 /* registry.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FBDC97629FFF143004FF203 /* registry.h */; };
4FC69835293BA47F0076EC33 /* NeuralAmpModelerAU.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */; };
4FC69836293BA47F0076EC33 /* NeuralAmpModelerAU.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4FC6983A293BA4F10076EC33 /* NeuralAmpModelerAU.h in Headers */ = {isa = PBXBuildFile; fileRef = 4FA61F7B22E89A5900A92C58 /* NeuralAmpModelerAU.h */; settings = {ATTRIBUTES = (Public, ); }; };
Expand Down Expand Up @@ -282,6 +289,13 @@
4FBDC94429FFF143004FF203 /* convnet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = convnet.cpp; sourceTree = "<group>"; };
4FBDC94529FFF143004FF203 /* wavenet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet.h; sourceTree = "<group>"; };
4FBDC94629FFF143004FF203 /* lstm.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = lstm.cpp; sourceTree = "<group>"; };
4FBDC97029FFF143004FF203 /* conv1d.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = conv1d.cpp; sourceTree = "<group>"; };
4FBDC97129FFF143004FF203 /* conv1d.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = conv1d.h; sourceTree = "<group>"; };
4FBDC97229FFF143004FF203 /* ring_buffer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ring_buffer.cpp; sourceTree = "<group>"; };
4FBDC97329FFF143004FF203 /* ring_buffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ring_buffer.h; sourceTree = "<group>"; };
4FBDC97429FFF143004FF203 /* film.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = film.h; sourceTree = "<group>"; };
4FBDC97529FFF143004FF203 /* gating_activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = gating_activations.h; sourceTree = "<group>"; };
4FBDC97629FFF143004FF203 /* registry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = registry.h; sourceTree = "<group>"; };
4FBDC94729FFF143004FF203 /* util.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
4FBDC94829FFF143004FF203 /* dsp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dsp.h; sourceTree = "<group>"; };
4FBDC94929FFF143004FF203 /* activations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = activations.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -672,6 +686,13 @@
4FBDC94029FFF143004FF203 /* version.h */,
4FBDC94B29FFF143004FF203 /* wavenet.cpp */,
4FBDC94529FFF143004FF203 /* wavenet.h */,
4FBDC97029FFF143004FF203 /* conv1d.cpp */,
4FBDC97129FFF143004FF203 /* conv1d.h */,
4FBDC97229FFF143004FF203 /* ring_buffer.cpp */,
4FBDC97329FFF143004FF203 /* ring_buffer.h */,
4FBDC97429FFF143004FF203 /* film.h */,
4FBDC97529FFF143004FF203 /* gating_activations.h */,
4FBDC97629FFF143004FF203 /* registry.h */,
);
name = NAM;
path = ../../NeuralAmpModelerCore/NAM;
Expand Down Expand Up @@ -833,6 +854,11 @@
4FC6983A293BA4F10076EC33 /* NeuralAmpModelerAU.h in Headers */,
4FBDC95629FFF143004FF203 /* dsp.h in Headers */,
4FBDC95E29FFF143004FF203 /* wavenet.h in Headers */,
4FBDC97829FFF143004FF203 /* conv1d.h in Headers */,
4FBDC97A29FFF143004FF203 /* ring_buffer.h in Headers */,
4FBDC97B29FFF143004FF203 /* film.h in Headers */,
4FBDC97C29FFF143004FF203 /* gating_activations.h in Headers */,
4FBDC97D29FFF143004FF203 /* registry.h in Headers */,
4FC6983B293BA5020076EC33 /* IPlugAUAudioUnit.h in Headers */,
AA7C860B2B43A42F00B5FB3A /* ResamplingContainer.h in Headers */,
AA341E2B2B9E5A650069C260 /* ToneStack.h in Headers */,
Expand Down Expand Up @@ -1059,6 +1085,8 @@
4FBDC95829FFF143004FF203 /* util.cpp in Sources */,
4FC69849293BA5F90076EC33 /* ITextEntryControl.cpp in Sources */,
4FBDC96429FFF143004FF203 /* wavenet.cpp in Sources */,
4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */,
4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */,
4FC6984C293BA6010076EC33 /* IGraphicsCoreText.mm in Sources */,
4FC6984F293BA6420076EC33 /* IControl.cpp in Sources */,
4FC69848293BA5F90076EC33 /* IControls.cpp in Sources */,
Expand Down
Loading
Loading