diff --git a/NeuralAmpModeler/config/NeuralAmpModeler-ios.xcconfig b/NeuralAmpModeler/config/NeuralAmpModeler-ios.xcconfig index f46bfcc93..1b5c925d9 100644 --- a/NeuralAmpModeler/config/NeuralAmpModeler-ios.xcconfig +++ b/NeuralAmpModeler/config/NeuralAmpModeler-ios.xcconfig @@ -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 = diff --git a/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig b/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig index 5291fe263..3808c4d47 100644 --- a/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig +++ b/NeuralAmpModeler/config/NeuralAmpModeler-mac.xcconfig @@ -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 = diff --git a/NeuralAmpModeler/config/NeuralAmpModeler-win.props b/NeuralAmpModeler/config/NeuralAmpModeler-win.props index c69767281..1a45c1fa5 100644 --- a/NeuralAmpModeler/config/NeuralAmpModeler-win.props +++ b/NeuralAmpModeler/config/NeuralAmpModeler-win.props @@ -3,7 +3,7 @@ $(ProjectDir)..\..\iPlug2 NeuralAmpModeler - IGRAPHICS_NANOVG;IGRAPHICS_GL2;GRAYED_ALPHA=0.5f;NAM_ENABLE_A2_FAST + IGRAPHICS_NANOVG;IGRAPHICS_GL2;GRAYED_ALPHA=0.5f;NAM_ENABLE_A2_FAST;NAM_ENABLE_FUSED diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj index cf9d95eb7..56f7e3be1 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-iOS.xcodeproj/project.pbxproj @@ -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 */; }; @@ -304,6 +306,8 @@ 4FBDC94A29FFF143004FF203 /* activations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = activations.cpp; sourceTree = ""; }; 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 = ""; }; + 4FBDC97EA2FA5701004FF203 /* a2_fast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/a2_fast.cpp; sourceTree = ""; }; + 4FBDC97EA2FA5701004FF203 /* fused.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/fused.cpp; sourceTree = ""; }; 4FBDC97F29FFF143004FF203 /* container.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = container.cpp; 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 = ""; }; @@ -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 */, @@ -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 */, diff --git a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj index e4cff679f..d56ccdee8 100644 --- a/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj +++ b/NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj @@ -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 */ @@ -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 = ""; 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 = ""; tabWidth = 2; }; C2A2FAE012D0000110027AB66 /* wavenet/a2_fast.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/a2_fast.cpp; sourceTree = ""; }; + C2F05ED012D0000110027AB66 /* wavenet/fused.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = wavenet/fused.cpp; sourceTree = ""; }; C2A2FAE022D0000110027AB66 /* wavenet/a2_fast.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/a2_fast.h; sourceTree = ""; }; + C2F05ED022D0000110027AB66 /* wavenet/fused.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wavenet/fused.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -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 */, @@ -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 */, @@ -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 */, @@ -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 */, @@ -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 */, @@ -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 */, @@ -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 */, @@ -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 */, @@ -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 */, diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore index 9c7b185de..09d46b096 160000 --- a/NeuralAmpModelerCore +++ b/NeuralAmpModelerCore @@ -1 +1 @@ -Subproject commit 9c7b185de346fe0725dea537bcee4bc38b5bb6d6 +Subproject commit 09d46b096642423ca6d4eb02c11becad666adf04