Skip to content
Draft
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
2 changes: 1 addition & 1 deletion NeuralAmpModeler/config/NeuralAmpModeler-ios.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ EXTRA_LNK_FLAGS = -framework Metal -framework MetalKit -framework Accelerate//$(
//------------------------------
// PREPROCESSOR MACROS

EXTRA_ALL_DEFS = OBJC_PREFIX=vNeuralAmpModeler IGRAPHICS_NANOVG IGRAPHICS_METAL GRAYED_ALPHA=0.5f
EXTRA_ALL_DEFS = OBJC_PREFIX=vNeuralAmpModeler IGRAPHICS_NANOVG IGRAPHICS_METAL GRAYED_ALPHA=0.5f NAM_ENABLE_A2_FAST NAM_ENABLE_FUSED
//EXTRA_DEBUG_DEFS =
//EXTRA_RELEASE_DEFS =
//EXTRA_TRACER_DEFS =
Expand Down
2 changes: 1 addition & 1 deletion NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ EXTRA_LNK_FLAGS = -framework Accelerate -framework Metal -framework MetalKit //

//------------------------------
// PREPROCESSOR MACROS
EXTRA_ALL_DEFS = OBJC_PREFIX=vNeuralAmpModeler SWELL_APP_PREFIX=Swell_vNeuralAmpModeler IGRAPHICS_NANOVG IGRAPHICS_METAL GRAYED_ALPHA=0.5f NAM_ENABLE_A2_FAST
EXTRA_ALL_DEFS = OBJC_PREFIX=vNeuralAmpModeler SWELL_APP_PREFIX=Swell_vNeuralAmpModeler IGRAPHICS_NANOVG IGRAPHICS_METAL GRAYED_ALPHA=0.5f NAM_ENABLE_A2_FAST NAM_ENABLE_FUSED
//EXTRA_DEBUG_DEFS =
//EXTRA_RELEASE_DEFS =
//EXTRA_TRACER_DEFS =
Expand Down
2 changes: 1 addition & 1 deletion NeuralAmpModeler/config/NeuralAmpModeler-win.props
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup Label="UserMacros">
<IPLUG2_ROOT>$(ProjectDir)..\..\iPlug2</IPLUG2_ROOT>
<BINARY_NAME>NeuralAmpModeler</BINARY_NAME>
<EXTRA_ALL_DEFS>IGRAPHICS_NANOVG;IGRAPHICS_GL2;GRAYED_ALPHA=0.5f;NAM_ENABLE_A2_FAST</EXTRA_ALL_DEFS>
<EXTRA_ALL_DEFS>IGRAPHICS_NANOVG;IGRAPHICS_GL2;GRAYED_ALPHA=0.5f;NAM_ENABLE_A2_FAST;NAM_ENABLE_FUSED</EXTRA_ALL_DEFS>
<EXTRA_DEBUG_DEFS />
<EXTRA_RELEASE_DEFS />
<EXTRA_TRACER_DEFS />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
4FBDC96329FFF143004FF203 /* activations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94A29FFF143004FF203 /* activations.cpp */; };
4FBDC96429FFF143004FF203 /* model.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC94B29FFF143004FF203 /* model.cpp */; };
4FBDC98029FFF143004FF203 /* slimmable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97E29FFF143004FF203 /* slimmable.cpp */; };
4FBDC980A2FA5701004FF203 /* a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97EA2FA5701004FF203 /* a2_fast.cpp */; };
4FBDC980A2FA5701004FF203 /* fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97EA2FA5701004FF203 /* fused.cpp */; };
4FBDC98129FFF143004FF203 /* container.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FBDC97F29FFF143004FF203 /* container.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 */; };
Expand Down Expand Up @@ -304,6 +306,8 @@
4FBDC94A29FFF143004FF203 /* activations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = activations.cpp; sourceTree = "<group>"; };
4FBDC94B29FFF143004FF203 /* model.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/model.cpp; sourceTree = "<group>"; };
4FBDC97E29FFF143004FF203 /* slimmable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/slimmable.cpp; sourceTree = "<group>"; };
4FBDC97EA2FA5701004FF203 /* a2_fast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/a2_fast.cpp; sourceTree = "<group>"; };
4FBDC97EA2FA5701004FF203 /* fused.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/fused.cpp; sourceTree = "<group>"; };
4FBDC97F29FFF143004FF203 /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; sourceTree = "<group>"; };
4FBDC94C29FFF143004FF203 /* get_dsp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = get_dsp.cpp; sourceTree = "<group>"; };
4FC46E58231440C8000045E7 /* web */ = {isa = PBXFileReference; lastKnownFileType = folder; name = web; path = ../resources/web; sourceTree = "<group>"; };
Expand Down Expand Up @@ -690,6 +694,8 @@
4FBDC94029FFF143004FF203 /* version.h */,
4FBDC94B29FFF143004FF203 /* model.cpp */,
4FBDC97E29FFF143004FF203 /* slimmable.cpp */,
4FBDC97EA2FA5701004FF203 /* a2_fast.cpp */,
4FBDC97EA2FA5701004FF203 /* fused.cpp */,
4FBDC97F29FFF143004FF203 /* container.cpp */,
4FBDC94529FFF143004FF203 /* model.h */,
4FBDC97029FFF143004FF203 /* conv1d.cpp */,
Expand Down Expand Up @@ -1092,6 +1098,8 @@
4FC69849293BA5F90076EC33 /* ITextEntryControl.cpp in Sources */,
4FBDC96429FFF143004FF203 /* model.cpp in Sources */,
4FBDC98029FFF143004FF203 /* slimmable.cpp in Sources */,
4FBDC980A2FA5701004FF203 /* a2_fast.cpp in Sources */,
4FBDC980A2FA5701004FF203 /* fused.cpp in Sources */,
4FBDC98129FFF143004FF203 /* container.cpp in Sources */,
4FBDC97729FFF143004FF203 /* conv1d.cpp in Sources */,
4FBDC97929FFF143004FF203 /* ring_buffer.cpp in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -473,13 +473,21 @@
B8E22A0C220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8E22A0A220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp */; };
B8E22A0D220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8E22A0A220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp */; };
C2A2FAE112D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */; };
C2F05ED112D0000120027AB66 /* wavenet/fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */; };
C2A2FAE122D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */; };
C2F05ED122D0000120027AB66 /* wavenet/fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */; };
C2A2FAE132D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */; };
C2F05ED132D0000120027AB66 /* wavenet/fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */; };
C2A2FAE142D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */; };
C2F05ED142D0000120027AB66 /* wavenet/fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */; };
C2A2FAE152D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */; };
C2F05ED152D0000120027AB66 /* wavenet/fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */; };
C2A2FAE162D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */; };
C2F05ED162D0000120027AB66 /* wavenet/fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */; };
C2A2FAE172D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */; };
C2F05ED172D0000120027AB66 /* wavenet/fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */; };
C2A2FAE182D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */; };
C2F05ED182D0000120027AB66 /* wavenet/fused.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -1045,7 +1053,9 @@
B8E22A0B220268C4007CBF4C /* IPlugVST3_ProcessorBase.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3_ProcessorBase.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3_ProcessorBase.h; sourceTree = "<group>"; tabWidth = 2; };
B8EA6B932203868500D23A86 /* IPlugVST3_Common.h */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.c.h; name = IPlugVST3_Common.h; path = ../../iPlug2/IPlug/VST3/IPlugVST3_Common.h; sourceTree = "<group>"; tabWidth = 2; };
C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/a2_fast.cpp; sourceTree = "<group>"; };
C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/fused.cpp; sourceTree = "<group>"; };
C2A2FAE022D0000110027AB66 /* wavenet/a2_fast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/a2_fast.h; sourceTree = "<group>"; };
C2F05ED022D0000110027AB66 /* wavenet/fused.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/fused.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -1311,7 +1321,9 @@
4F2FB1472A0047420027AB66 /* version.h */,
4F2FB1522A0047420027AB66 /* wavenet/model.cpp */,
C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */,
C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */,
C2A2FAE022D0000110027AB66 /* wavenet/a2_fast.h */,
C2F05ED022D0000110027AB66 /* wavenet/fused.h */,
B1D2F7002D0000010027AB66 /* wavenet/slimmable.cpp */,
4F2FB14C2A0047420027AB66 /* wavenet/model.h */,
4F2FB15A2A0047420027AB68 /* film.h */,
Expand Down Expand Up @@ -2573,6 +2585,7 @@
4F2FB1C12A0047430027AB66 /* wavenet/model.cpp in Sources */,
B1D2F7072D0000020027AB66 /* wavenet/slimmable.cpp in Sources */,
C2A2FAE112D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */,
C2F05ED112D0000120027AB66 /* wavenet/fused.cpp in Sources */,
AAB7E0122CC4B8C6000B8B6E /* container.cpp in Sources */,
4F2FB1CF2A0047430027AB66 /* conv1d.cpp in Sources */,
4F2FB1D92A0047430027AB66 /* ring_buffer.cpp in Sources */,
Expand Down Expand Up @@ -2613,6 +2626,7 @@
4F2FB1BE2A0047430027AB66 /* wavenet/model.cpp in Sources */,
B1D2F7042D0000020027AB66 /* wavenet/slimmable.cpp in Sources */,
C2A2FAE122D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */,
C2F05ED122D0000120027AB66 /* wavenet/fused.cpp in Sources */,
AAB7E0132CC4B8C6000B8B6E /* container.cpp in Sources */,
4F2FB1D02A0047430027AB66 /* conv1d.cpp in Sources */,
4F2FB1DA2A0047430027AB66 /* ring_buffer.cpp in Sources */,
Expand Down Expand Up @@ -2656,6 +2670,7 @@
4F2FB1C32A0047430027AB66 /* wavenet/model.cpp in Sources */,
B1D2F7092D0000020027AB66 /* wavenet/slimmable.cpp in Sources */,
C2A2FAE132D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */,
C2F05ED132D0000120027AB66 /* wavenet/fused.cpp in Sources */,
AAB7E0142CC4B8C6000B8B6E /* container.cpp in Sources */,
4F2FB1D12A0047430027AB66 /* conv1d.cpp in Sources */,
4F2FB1DB2A0047430027AB66 /* ring_buffer.cpp in Sources */,
Expand Down Expand Up @@ -2725,6 +2740,7 @@
4F2FB1C22A0047430027AB66 /* wavenet/model.cpp in Sources */,
B1D2F7082D0000020027AB66 /* wavenet/slimmable.cpp in Sources */,
C2A2FAE142D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */,
C2F05ED142D0000120027AB66 /* wavenet/fused.cpp in Sources */,
AAB7E0152CC4B8C6000B8B6E /* container.cpp in Sources */,
4F2FB1D22A0047430027AB66 /* conv1d.cpp in Sources */,
4F2FB1DC2A0047430027AB66 /* ring_buffer.cpp in Sources */,
Expand Down Expand Up @@ -2762,6 +2778,7 @@
4F2FB1BD2A0047430027AB66 /* wavenet/model.cpp in Sources */,
B1D2F7032D0000020027AB66 /* wavenet/slimmable.cpp in Sources */,
C2A2FAE152D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */,
C2F05ED152D0000120027AB66 /* wavenet/fused.cpp in Sources */,
AAB7E0162CC4B8C6000B8B6E /* container.cpp in Sources */,
4F2FB1D32A0047430027AB66 /* conv1d.cpp in Sources */,
4F2FB1DD2A0047430027AB66 /* ring_buffer.cpp in Sources */,
Expand Down Expand Up @@ -2845,6 +2862,7 @@
4F2FB1BF2A0047430027AB66 /* wavenet/model.cpp in Sources */,
B1D2F7052D0000020027AB66 /* wavenet/slimmable.cpp in Sources */,
C2A2FAE162D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */,
C2F05ED162D0000120027AB66 /* wavenet/fused.cpp in Sources */,
AAB7E0172CC4B8C6000B8B6E /* container.cpp in Sources */,
4F2FB1D42A0047430027AB66 /* conv1d.cpp in Sources */,
4F2FB1DE2A0047430027AB66 /* ring_buffer.cpp in Sources */,
Expand Down Expand Up @@ -2904,6 +2922,7 @@
4F2FB1BB2A0047430027AB66 /* wavenet/model.cpp in Sources */,
B1D2F7012D0000020027AB66 /* wavenet/slimmable.cpp in Sources */,
C2A2FAE172D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */,
C2F05ED172D0000120027AB66 /* wavenet/fused.cpp in Sources */,
AAB7E0182CC4B8C6000B8B6E /* container.cpp in Sources */,
4F2FB1D52A0047430027AB66 /* conv1d.cpp in Sources */,
4F2FB1DF2A0047430027AB66 /* ring_buffer.cpp in Sources */,
Expand Down Expand Up @@ -2982,6 +3001,7 @@
4F2FB1C02A0047430027AB66 /* wavenet/model.cpp in Sources */,
B1D2F7062D0000020027AB66 /* wavenet/slimmable.cpp in Sources */,
C2A2FAE182D0000120027AB66 /* wavenet/a2_fast.cpp in Sources */,
C2F05ED182D0000120027AB66 /* wavenet/fused.cpp in Sources */,
AAB7E0192CC4B8C6000B8B6E /* container.cpp in Sources */,
4F2FB1D62A0047430027AB66 /* conv1d.cpp in Sources */,
4F2FB1E02A0047430027AB66 /* ring_buffer.cpp in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion NeuralAmpModelerCore
Submodule NeuralAmpModelerCore updated 55 files
+5 −0 .gitignore
+29 −2 CMakeLists.txt
+1 −1 Dependencies/eigen
+7 −0 NAM/compiler.h
+32 −1 NAM/container.cpp
+5 −3 NAM/container.h
+69 −30 NAM/conv1d.cpp
+2 −1 NAM/convnet.h
+146 −123 NAM/dsp.cpp
+47 −74 NAM/dsp.h
+18 −17 NAM/film.h
+9 −8 NAM/gating_activations.h
+44 −26 NAM/get_dsp.cpp
+24 −5 NAM/get_dsp.h
+336 −0 NAM/linear.cpp
+101 −0 NAM/linear.h
+9 −5 NAM/lstm.cpp
+13 −6 NAM/lstm.h
+1 −1 NAM/model_config.h
+7 −0 NAM/slimmable.h
+1 −1 NAM/version.h
+27 −2 NAM/wavenet/a2_fast.cpp
+1,078 −0 NAM/wavenet/fused.cpp
+67 −0 NAM/wavenet/fused.h
+42 −17 NAM/wavenet/model.cpp
+5 −1 NAM/wavenet/model.h
+4 −1 NAM/wavenet/params.h
+60 −24 NAM/wavenet/slimmable.cpp
+19 −6 NAM/wavenet/slimmable.h
+99 −0 benchmark_reports/benchmark_report_20260712_192034.txt
+140 −0 benchmark_reports/benchmark_report_20260712_apple_m2_baseline.txt
+79 −0 benchmark_reports/generate_a2_models.py
+124 −0 benchmark_reports/run_benchmarks.sh
+20 −2 docs/conf.py
+121 −0 docs/fused-engine.md
+14,610 −0 example_models/A2.nam
+18 −2 tools/benchmodel.cpp
+56 −0 tools/run_tests.cpp
+53 −0 tools/test/test_a2_fast.cpp
+16 −2 tools/test/test_container.cpp
+99 −0 tools/test/test_conv1d.cpp
+79 −0 tools/test/test_conv_1x1.cpp
+96 −0 tools/test/test_dsp.cpp
+400 −0 tools/test/test_fused.cpp
+122 −1 tools/test/test_get_dsp.cpp
+197 −0 tools/test/test_linear.cpp
+146 −0 tools/test/test_lstm_realtime_safe.cpp
+14 −0 tools/test/test_slimmable_wavenet.cpp
+1 −1 tools/test/test_wavenet/test_condition_processing.cpp
+1 −1 tools/test/test_wavenet/test_full.cpp
+3 −3 tools/test/test_wavenet/test_layer_array.cpp
+29 −0 tools/test/test_wavenet/test_layer_head_config.cpp
+1 −1 tools/test/test_wavenet/test_output_head.cpp
+2 −2 tools/test/test_wavenet/test_real_time_safe.cpp
+2 −2 tools/test/test_wavenet_configurable_gating.cpp