From df07d53c033181b5ef6096d04b1503011e180a96 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Sun, 9 Aug 2026 15:53:10 -0700 Subject: [PATCH 1/4] Update NeuralAmpModelerCore to v0.5.5 --- .../projects/NeuralAmpModeler-aax.vcxproj | 7 ++- .../projects/NeuralAmpModeler-app.vcxproj | 7 ++- .../project.pbxproj | 20 ++++++++ .../project.pbxproj | 48 +++++++++++++++++++ .../projects/NeuralAmpModeler-vst3.vcxproj | 7 ++- NeuralAmpModelerCore | 2 +- 6 files changed, 87 insertions(+), 4 deletions(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj index b4ea647f2..83332aa46 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj @@ -427,7 +427,9 @@ $(IntDir)%(RelativeDir) + + @@ -533,13 +535,16 @@ + + + @@ -565,4 +570,4 @@ - \ No newline at end of file + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index e016cc972..769de1ac8 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -335,13 +335,16 @@ + + + @@ -410,7 +413,9 @@ $(IntDir)%(RelativeDir) + + @@ -439,4 +444,4 @@ - \ No newline at end of file + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj index cf9d95eb7..4de046d19 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj @@ -53,6 +53,11 @@ 4FBDC96429FFF143004FF203 /* model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94B29FFF143004FF203 /* model.cpp */; }; 4FBDC98029FFF143004FF203 /* slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97E29FFF143004FF203 /* slimmable.cpp */; }; 4FBDC98129FFF143004FF203 /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97F29FFF143004FF203 /* container.cpp */; }; + C05510000000000000000101 /* compiler.h in Headers */ = {isa = PBXBuildFile; fileRef = C05510000000000000000001 /* compiler.h */; }; + C05510000000000000000102 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05510000000000000000002 /* linear.cpp */; }; + C05510000000000000000103 /* linear.h in Headers */ = {isa = PBXBuildFile; fileRef = C05510000000000000000003 /* linear.h */; }; + C05510000000000000000104 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05510000000000000000004 /* nam_file.cpp */; }; + C05510000000000000000105 /* nam_file.h in Headers */ = {isa = PBXBuildFile; fileRef = C05510000000000000000005 /* nam_file.h */; }; 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 */; }; @@ -305,6 +310,11 @@ 4FBDC94B29FFF143004FF203 /* model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/model.cpp; sourceTree = ""; }; 4FBDC97E29FFF143004FF203 /* slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = ""; }; 4FBDC97F29FFF143004FF203 /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = ""; }; + C05510000000000000000001 /* compiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compiler.h; sourceTree = ""; }; + C05510000000000000000002 /* linear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = linear.cpp; sourceTree = ""; }; + C05510000000000000000003 /* linear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linear.h; sourceTree = ""; }; + C05510000000000000000004 /* nam_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nam_file.cpp; sourceTree = ""; }; + C05510000000000000000005 /* nam_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nam_file.h; sourceTree = ""; }; 4FBDC94C29FFF143004FF203 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = ""; }; 4FC46E58231440C8000045E7 /* web */ = {isa = PBXFileReference; lastKnownFileType = folder; name = web; path = ../resources/web; sourceTree = ""; }; 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NeuralAmpModelerAU.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -691,6 +701,11 @@ 4FBDC94B29FFF143004FF203 /* model.cpp */, 4FBDC97E29FFF143004FF203 /* slimmable.cpp */, 4FBDC97F29FFF143004FF203 /* container.cpp */, + C05510000000000000000001 /* compiler.h */, + C05510000000000000000002 /* linear.cpp */, + C05510000000000000000003 /* linear.h */, + C05510000000000000000004 /* nam_file.cpp */, + C05510000000000000000005 /* nam_file.h */, 4FBDC94529FFF143004FF203 /* model.h */, 4FBDC97029FFF143004FF203 /* conv1d.cpp */, 4FBDC97129FFF143004FF203 /* conv1d.h */, @@ -879,6 +894,9 @@ 4FBDC95029FFF143004FF203 /* NoiseGate.h in Headers */, 4FBDC96129FFF143004FF203 /* dsp.h in Headers */, AAB7BBB92CC4B8D6000B8B6E /* get_dsp.h in Headers */, + C05510000000000000000101 /* compiler.h in Headers */, + C05510000000000000000103 /* linear.h in Headers */, + C05510000000000000000105 /* nam_file.h in Headers */, 4FBDC96029FFF143004FF203 /* util.h in Headers */, 4FBDC94F29FFF143004FF203 /* wav.h in Headers */, ); @@ -1093,6 +1111,8 @@ 4FBDC96429FFF143004FF203 /* model.cpp in Sources */, 4FBDC98029FFF143004FF203 /* slimmable.cpp in Sources */, 4FBDC98129FFF143004FF203 /* container.cpp in Sources */, + C05510000000000000000102 /* linear.cpp in Sources */, + C05510000000000000000104 /* nam_file.cpp in Sources */, 4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */, 4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */, 4FC6984C293BA6010076EC33 /* IGraphicsCoreText.mm in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index e4cff679f..43772cd0a 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -461,6 +461,25 @@ AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AAB7E0102CC4B8C6000B8B6E /* container.cpp */; }; + C05500000000000000000101 /* compiler.h in Headers */ = {isa = PBXBuildFile; fileRef = C05500000000000000000001 /* compiler.h */; }; + C05500000000000000000102 /* linear.h in Headers */ = {isa = PBXBuildFile; fileRef = C05500000000000000000003 /* linear.h */; }; + C05500000000000000000103 /* nam_file.h in Headers */ = {isa = PBXBuildFile; fileRef = C05500000000000000000005 /* nam_file.h */; }; + C05500000000000000000201 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; + C05500000000000000000202 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; + C05500000000000000000203 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; + C05500000000000000000204 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; + C05500000000000000000205 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; + C05500000000000000000206 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; + C05500000000000000000207 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; + C05500000000000000000208 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; + C05500000000000000000301 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; + C05500000000000000000302 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; + C05500000000000000000303 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; + C05500000000000000000304 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; + C05500000000000000000305 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; + C05500000000000000000306 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; + C05500000000000000000307 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; + C05500000000000000000308 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; B1D2F7012D0000020027AB66 /* wavenet/slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */; }; B1D2F7032D0000020027AB66 /* wavenet/slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */; }; B1D2F7042D0000020027AB66 /* wavenet/slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */; }; @@ -1040,6 +1059,11 @@ AA7C85F82B439AC000B5FB3A /* heapbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = heapbuf.h; sourceTree = ""; }; AAB7BBB62CC4B8C6000B8B6E /* get_dsp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = get_dsp.h; sourceTree = ""; }; AAB7E0102CC4B8C6000B8B6E /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = ""; }; + C05500000000000000000001 /* compiler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = compiler.h; sourceTree = ""; }; + C05500000000000000000002 /* linear.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = linear.cpp; sourceTree = ""; }; + C05500000000000000000003 /* linear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linear.h; sourceTree = ""; }; + C05500000000000000000004 /* nam_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nam_file.cpp; sourceTree = ""; }; + C05500000000000000000005 /* nam_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nam_file.h; sourceTree = ""; }; B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = ""; }; B8E22A0A220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugVST3_ProcessorBase.cpp; path = ../../iPlug2/IPlug/VST3/IPlugVST3_ProcessorBase.cpp; sourceTree = ""; tabWidth = 2; }; B8E22A0B220268C4007CBF4C /* IPlugVST3_ProcessorBase.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3_ProcessorBase.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3_ProcessorBase.h; sourceTree = ""; tabWidth = 2; }; @@ -1294,6 +1318,11 @@ 4F2FB1512A0047420027AB66 /* activations.cpp */, 4F2FB1502A0047420027AB66 /* activations.h */, AAB7E0102CC4B8C6000B8B6E /* container.cpp */, + C05500000000000000000001 /* compiler.h */, + C05500000000000000000002 /* linear.cpp */, + C05500000000000000000003 /* linear.h */, + C05500000000000000000004 /* nam_file.cpp */, + C05500000000000000000005 /* nam_file.h */, 4F2FB14B2A0047420027AB66 /* convnet.cpp */, 4F2FB1492A0047420027AB66 /* convnet.h */, 4F2FB1562A0047420027AB67 /* conv1d.cpp */, @@ -2012,6 +2041,9 @@ 4F2FB1E22A0047430027AB68 /* film.h in Headers */, 4F2FB1E32A0047430027AB68 /* gating_activations.h in Headers */, 4F2FB1E42A0047430027AB68 /* registry.h in Headers */, + C05500000000000000000101 /* compiler.h in Headers */, + C05500000000000000000102 /* linear.h in Headers */, + C05500000000000000000103 /* nam_file.h in Headers */, 4F78BE1222E73DD900AD537E /* NeuralAmpModelerAU.h in Headers */, 4F2FB1542A0047420027AB66 /* Resample.h in Headers */, 4F2FB15E2A0047420027AB66 /* wav.h in Headers */, @@ -2574,6 +2606,8 @@ B1D2F7072D0000020027AB66 /* wavenet/slimmable.cpp in Sources */, C2A2FAE112D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */, AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */, + C05500000000000000000201 /* linear.cpp in Sources */, + C05500000000000000000301 /* nam_file.cpp in Sources */, 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1662A0047430027AB66 /* dsp.cpp in Sources */, @@ -2614,6 +2648,8 @@ B1D2F7042D0000020027AB66 /* wavenet/slimmable.cpp in Sources */, C2A2FAE122D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */, AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */, + C05500000000000000000202 /* linear.cpp in Sources */, + C05500000000000000000302 /* nam_file.cpp in Sources */, 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F8C10E320BA2796006320CD /* IGraphicsEditorDelegate.cpp in Sources */, @@ -2657,6 +2693,8 @@ B1D2F7092D0000020027AB66 /* wavenet/slimmable.cpp in Sources */, C2A2FAE132D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */, AAB7E0142CC4B8C6000B8B6E /* container.cpp in Sources */, + C05500000000000000000203 /* linear.cpp in Sources */, + C05500000000000000000303 /* nam_file.cpp in Sources */, 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F3EE1D0231438D000004786 /* IGraphicsMac_view.mm in Sources */, @@ -2726,6 +2764,8 @@ B1D2F7082D0000020027AB66 /* wavenet/slimmable.cpp in Sources */, C2A2FAE142D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */, AAB7E0152CC4B8C6000B8B6E /* container.cpp in Sources */, + C05500000000000000000204 /* linear.cpp in Sources */, + C05500000000000000000304 /* nam_file.cpp in Sources */, 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */, @@ -2763,6 +2803,8 @@ B1D2F7032D0000020027AB66 /* wavenet/slimmable.cpp in Sources */, C2A2FAE152D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */, AAB7E0162CC4B8C6000B8B6E /* container.cpp in Sources */, + C05500000000000000000205 /* linear.cpp in Sources */, + C05500000000000000000305 /* nam_file.cpp in Sources */, 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F815919205D50EB00393585 /* memorystream.cpp in Sources */, @@ -2846,6 +2888,8 @@ B1D2F7052D0000020027AB66 /* wavenet/slimmable.cpp in Sources */, C2A2FAE162D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */, AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */, + C05500000000000000000206 /* linear.cpp in Sources */, + C05500000000000000000306 /* nam_file.cpp in Sources */, 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A02A0047430027AB66 /* convnet.cpp in Sources */, @@ -2905,6 +2949,8 @@ B1D2F7012D0000020027AB66 /* wavenet/slimmable.cpp in Sources */, C2A2FAE172D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */, AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */, + C05500000000000000000207 /* linear.cpp in Sources */, + C05500000000000000000307 /* nam_file.cpp in Sources */, 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FB1F59120E4B011004157C8 /* IGraphicsMac_view.mm in Sources */, @@ -2983,6 +3029,8 @@ B1D2F7062D0000020027AB66 /* wavenet/slimmable.cpp in Sources */, C2A2FAE182D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */, AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */, + C05500000000000000000208 /* linear.cpp in Sources */, + C05500000000000000000308 /* nam_file.cpp in Sources */, 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FFBB91F20863B0E00DDD0E7 /* vstparameters.cpp in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index ec59513a1..dd6fab790 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -344,13 +344,16 @@ + + + @@ -438,7 +441,9 @@ $(IntDir)%(RelativeDir) + + @@ -464,4 +469,4 @@ - \ No newline at end of file + diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 9c7b185de..daae2d0b4 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 9c7b185de346fe0725dea537bcee4bc38b5bb6d6 +Subproject commit daae2d0b482a5fe876258caf3fdfe177044b6295 From 304a7c442650fcfee74bb198778cd3c411602de1 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Sun, 9 Aug 2026 15:57:43 -0700 Subject: [PATCH 2/4] Update Eigen to 5.0.1 --- eigen | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eigen b/eigen index ed8cda3ce..bc3b39870 160000 --- a/eigen +++ b/eigen @@ -1 +1 @@ -Subproject commit ed8cda3ce4cb9d12640f9236fed968655a93b604 +Subproject commit bc3b39870ecb690a623a3f49149a358b95c5781d From f657ce8097df4901e0ef1781d2f645a885c8f41f Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Sat, 22 Aug 2026 16:18:20 -0700 Subject: [PATCH 3/4] Update NeuralAmpModelerCore v0.5.5 candidate --- NeuralAmpModelerCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index daae2d0b4..1f9ac9bd6 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit daae2d0b482a5fe876258caf3fdfe177044b6295 +Subproject commit 1f9ac9bd65093e08449a9eced8b472b9d7aa2ffd From b052253cc5fae1fdd1e3358b05953e33abf62758 Mon Sep 17 00:00:00 2001 From: Steven Atkinson Date: Sat, 22 Aug 2026 16:38:04 -0700 Subject: [PATCH 4/4] Add Sequential model support --- .../projects/NeuralAmpModeler-aax.vcxproj | 2 ++ .../projects/NeuralAmpModeler-app.vcxproj | 2 ++ .../project.pbxproj | 8 +++++++ .../project.pbxproj | 22 +++++++++++++++++++ .../projects/NeuralAmpModeler-vst3.vcxproj | 2 ++ NeuralAmpModelerCore | 2 +- 6 files changed, 37 insertions(+), 1 deletion(-) diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj index 83332aa46..1b7a34217 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj @@ -430,6 +430,7 @@ + @@ -545,6 +546,7 @@ + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj index 769de1ac8..088f3a61e 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj @@ -345,6 +345,7 @@ + @@ -416,6 +417,7 @@ + diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj index 4de046d19..8b98f2fd9 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj @@ -58,6 +58,8 @@ C05510000000000000000103 /* linear.h in Headers */ = {isa = PBXBuildFile; fileRef = C05510000000000000000003 /* linear.h */; }; C05510000000000000000104 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05510000000000000000004 /* nam_file.cpp */; }; C05510000000000000000105 /* nam_file.h in Headers */ = {isa = PBXBuildFile; fileRef = C05510000000000000000005 /* nam_file.h */; }; + C05510000000000000000106 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05510000000000000000006 /* sequential.cpp */; }; + C05510000000000000000107 /* sequential.h in Headers */ = {isa = PBXBuildFile; fileRef = C05510000000000000000007 /* sequential.h */; }; 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 */; }; @@ -315,6 +317,8 @@ C05510000000000000000003 /* linear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linear.h; sourceTree = ""; }; C05510000000000000000004 /* nam_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nam_file.cpp; sourceTree = ""; }; C05510000000000000000005 /* nam_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nam_file.h; sourceTree = ""; }; + C05510000000000000000006 /* sequential.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequential.cpp; sourceTree = ""; }; + C05510000000000000000007 /* sequential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sequential.h; sourceTree = ""; }; 4FBDC94C29FFF143004FF203 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = ""; }; 4FC46E58231440C8000045E7 /* web */ = {isa = PBXFileReference; lastKnownFileType = folder; name = web; path = ../resources/web; sourceTree = ""; }; 4FC6982F293BA47F0076EC33 /* NeuralAmpModelerAU.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NeuralAmpModelerAU.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -706,6 +710,8 @@ C05510000000000000000003 /* linear.h */, C05510000000000000000004 /* nam_file.cpp */, C05510000000000000000005 /* nam_file.h */, + C05510000000000000000006 /* sequential.cpp */, + C05510000000000000000007 /* sequential.h */, 4FBDC94529FFF143004FF203 /* model.h */, 4FBDC97029FFF143004FF203 /* conv1d.cpp */, 4FBDC97129FFF143004FF203 /* conv1d.h */, @@ -897,6 +903,7 @@ C05510000000000000000101 /* compiler.h in Headers */, C05510000000000000000103 /* linear.h in Headers */, C05510000000000000000105 /* nam_file.h in Headers */, + C05510000000000000000107 /* sequential.h in Headers */, 4FBDC96029FFF143004FF203 /* util.h in Headers */, 4FBDC94F29FFF143004FF203 /* wav.h in Headers */, ); @@ -1113,6 +1120,7 @@ 4FBDC98129FFF143004FF203 /* container.cpp in Sources */, C05510000000000000000102 /* linear.cpp in Sources */, C05510000000000000000104 /* nam_file.cpp in Sources */, + C05510000000000000000106 /* sequential.cpp in Sources */, 4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */, 4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */, 4FC6984C293BA6010076EC33 /* IGraphicsCoreText.mm in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index 43772cd0a..3fabca476 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -464,6 +464,7 @@ C05500000000000000000101 /* compiler.h in Headers */ = {isa = PBXBuildFile; fileRef = C05500000000000000000001 /* compiler.h */; }; C05500000000000000000102 /* linear.h in Headers */ = {isa = PBXBuildFile; fileRef = C05500000000000000000003 /* linear.h */; }; C05500000000000000000103 /* nam_file.h in Headers */ = {isa = PBXBuildFile; fileRef = C05500000000000000000005 /* nam_file.h */; }; + C05500000000000000000104 /* sequential.h in Headers */ = {isa = PBXBuildFile; fileRef = C05500000000000000000007 /* sequential.h */; }; C05500000000000000000201 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; C05500000000000000000202 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; C05500000000000000000203 /* linear.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000002 /* linear.cpp */; }; @@ -480,6 +481,14 @@ C05500000000000000000306 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; C05500000000000000000307 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; C05500000000000000000308 /* nam_file.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000004 /* nam_file.cpp */; }; + C05500000000000000000401 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000006 /* sequential.cpp */; }; + C05500000000000000000402 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000006 /* sequential.cpp */; }; + C05500000000000000000403 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000006 /* sequential.cpp */; }; + C05500000000000000000404 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000006 /* sequential.cpp */; }; + C05500000000000000000405 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000006 /* sequential.cpp */; }; + C05500000000000000000406 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000006 /* sequential.cpp */; }; + C05500000000000000000407 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000006 /* sequential.cpp */; }; + C05500000000000000000408 /* sequential.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C05500000000000000000006 /* sequential.cpp */; }; B1D2F7012D0000020027AB66 /* wavenet/slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */; }; B1D2F7032D0000020027AB66 /* wavenet/slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */; }; B1D2F7042D0000020027AB66 /* wavenet/slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */; }; @@ -1064,6 +1073,8 @@ C05500000000000000000003 /* linear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = linear.h; sourceTree = ""; }; C05500000000000000000004 /* nam_file.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = nam_file.cpp; sourceTree = ""; }; C05500000000000000000005 /* nam_file.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = nam_file.h; sourceTree = ""; }; + C05500000000000000000006 /* sequential.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sequential.cpp; sourceTree = ""; }; + C05500000000000000000007 /* sequential.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sequential.h; sourceTree = ""; }; B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = ""; }; B8E22A0A220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugVST3_ProcessorBase.cpp; path = ../../iPlug2/IPlug/VST3/IPlugVST3_ProcessorBase.cpp; sourceTree = ""; tabWidth = 2; }; B8E22A0B220268C4007CBF4C /* IPlugVST3_ProcessorBase.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3_ProcessorBase.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3_ProcessorBase.h; sourceTree = ""; tabWidth = 2; }; @@ -1323,6 +1334,8 @@ C05500000000000000000003 /* linear.h */, C05500000000000000000004 /* nam_file.cpp */, C05500000000000000000005 /* nam_file.h */, + C05500000000000000000006 /* sequential.cpp */, + C05500000000000000000007 /* sequential.h */, 4F2FB14B2A0047420027AB66 /* convnet.cpp */, 4F2FB1492A0047420027AB66 /* convnet.h */, 4F2FB1562A0047420027AB67 /* conv1d.cpp */, @@ -2044,6 +2057,7 @@ C05500000000000000000101 /* compiler.h in Headers */, C05500000000000000000102 /* linear.h in Headers */, C05500000000000000000103 /* nam_file.h in Headers */, + C05500000000000000000104 /* sequential.h in Headers */, 4F78BE1222E73DD900AD537E /* NeuralAmpModelerAU.h in Headers */, 4F2FB1542A0047420027AB66 /* Resample.h in Headers */, 4F2FB15E2A0047420027AB66 /* wav.h in Headers */, @@ -2608,6 +2622,7 @@ AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */, C05500000000000000000201 /* linear.cpp in Sources */, C05500000000000000000301 /* nam_file.cpp in Sources */, + C05500000000000000000401 /* sequential.cpp in Sources */, 4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1662A0047430027AB66 /* dsp.cpp in Sources */, @@ -2650,6 +2665,7 @@ AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */, C05500000000000000000202 /* linear.cpp in Sources */, C05500000000000000000302 /* nam_file.cpp in Sources */, + C05500000000000000000402 /* sequential.cpp in Sources */, 4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F8C10E320BA2796006320CD /* IGraphicsEditorDelegate.cpp in Sources */, @@ -2695,6 +2711,7 @@ AAB7E0142CC4B8C6000B8B6E /* container.cpp in Sources */, C05500000000000000000203 /* linear.cpp in Sources */, C05500000000000000000303 /* nam_file.cpp in Sources */, + C05500000000000000000403 /* sequential.cpp in Sources */, 4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F3EE1D0231438D000004786 /* IGraphicsMac_view.mm in Sources */, @@ -2766,6 +2783,7 @@ AAB7E0152CC4B8C6000B8B6E /* container.cpp in Sources */, C05500000000000000000204 /* linear.cpp in Sources */, C05500000000000000000304 /* nam_file.cpp in Sources */, + C05500000000000000000404 /* sequential.cpp in Sources */, 4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A32A0047430027AB66 /* convnet.cpp in Sources */, @@ -2805,6 +2823,7 @@ AAB7E0162CC4B8C6000B8B6E /* container.cpp in Sources */, C05500000000000000000205 /* linear.cpp in Sources */, C05500000000000000000305 /* nam_file.cpp in Sources */, + C05500000000000000000405 /* sequential.cpp in Sources */, 4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F815919205D50EB00393585 /* memorystream.cpp in Sources */, @@ -2890,6 +2909,7 @@ AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */, C05500000000000000000206 /* linear.cpp in Sources */, C05500000000000000000306 /* nam_file.cpp in Sources */, + C05500000000000000000406 /* sequential.cpp in Sources */, 4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4F2FB1A02A0047430027AB66 /* convnet.cpp in Sources */, @@ -2951,6 +2971,7 @@ AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */, C05500000000000000000207 /* linear.cpp in Sources */, C05500000000000000000307 /* nam_file.cpp in Sources */, + C05500000000000000000407 /* sequential.cpp in Sources */, 4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FB1F59120E4B011004157C8 /* IGraphicsMac_view.mm in Sources */, @@ -3031,6 +3052,7 @@ AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */, C05500000000000000000208 /* linear.cpp in Sources */, C05500000000000000000308 /* nam_file.cpp in Sources */, + C05500000000000000000408 /* sequential.cpp in Sources */, 4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */, 4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */, 4FFBB91F20863B0E00DDD0E7 /* vstparameters.cpp in Sources */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj index dd6fab790..f5c6bf418 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj @@ -354,6 +354,7 @@ + @@ -444,6 +445,7 @@ + diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 1f9ac9bd6..d2b295466 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 1f9ac9bd65093e08449a9eced8b472b9d7aa2ffd +Subproject commit d2b295466f2a96a398bb03caf01a5e59b7f45b73