Skip to content
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

Jump to bottom

Upgrade core to v0.2.0 #515

Merged
merged 4 commits into from
Oct 23, 2024
Merged

Upgrade core to v0.2.0 #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1aa1790
Update core
sdatkinson Oct 20, 2024
2fe3f94
Update core to putative v0.2.0
sdatkinson Oct 20, 2024
ca28ba9
Merge branch 'main' into 514-core
sdatkinson Oct 20, 2024
c953944
Add get_dsp.h to VS projects
sdatkinson Oct 20, 2024
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
1 change: 1 addition & 0 deletions NeuralAmpModeler/NeuralAmpModeler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

#include "Colors.h"
#include "NeuralAmpModelerCore/NAM/activations.h"
#include "NeuralAmpModelerCore/NAM/get_dsp.h"
// clang-format off
// These includes need to happen in this order or else the latter won't know
// a bunch of stuff.
Expand Down
2 changes: 1 addition & 1 deletion NeuralAmpModeler/NeuralAmpModelerCore
Open in desktop
Submodule NeuralAmpModelerCore updated 22 files
+9 −2 .github/workflows/build.yml
+1 −1 CMakeLists.txt
+4 −2 NAM/activations.cpp
+19 −0 NAM/activations.h
+1 −1 NAM/convnet.cpp
+3 −3 NAM/dsp.cpp
+29 −0 NAM/dsp.h
+35 −12 NAM/get_dsp.cpp
+15 −0 NAM/get_dsp.h
+1 −1 NAM/lstm.cpp
+1 −1 NAM/version.h
+7 −8 NAM/wavenet.cpp
+4 −2 README.md
+1 −0 example_models/lstm.nam
+1 −0 example_models/wavenet.nam
+7 −1 tools/CMakeLists.txt
+2 −3 tools/benchmodel.cpp
+40 −0 tools/run_tests.cpp
+122 −0 tools/test/test_activations.cpp
+66 −0 tools/test/test_dsp.cpp
+82 −0 tools/test/test_get_dsp.cpp
+76 −0 tools/test/test_wavenet.cpp
1 change: 1 addition & 0 deletions NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,6 +530,7 @@
<ClInclude Include="..\NeuralAmpModelerCore\NAM\activations.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\convnet.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\dsp.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\get_dsp.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\lstm.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\util.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\version.h" />
Expand Down
3 changes: 3 additions & 0 deletions NeuralAmpModeler/projects/NeuralAmpModeler-aax.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@
<Filter>dsp\ResamplingContainer\Dependencies\WDL</Filter>
</ClInclude>
<ClInclude Include="..\ToneStack.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\get_dsp.h">
<Filter>NAM</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
Expand Down
1 change: 1 addition & 0 deletions NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,6 +337,7 @@
<ClInclude Include="..\NeuralAmpModelerCore\NAM\activations.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\convnet.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\dsp.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\get_dsp.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\lstm.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\util.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\version.h" />
Expand Down
3 changes: 3 additions & 0 deletions NeuralAmpModeler/projects/NeuralAmpModeler-app.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,9 @@
<Filter>dsp\ResamplingContainer\Dependencies\WDL</Filter>
</ClInclude>
<ClInclude Include="..\ToneStack.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\get_dsp.h">
<Filter>NAM</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
Expand Down
4 changes: 4 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 @@ -94,6 +94,7 @@
AA7C860E2B43A42F00B5FB3A /* ptrlist.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7C86092B43A42E00B5FB3A /* ptrlist.h */; };
AA7C860F2B43A42F00B5FB3A /* heapbuf.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7C860A2B43A42E00B5FB3A /* heapbuf.h */; };
AA8CA7772A452EF500F5BEF0 /* resample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AA8CA7752A452EF500F5BEF0 /* resample.cpp */; };
AAB7BBB92CC4B8D6000B8B6E /* get_dsp.h in Headers */ = {isa = PBXBuildFile; fileRef = AAB7BBB82CC4B8D6000B8B6E /* get_dsp.h */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -353,6 +354,7 @@
AA7C86092B43A42E00B5FB3A /* ptrlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ptrlist.h; sourceTree = "<group>"; };
AA7C860A2B43A42E00B5FB3A /* heapbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = heapbuf.h; sourceTree = "<group>"; };
AA8CA7752A452EF500F5BEF0 /* resample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = resample.cpp; sourceTree = "<group>"; };
AAB7BBB82CC4B8D6000B8B6E /* get_dsp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = get_dsp.h; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -661,6 +663,7 @@
4FBDC94229FFF143004FF203 /* convnet.h */,
4FBDC94129FFF143004FF203 /* dsp.cpp */,
4FBDC94829FFF143004FF203 /* dsp.h */,
AAB7BBB82CC4B8D6000B8B6E /* get_dsp.h */,
4FBDC94C29FFF143004FF203 /* get_dsp.cpp */,
4FBDC94629FFF143004FF203 /* lstm.cpp */,
4FBDC94329FFF143004FF203 /* lstm.h */,
Expand Down Expand Up @@ -843,6 +846,7 @@
4FBDC95529FFF143004FF203 /* ImpulseResponse.h in Headers */,
4FBDC95029FFF143004FF203 /* NoiseGate.h in Headers */,
4FBDC96129FFF143004FF203 /* dsp.h in Headers */,
AAB7BBB92CC4B8D6000B8B6E /* get_dsp.h in Headers */,
4FBDC96029FFF143004FF203 /* util.h in Headers */,
4FBDC94F29FFF143004FF203 /* wav.h in Headers */,
);
Expand Down
4 changes: 4 additions & 0 deletions NeuralAmpModeler/projects/NeuralAmpModeler-macOS.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,6 +464,7 @@
AA7C86002B439AC000B5FB3A /* ptrlist.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7C85F72B439AC000B5FB3A /* ptrlist.h */; };
AA7C86012B439AC000B5FB3A /* heapbuf.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7C85F82B439AC000B5FB3A /* heapbuf.h */; };
AA7C86022B439AC000B5FB3A /* heapbuf.h in Headers */ = {isa = PBXBuildFile; fileRef = AA7C85F82B439AC000B5FB3A /* heapbuf.h */; };
AAB7BBB72CC4B8C6000B8B6E /* get_dsp.h in Headers */ = {isa = PBXBuildFile; fileRef = AAB7BBB62CC4B8C6000B8B6E /* get_dsp.h */; };
B885CBC52304AE7300D73128 /* IPlugProcessor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F8F61A8202807B9003F2573 /* IPlugProcessor.cpp */; };
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 */; };
Expand Down Expand Up @@ -1031,6 +1032,7 @@
AA7C85F62B439AC000B5FB3A /* wdltypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = wdltypes.h; sourceTree = "<group>"; };
AA7C85F72B439AC000B5FB3A /* ptrlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ptrlist.h; sourceTree = "<group>"; };
AA7C85F82B439AC000B5FB3A /* heapbuf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = heapbuf.h; sourceTree = "<group>"; };
AAB7BBB62CC4B8C6000B8B6E /* get_dsp.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = get_dsp.h; sourceTree = "<group>"; };
B8E22A0A220268C4007CBF4C /* IPlugVST3_ProcessorBase.cpp */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.cpp.cpp; name = IPlugVST3_ProcessorBase.cpp; path = ../../iPlug2/IPlug/VST3/IPlugVST3_ProcessorBase.cpp; sourceTree = "<group>"; 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 = "<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; };
Expand Down Expand Up @@ -1295,6 +1297,7 @@
4F2FB1482A0047420027AB66 /* dsp.cpp */,
4F2FB14F2A0047420027AB66 /* dsp.h */,
4F2FB1532A0047420027AB66 /* get_dsp.cpp */,
AAB7BBB62CC4B8C6000B8B6E /* get_dsp.h */,
4F2FB14D2A0047420027AB66 /* lstm.cpp */,
4F2FB14A2A0047420027AB66 /* lstm.h */,
4F2FB1462A0047420027AB66 /* util.cpp */,
Expand Down Expand Up @@ -2018,6 +2021,7 @@
4F78BE1222E73DD900AD537E /* NeuralAmpModelerAU.h in Headers */,
4F2FB1542A0047420027AB66 /* Resample.h in Headers */,
4F2FB15E2A0047420027AB66 /* wav.h in Headers */,
AAB7BBB72CC4B8C6000B8B6E /* get_dsp.h in Headers */,
4F2FB1902A0047430027AB66 /* version.h in Headers */,
AA7C86002B439AC000B5FB3A /* ptrlist.h in Headers */,
4F4856852773C3B5005BCF8E /* IPlugAUViewController.h in Headers */,
Expand Down
1 change: 1 addition & 0 deletions NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,7 @@
<ClInclude Include="..\NeuralAmpModelerCore\NAM\activations.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\convnet.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\dsp.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\get_dsp.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\lstm.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\util.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\version.h" />
Expand Down
3 changes: 3 additions & 0 deletions NeuralAmpModeler/projects/NeuralAmpModeler-vst3.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -460,6 +460,9 @@
<Filter>dsp\ResamplingContainer\Dependencies\WDL</Filter>
</ClInclude>
<ClInclude Include="..\ToneStack.h" />
<ClInclude Include="..\NeuralAmpModelerCore\NAM\get_dsp.h">
<Filter>NAM</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="resources">
Expand Down
Loading