Update NeuralAudio. Bump version -> 0.1.9

fix hardcode lib dir

.github/workflows/build.yml

@@ -20,10 +20,26 @@ jobs:
       env:
         CXX: clang++
       run: |
-        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_UTILS=ON -DBUILD_NAMCORE=ON -DBUILD_STATIC_RTNEURAL=ON 
         cmake --build . --config $BUILD_TYPE -j4
         cpack
 
+    - name: Run ModelTest
+      working-directory: ${{github.workspace}}/build/src/NeuralAudio/Utils/ModelTest
+      run: ./ModelTest
+      
+    - name: Upload binary
+      uses: actions/upload-artifact@v4
+      with:
+        name: neural_amp_modeler.lv2-linux-amd64
+        path: ${{github.workspace}}/build/neural_amp_modeler.lv2
+
+#    - name: Upload deb
+#      uses: actions/upload-artifact@v4
+#      with:
+#        name: neural_amp_modeler.lv2-linux-deb-amd64
+#        path: ${{github.workspace}}/build/*.deb
+        
   build-windows:
     name: Build Windows
     runs-on: windows-latest
@@ -35,5 +51,15 @@ jobs:
     - name: Build Plugin
       working-directory: ${{github.workspace}}/build
       run: |
-        cmake.exe -G "Visual Studio 17 2022" -A x64 ..
+        cmake.exe -G "Visual Studio 17 2022" -A x64 -DBUILD_UTILS=ON -DBUILD_NAMCORE=ON -DBUILD_STATIC_RTNEURAL=ON -T ClangCL ..
         cmake --build . --config=release -j4
+
+    - name: Run ModelTest
+      working-directory: ${{github.workspace}}/build/src/NeuralAudio/Utils/ModelTest/Release
+      run: ./ModelTest.exe
+        
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: neural_amp_modeler.lv2-win
+        path: ${{github.workspace}}/build/neural_amp_modeler.lv2

.github/workflows/release.yml

@@ -0,0 +1,147 @@
+name: Release
+
+on:
+  workflow_dispatch:
+
+env:
+  BUILD_TYPE: Release
+  
+jobs:
+  create_release:
+    name: Create release
+    runs-on: ubuntu-latest
+    outputs:
+      upload_url: ${{steps.create_release.outputs.upload_url}}
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Create release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        with:
+          draft: true
+          tag_name: ${{github.ref}}
+          release_name: Release ${{github.ref}}
+
+  build-linux-x64:
+    name: Build Linux x64
+    needs: create_release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3.3.0
+      with:
+        submodules: recursive
+    
+    - name: Build Plugin
+      working-directory: ${{github.workspace}}/build
+      env:
+        CXX: clang++
+      run: |
+        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DLSTM_PREFER_NAM=OFF -DWAVENET_PREFER_NAM=OFF
+        cmake --build . --config $BUILD_TYPE -j4
+
+    - name: Add LV2 Archive
+      working-directory: ${{github.workspace}}/build
+      run: tar -czf neural_amp_modeler_lv2_linux_x64.tgz neural_amp_modeler.lv2
+      
+    - name: Upload Plugin Asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        asset_path: ./build/neural_amp_modeler_lv2_linux_x64.tgz
+        asset_name: neural_amp_modeler_lv2_linux_x64.tgz
+        asset_content_type: application/tgz
+
+  build-linux-x64v3:
+    name: Build Linux x64v3
+    needs: create_release
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3.3.0
+      with:
+        submodules: recursive
+        
+    - name: Build Plugin
+      working-directory: ${{github.workspace}}/build
+      env:
+        CXX: clang++
+      run: |
+        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_NATIVE_ARCH=ON -DLSTM_PREFER_NAM=OFF -DWAVENET_PREFER_NAM=OFF
+        cmake --build . --config $BUILD_TYPE -j4
+
+    - name: Add LV2 Archive
+      working-directory: ${{github.workspace}}/build
+      run: tar -czf neural_amp_modeler_lv2_linux_x64v3.tgz neural_amp_modeler.lv2
+      
+    - name: Upload Plugin Asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        asset_path: ./build/neural_amp_modeler_lv2_linux_x64v3.tgz
+        asset_name: neural_amp_modeler_lv2_linux_x64v3.tgz
+        asset_content_type: application/tgz
+        
+  build-windows:
+    name: Build Windows
+    needs: create_release
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v3.3.0
+      with:
+        submodules: recursive
+    
+    - name: Build Plugin
+      working-directory: ${{github.workspace}}/build
+      run: |
+        cmake.exe -G "Visual Studio 17 2022" -A x64  -T ClangCL -DLSTM_PREFER_NAM=OFF -DWAVENET_PREFER_NAM=OFF ..
+        cmake --build . --config=release -j4
+
+    - name: Add LV2 Archive
+      run: Compress-Archive -Path ${{github.workspace}}\build\neural_amp_modeler.lv2 -Destination neural_amp_modeler_lv2_win_x64.zip
+      
+    - name: Upload Plugin Asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        asset_path: ./neural_amp_modeler_lv2_win_x64.zip
+        asset_name: neural_amp_modeler_lv2_win_x64.zip
+        asset_content_type: application/zip
+
+  build-windows-x64v3:
+    name: Build Windows x64v3
+    needs: create_release
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v3.3.0
+      with:
+        submodules: recursive
+    
+    - name: Build Plugin
+      working-directory: ${{github.workspace}}/build
+      run: |
+        cmake.exe -G "Visual Studio 17 2022" -A x64 -DUSE_NATIVE_ARCH=ON -DLSTM_PREFER_NAM=OFF -DWAVENET_PREFER_NAM=OFF -T ClangCL ..
+        cmake --build . --config=release -j4
+
+    - name: Add LV2 Archive
+      run: Compress-Archive -Path ${{github.workspace}}\build\neural_amp_modeler.lv2 -Destination neural_amp_modeler_lv2_win_x64v3.zip
+      
+    - name: Upload Plugin Asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ needs.create_release.outputs.upload_url }}
+        asset_path: ./neural_amp_modeler_lv2_win_x64v3.zip
+        asset_name: neural_amp_modeler_lv2_win_x64v3.zip
+        asset_content_type: application/zip

.gitmodules

@@ -1,10 +1,6 @@
 [submodule "lv2"]
 	path = deps/lv2
 	url = https://github.com/lv2/lv2
-[submodule "eigen"]
-	path = deps/eigen
-	url = https://gitlab.com/libeigen/eigen
-[submodule "NeuralAmpModelerCore"]
-	path = deps/NeuralAmpModelerCore
-	url = https://github.com/mikeoliphant/NeuralAmpModelerCore
-	branch = devel
+[submodule "deps/NeuralAudio"]
+	path = deps/NeuralAudio
+	url = https://github.com/mikeoliphant/NeuralAudio

CMakeLists.txt

@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(NeuralAmpModelerLv2 VERSION 0.1.2)
+project(NeuralAmpModelerLv2 VERSION 0.1.9)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib CACHE PATH "The library install dir (default: lib)")
 
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED OFF)
@@ -20,16 +21,6 @@ endif()
 
 set(NAM_LV2_ID http://github.com/mikeoliphant/neural-amp-modeler-lv2)
 
-include_directories(SYSTEM deps/eigen)
-include_directories(SYSTEM deps/lv2/include)
-include_directories(SYSTEM deps/NeuralAmpModelerCore)
-include_directories(SYSTEM deps/NeuralAmpModelerCore)
-include_directories(SYSTEM deps/json)
-include_directories(SYSTEM deps/denormal)
-
-add_definitions(-DNAM_SAMPLE_FLOAT)
-add_definitions(-DDSP_SAMPLE_FLOAT)
-
 add_subdirectory(src)
 
 
@@ -39,11 +30,14 @@ add_custom_target(copy_binaries ALL
 	DEPENDS neural_amp_modeler
 )
 
+file(COPY resources/modgui.ttl DESTINATION neural_amp_modeler.lv2)
+file(COPY resources/modgui DESTINATION neural_amp_modeler.lv2)
+
 configure_file(resources/manifest.ttl.in neural_amp_modeler.lv2/manifest.ttl)
 configure_file(resources/neural_amp_modeler.ttl.in neural_amp_modeler.lv2/neural_amp_modeler.ttl)
 
 install (DIRECTORY ${CMAKE_BINARY_DIR}/neural_amp_modeler.lv2
-       DESTINATION lib/lv2
+       DESTINATION ${LIB_INSTALL_DIR}/lv2
 )
 
 set(CPACK_GENERATOR "DEB")

CREDITS.md

@@ -1,9 +1,11 @@
-This repository uses code from a number of sources:
+[GitHub contributers](https://github.com/mikeoliphant/neural-amp-modeler-lv2/graphs/contributors)
 
-https://github.com/sdatkinson/NeuralAmpModelerPlugin
+This repository uses code from a number of sources. Please see them for code licensing information:
 
-https://gitlab.com/libeigen/eigen
+https://github.com/mikeoliphant/NeuralAudio
 
 https://github.com/lv2/lv2
 
-In addition, the CMake structure and LV2 plugin structure are based on code from https://github.com/Dougal-s/Aether.
+The CMake structure and LV2 plugin structure are based on code from https://github.com/Dougal-s/Aether.
+
+modgui user interface is by Roman Brandstetter (@rominator1983) and Filipe Coelho (@falktk) based on design from Evan Heritage.

README.md

@@ -1,24 +1,33 @@
 # neural-amp-modeler-lv2
 
-Bare-bones implementation of [Neural Amp Modeler](https://github.com/sdatkinson/neural-amp-modeler) (NAM) models in an LV2 plugin.
+LV2 plugin for using neural network machine learning amp models.
 
-**There is no user interface**. Setting the model to use requires that your LV2 host supports atom:Path parameters. Reaper does as of v6.82. Carla and Ardour do. If your favorite LV2 host does not support atom:Path, let them know you want it.
+**There is no custom plugin user interface**. Setting the model to use requires that your LV2 host supports atom:Path parameters. Reaper does as of v6.82. Carla and Ardour do. If your favorite LV2 host does not support atom:Path, let them know you want it.
+If you are looking for a GUI version, @brummer10 [has one here](https://github.com/brummer10/neural-amp-modeler-ui) that works for Linux and Windows. You may also be interested in the the version shipped with the [MOD Desktop App](https://github.com/moddevices/mod-desktop-app), or my digital pedalboard app [Stompbox](https://github.com/mikeoliphant/StompboxUI).
 
 To get the intended behavior, **you must run your audio host at the same sample rate the model was trained at** (usually 48kHz) - no resampling is done by the plugin.
 
 For amp-only models (the most typical), **you will need to run an impulse reponse after this plugin** to model the cabinet.
 
-### Models and Performance
+## Models and Performance
+
+The plugin supports both [Neural Amp Modeler (NAM)](https://github.com/sdatkinson/neural-amp-modeler) models and [RTNeural keras json models](https://github.com/jatinchowdhury18/RTNeural) (like those used by [Aida-X](https://github.com/AidaDSP/AIDA-X)).
 
 The best source of models is [ToneHunt](https://tonehunt.org/).
 
-NAM models are generally quite expensive to run. This isn't (much of) an issue on modern PCs, but you may have trouble running on less powerful hardware.
+NAM WaveNet models are generally quite expensive to run. This isn't (much of) an issue on modern PCs, but you may have trouble running on less powerful hardware.
 
-A Raspberry Pi 4 running a 64bit OS can run "standard" NAM models with a bit of room to spare for a cabinet IR and some lightweight effects.
+A Raspberry Pi 4 running a 64bit OS can run "standard" NAM models with plenty of room to spare for a cabinet IR and some effects. It is also capable of running two "standard" NAM models, but with less headroom for other effects.
 
-If you are having trouble running a "standard" model, try looking for "feather" (the least expensive) models. You can find a list of ["feather"-tagged models on ToneHunt](https://tonehunt.org/?tags=feather-mdl). Note that tagging models is up to the submitter, so not all "feather" models are tagged as such - you should be able to find more if you dig around.
+If you are having trouble running a "standard" model, try looking for "feather", or even "nano" (the least expensive) models. You can find a list of ["feather"-tagged models on ToneHunt](https://tonehunt.org/models?tags%5B0%5D=feather-mdl). Note that tagging models is up to the submitter, so not all "feather" models are tagged as such - you should be able to find more if you dig around.
 
-### Building
+For more information on model type support, see the [NeuralAudio](https://github.com/mikeoliphant/NeuralAudio) repository, which is where the model handling code lives.
+
+## Input Calibration
+
+The expected input level to the plugin is 12dBu. For models that include input level information, they will be calibrated against this level. If you know the input level of your audio interface, you should adjust the input level relative to the expected 12dBu to provide the appropriate signal level to the model.
+
+## Building
 
 First clone the repository:
 ```bash
@@ -44,3 +53,8 @@ Note - you'll have to change the Visual Studio version if you are using a differ
 
 After building, the plugin will be in **build/neural_amp_modeler.lv2**.
 
+## CMake Options
+
+```-DUSE_NATIVE_ARCH=ON```: If you have a relatively modern x64 processor, you can pass ```-DUSE_NATIVE_ARCH=ON``` on your cmake command line to enable certain processor-specific optimizations.
+
+Also see the [NeuralAudio CMake options](https://github.com/mikeoliphant/NeuralAudio#cmake-options) - adding these to your neural-amp-modeler-lv2 cmake will pass them to the NeuralAudio build.

resources/manifest.ttl.in

@@ -5,4 +5,4 @@
 <@NAM_LV2_ID@>
 	a lv2:Plugin;
 	lv2:binary <neural_amp_modeler@CMAKE_SHARED_MODULE_SUFFIX@>;
-	rdfs:seeAlso <neural_amp_modeler.ttl>.
+	rdfs:seeAlso <neural_amp_modeler.ttl>,<modgui.ttl>.

resources/modgui.ttl

@@ -0,0 +1,21 @@
+@prefix modgui: <http://moddevices.com/ns/modgui#>.
+@prefix lv2:    <http://lv2plug.in/ns/lv2core#>.
+
+<http://github.com/mikeoliphant/neural-amp-modeler-lv2>
+    modgui:gui [
+        modgui:resourcesDirectory <modgui>;
+        modgui:iconTemplate <modgui/icon-nam.html>;
+        modgui:stylesheet <modgui/stylesheet-nam.css>;
+        modgui:screenshot <modgui/screenshot-nam.png>;
+        modgui:thumbnail <modgui/thumbnail-nam.png>;
+        modgui:discussionURL <https://forum.mod.audio/t/neural-amp-modeler/10112> ;
+        modgui:port [
+            lv2:index 0;
+            lv2:symbol "input_level";
+            lv2:name "Input Lvl";
+        ], [
+            lv2:index 1;
+            lv2:symbol "output_level";
+            lv2:name "Output Lvl";
+        ];
+    ].

resources/modgui/icon-nam.html

@@ -0,0 +1,45 @@
+<div class="mod-pedal mod-pedal-nam">
+    <div mod-role="drag-handle" class="mod-drag-handle"></div>
+    <div class="mod-control-group group1 clearfix">
+        {{#controls}}
+        <div class="mod-knob" title="{{name}}">
+            <div class="mod-knob-title">{{name}}</div>
+            <div class="mod-knob-image" mod-role="input-control-port" mod-port-symbol="{{symbol}}"></div>
+        </div>
+        {{/controls}}
+    </div>
+    <div class="mod-footswitch" mod-role="bypass"></div>
+
+    <div class="mod-control-group group2 clearfix">
+        <div class="mod-control-group mod-enumerated-group bottom clearfix">
+            {{#effect.parameters}}
+            {{#path}}
+            <div class="mod-enumerated" mod-role="input-parameter" mod-parameter-uri="{{uri}}" mod-widget="custom-select-path">
+                <div mod-role="input-parameter-value" mod-parameter-uri="{{uri}}" class="mod-enumerated-selected">
+                    -- choose a NAM model --
+                </div>
+                <div class="mod-enumerated-list">
+                    {{#files}}
+                    <div mod-role="enumeration-option" mod-parameter-value="{{fullname}}">{{basename}}</div>
+                    {{/files}}
+                </div>
+            </div>
+            {{/path}}
+            {{/effect.parameters}}
+        </div>
+    </div>
+    <div class="mod-pedal-input">
+        {{#effect.ports.audio.input}}
+        <div class="mod-input mod-input-disconnected" title="{{name}}" mod-role="input-audio-port" mod-port-symbol="{{symbol}}">
+            <div class="mod-pedal-input-image"></div>
+        </div>
+        {{/effect.ports.audio.input}}
+    </div>
+    <div class="mod-pedal-output">
+        {{#effect.ports.audio.output}}
+        <div class="mod-output mod-output-disconnected" title="{{name}}" mod-role="output-audio-port" mod-port-symbol="{{symbol}}">
+            <div class="mod-pedal-output-image"></div>
+        </div>
+        {{/effect.ports.audio.output}}
+    </div>
+</div>

resources/modgui/stylesheet-nam.css

@@ -0,0 +1,130 @@
+/* nam */
+
+@import url(/fonts/nexa/stylesheet.css);
+@import url(/fonts/questrial/stylesheet.css);
+
+/* = CONTAINER
+================================================ */
+.mod-pedal-nam {
+    background-position:center center;
+    background-repeat:no-repeat;
+    /* background image is 1121 × 536*/
+    background-size:560px 268px;
+    background-image:url(/resources/background.png{{{ns}}});
+    width:560px;
+    height:268px;
+    position:absolute;
+    border-radius:40px;
+}
+
+/* = BYPASS
+================================================ */
+.mod-pedal-nam .mod-footswitch {
+    background-image:url(/resources/bypass_on.png{{{ns}}});
+    background-position:center center;
+    background-repeat:no-repeat;
+    background-size:82px 47px;
+    width:82px;
+    height:47px;
+    top:132px;
+    left:235px;
+    cursor:pointer;
+    position:absolute;
+}
+.mod-pedal-nam .mod-footswitch.on {
+    background-image:url(/resources/bypass_off.png{{{ns}}});
+}
+
+/* = KNOBS
+================================================ */
+.mod-pedal-nam .mod-control-group {
+    z-index:30;
+    position:relative;
+    margin:0px;
+    padding:0px;
+    display:inline;
+}
+
+.mod-pedal-nam .group1 {
+    top:86px;
+    left:22px;
+}
+
+.mod-pedal-nam .group2 {
+    top:107px;
+    left:78px;
+}
+
+.mod-pedal-nam .mod-control-group .mod-knob .mod-knob-title {
+    text-align: center;
+    color:white;
+}
+
+.mod-pedal-nam .mod-control-group .mod-knob {
+    overflow:hidden;
+    position:relative;
+    display:inline-block;
+}
+
+.mod-pedal-nam .mod-control-group .mod-knob:first-child {
+    margin-left: 0px;
+}
+
+.mod-pedal-nam .mod-control-group .mod-knob:last-child {
+    margin-left: 315px;
+}
+
+.mod-pedal-nam .mod-control-group .mod-knob .mod-knob-image {
+    background-image:url(/resources/knob.png{{{ns}}});
+    background-position:left center;
+    background-repeat:no-repeat;
+    background-size:5000px 100px;
+    height:100px;
+    width:100px;
+    cursor:pointer;
+}
+
+.mod-pedal-nam .mod-enumerated {
+    position: relative;
+    font-weight: bold;
+    cursor: pointer;
+    color: white;
+}
+
+.mod-pedal-nam .mod-enumerated .mod-enumerated-selected {
+    padding-left: 5px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    background-color: transparent;
+    color: white;
+    display: block;
+}
+
+/* THE LIST OF OPTIONS */
+.mod-pedal-nam .mod-enumerated .mod-enumerated-list {
+    background: black;
+    display: none;
+    overflow: auto;
+    position: absolute;
+    padding: 0;
+    width: 405px;
+    height: 220px;
+    border: 2px solid #333;
+}
+
+.mod-pedal-nam .mod-enumerated .mod-enumerated-list > div {
+    padding: 3px 5px;
+}
+
+.mod-pedal-nam .mod-enumerated .mod-enumerated-list > div.selected {
+    background: #333;
+}
+
+.mod-pedal-nam .mod-enumerated .mod-enumerated-list > div:hover {
+    background: #222;
+}
+
+.mod-pedal-nam .mod-enumerated .mod-enumerated-list > div.selected:hover {
+    background: #555;
+}

resources/neural_amp_modeler.ttl.in

@@ -16,7 +16,7 @@
 
 <@NAM_LV2_ID@#model>
 	a lv2:Parameter;
-	mod:fileTypes "nam,nammodel";
+	mod:fileTypes "nam,nammodel,json,aidax,aidadspmodel";
 	rdfs:label "Neural Model";
 	rdfs:range atom:Path.
 
@@ -39,11 +39,13 @@
 	opts:supportedOption <http://lv2plug.in/ns/ext/buf-size#maxBlockLength>;
 
 	rdfs:comment """
-An LV2 implementation of Neural Amp Modeler.
+LV2 plugin for neural network machine learning guitar amplifier simulation models
 
-NAM accepts Neural Amp Modeler .nam files.
+Models supported:
+  Neural Amp Modeler (NAM): https://github.com/sdatkinson/neural-amp-modeler
+  RTNeural keras/Aida-x models: https://github.com/jatinchowdhury18/RTNeural
 
-A large collection of .nam files is available at https://tonehunt.org/
+A large collection of models is available at https://tonehunt.org
 """;
 
 	patch:writable <@NAM_LV2_ID@#model>;

src/CMakeLists.txt

@@ -1,40 +1,58 @@
+if (MSVC)
+	add_compile_options(
+		"$<$<CONFIG:DEBUG>:/W4>"
+		"$<$<CONFIG:RELEASE>:/O2>"
+	)
+else()
+	add_compile_options(
+		-Wall 
+		# -Wpedantic -Wextra -Wstrict-aliasing -Wunreachable-code -Weffc++ -Wno-unused-parameter
+		"$<$<CONFIG:DEBUG>:-Og;-ggdb>"
+		"$<$<CONFIG:RELWITHDEBINFO>:-Ofast>"
+		"$<$<CONFIG:RELEASE>:-Ofast>"
+	)
+endif()
+
+
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "(amd64)|(AMD64)|(x86_64)")
+	option(USE_NATIVE_ARCH "Enable architecture-specific optimizations" OFF)
+
+	if (USE_NATIVE_ARCH)
+		if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+			add_compile_options(/arch:AVX2)
+			message(STATUS "Enabling /arch:AVX2")
+		 
+		else()
+			add_compile_options(-march=x86-64-v3)
+			message(STATUS "Enabling -march=x86-64-v3")
+		endif()
+	endif (USE_NATIVE_ARCH)
+endif ()
+
+add_subdirectory(../deps/NeuralAudio NeuralAudio)
+
 set(SOURCES nam_lv2.cpp
 	nam_plugin.cpp
 	nam_plugin.h)
 
-set(NAM_SOURCES	../deps/NeuralAmpModelerCore/NAM/activations.h
-	../deps/NeuralAmpModelerCore/NAM/activations.cpp
-	../deps/NeuralAmpModelerCore/NAM/version.h
-	../deps/NeuralAmpModelerCore/NAM/lstm.h
-	../deps/NeuralAmpModelerCore/NAM/lstm.cpp
-	../deps/NeuralAmpModelerCore/NAM/dsp.h
-	../deps/NeuralAmpModelerCore/NAM/dsp.cpp
-	../deps/NeuralAmpModelerCore/NAM/get_dsp.cpp
-	../deps/NeuralAmpModelerCore/NAM/util.cpp
-	../deps/NeuralAmpModelerCore/NAM/util.h
-	../deps/NeuralAmpModelerCore/NAM/wavenet.cpp
-	../deps/NeuralAmpModelerCore/NAM/wavenet.h
-	../deps/NeuralAmpModelerCore/NAM/convnet.cpp
-	../deps/NeuralAmpModelerCore/NAM/convnet.h)
+set(NA_SOURCES ../deps/NeuralAudio/NeuralAudio/NeuralModel.h)
 
-set(DSP_SOURCES	../deps/NeuralAmpModelerCore/dsp/dsp.h
-	../deps/NeuralAmpModelerCore/dsp/dsp.cpp
-	../deps/NeuralAmpModelerCore/dsp/RecursiveLinearFilter.h
-	../deps/NeuralAmpModelerCore/dsp/RecursiveLinearFilter.cpp)
+add_library(neural_amp_modeler SHARED ${SOURCES} ${NA_SOURCES})
 
-add_library(neural_amp_modeler MODULE ${SOURCES} ${NAM_SOURCES} ${DSP_SOURCES})
+target_include_directories(neural_amp_modeler PUBLIC ../deps/NeuralAudio)
+target_include_directories(neural_amp_modeler PUBLIC ../deps/lv2/include)
+target_include_directories(neural_amp_modeler PUBLIC ../deps/denormal)
+
+target_link_libraries(neural_amp_modeler PRIVATE NeuralAudio)
 
 source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCES})
-source_group(NAM ${CMAKE_CURRENT_SOURCE_DIR} FILES ${NAM_SOURCES})
-source_group(dsp ${CMAKE_CURRENT_SOURCE_DIR} FILES ${DSP_SOURCES})
+source_group(NAM ${CMAKE_CURRENT_SOURCE_DIR} FILES ${NA_SOURCES})
 
 option(DISABLE_DENORMALS "Disable floating point denormals" ON)
 
-if(DISABLE_DENORMALS)
+if (DISABLE_DENORMALS)
 	add_definitions(-DDISABLE_DENORMALS)
-endif(DISABLE_DENORMALS)
-
-target_compile_features(neural_amp_modeler PUBLIC cxx_std_17)
+endif (DISABLE_DENORMALS)
 
 set_target_properties(neural_amp_modeler
 	PROPERTIES
@@ -48,18 +66,3 @@ set_target_properties(neural_amp_modeler
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
 	target_compile_definitions(neural_amp_modeler PRIVATE NOMINMAX WIN32_LEAN_AND_MEAN)
 endif()
-
-if (MSVC)
-	target_compile_options(neural_amp_modeler PRIVATE
-		"$<$<CONFIG:DEBUG>:/W4>"
-		"$<$<CONFIG:RELEASE>:/O2>"
-	)
-else()
-	target_compile_options(neural_amp_modeler PRIVATE
-		-Wall 
-		# -Wpedantic -Wextra -Wstrict-aliasing -Wunreachable-code -Weffc++ -Wno-unused-parameter
-		"$<$<CONFIG:DEBUG>:-Og;-ggdb>"
-		"$<$<CONFIG:RELWITHDEBINFO>:-Ofast>"
-		"$<$<CONFIG:RELEASE>:-Ofast>"
-	)
-endif()

src/nam_lv2.cpp

@@ -14,8 +14,8 @@
 #include "nam_plugin.h"
 
 // LV2 Functions
-static LV2_Handle instantiate(const LV2_Descriptor*, double rate, const char*, const LV2_Feature* const* features
-) {
+static LV2_Handle instantiate(const LV2_Descriptor*, double rate, const char*, const LV2_Feature* const* features)
+{
 	try
 	{
 		auto nam = std::make_unique<NAM::Plugin>();
@@ -95,9 +95,6 @@ static const LV2_Descriptor descriptor =
 LV2_SYMBOL_EXPORT const LV2_Descriptor* lv2_descriptor(uint32_t index)
 {
 	if (index == 0) {
-		// Turn on fast tanh approximation
-		activations::Activation::enable_fast_tanh();
-
 		return &descriptor;
 	}
 

src/nam_plugin.cpp

@@ -4,7 +4,6 @@
 #include <cassert>
 
 #include "nam_plugin.h"
-#include <NAM/activations.h>
 
 #define SMOOTH_EPSILON .0001f
 
@@ -12,7 +11,23 @@ namespace NAM {
 	Plugin::Plugin()
 	{
 		// prevent allocations on the audio thread
-		currentModelPath.reserve(MAX_FILE_NAME+1);
+		currentModelPath.reserve(MAX_FILE_NAME + 1);
+
+//		NeuralAudio::NeuralModel::SetLSTMLoadMode(
+//#ifdef LSTM_PREFER_NAM
+//			NeuralAudio::PreferNAMCore
+//#else
+//			NeuralAudio::PreferRTNeural
+//#endif
+//		);
+//
+//		NeuralAudio::NeuralModel::SetWaveNetLoadMode(
+//#ifdef WAVENET_PREFER_NAM
+//			NeuralAudio::PreferNAMCore
+//#else
+//			NeuralAudio::PreferRTNeural
+//#endif
+		//);
 	}
 
 	Plugin::~Plugin()
@@ -24,10 +39,6 @@ namespace NAM {
 	{
 		this->sampleRate = sampleRate;
 
-		const double highPassCutoffFreq = 5.0;
-		const recursive_linear_filter::HighPassParams highPassParams(sampleRate, highPassCutoffFreq);
-		mHighPass.SetParams(highPassParams);
-
 		// for fetching initial options, can be null
 		LV2_Options_Option* options = nullptr;
 
@@ -92,7 +103,7 @@ namespace NAM {
 				auto msg = static_cast<const LV2LoadModelMsg*>(data);
 				auto nam = static_cast<NAM::Plugin*>(instance);
 
-				::DSP* model = nullptr;
+				NeuralAudio::NeuralModel* model = nullptr;
 				LV2SwitchModelMsg response = { kWorkTypeSwitch, {}, {} };
 				LV2_Worker_Status result = LV2_WORKER_SUCCESS;
 
@@ -111,36 +122,25 @@ namespace NAM {
 					{
 						lv2_log_trace(&nam->logger, "Staging model change: `%s`\n", msg->path);
 
-						model = get_dsp(msg->path).release();
-
-						// Enable model loudness normalization
-						model->SetNormalize(true);
-
-						// Pre-run model to ensure all needed buffers are allocated in advance
-						if (const int32_t numSamples = nam->maxBufferSize)
-						{
-							float* buffer = new float[numSamples];
-							memset(buffer, 0, numSamples * sizeof(float));
-
-							std::unordered_map<std::string, double> params = {};
-							model->process(&buffer, &buffer, 1, numSamples, 1.0, 1.0, params);
-							model->finalize_(numSamples);
-
-							delete[] buffer;
-						}
+						model = NeuralAudio::NeuralModel::CreateFromFile(msg->path);
 					}
 
-					response.model = model;
+					if (model != nullptr)
+					{
+						response.model = model;
 
-					memcpy(response.path, msg->path, pathlen);
+						memcpy(response.path, msg->path, pathlen);
+					}
 				}
 				catch (const std::exception&)
+				{
+				}
+
+				if (model == nullptr)
 				{
 					response.path[0] = '\0';
 
 					lv2_log_error(&nam->logger, "Unable to load model from: '%s'\n", msg->path);
-					
-					//result = LV2_WORKER_ERR_UNKNOWN;
 				}
 
 				respond(handle, sizeof(response), &response);
@@ -190,6 +190,13 @@ namespace NAM {
 		return LV2_WORKER_SUCCESS;
 	}
 
+	void Plugin::set_max_buffer_size(int size) noexcept
+	{
+		maxBufferSize = size;
+
+		NeuralAudio::NeuralModel::SetDefaultMaxAudioBufferSize(size);
+	}
+
 	void Plugin::process(uint32_t n_samples) noexcept
 	{
 		lv2_atom_forge_set_buffer(&atom_forge, (uint8_t*)ports.notify, ports.notify->atom.size);
@@ -229,8 +236,15 @@ namespace NAM {
 
 		float level;
 
+		float modelInputAdjustmentDB = 0;
+
+		if (currentModel != nullptr)
+		{
+			modelInputAdjustmentDB = currentModel->GetRecommendedInputDBAdjustment();
+		}
+
 		// convert input level from db
-		float desiredInputLevel = powf(10, *(ports.input_level) * 0.05f);
+		float desiredInputLevel = powf(10, (*(ports.input_level) + modelInputAdjustmentDB) * 0.05f);
 
 		if (fabs(desiredInputLevel - inputLevel) > SMOOTH_EPSILON)
 		{
@@ -242,6 +256,7 @@ namespace NAM {
 
 				ports.audio_out[i] = ports.audio_in[i] * level;
 			}
+
 			inputLevel = level;
 		}
 		else
@@ -254,30 +269,30 @@ namespace NAM {
 			}
 		}
 
-		float** outputPtrs = &ports.audio_out;
+		float modelLoudnessAdjustmentDB = 0;
 
 		if (currentModel != nullptr)
 		{
-			currentModel->process(&ports.audio_out, &ports.audio_out, 1, n_samples, 1.0, 1.0, mNAMParams);
-			currentModel->finalize_(n_samples);
+			currentModel->Process(ports.audio_out, ports.audio_out, n_samples);
 
-			// Apply a high pass filter at 5Hz to eliminate any DC offset
-			outputPtrs = mHighPass.Process(outputPtrs, 1, n_samples);
+			modelLoudnessAdjustmentDB = currentModel->GetRecommendedOutputDBAdjustment();
 		}
 
-		// convert output level from db
-		float desiredOutputLevel = powf(10, *(ports.output_level) * 0.05f);
+		// Convert output level from db
+		float desiredOutputLevel = powf(10, (*(ports.output_level) + modelLoudnessAdjustmentDB) * 0.05f);
 
 		if (fabs(desiredOutputLevel - outputLevel) > SMOOTH_EPSILON)
 		{
 			level = outputLevel;
+
 			for (unsigned int i = 0; i < n_samples; i++)
 			{
 				// do very basic smoothing
 				level = (.99f * level) + (.01f * desiredOutputLevel);
 
-				ports.audio_out[i] = outputPtrs[0][i] * outputLevel;
+				ports.audio_out[i] = ports.audio_out[i] * outputLevel;
 			}
+
 			outputLevel = level;
 		}
 		else
@@ -286,9 +301,22 @@ namespace NAM {
 
 			for (unsigned int i = 0; i < n_samples; i++)
 			{
-				ports.audio_out[i] = outputPtrs[0][i] * level;
+				ports.audio_out[i] = ports.audio_out[i] * level;
 			}
 		}
+
+		//float dcBlockCoefficient = 1 - (220.0 / sampleRate);
+
+		//for (unsigned int i = 0; i < n_samples; i++)
+		//{
+		//	float dcInput = ports.audio_out[i];
+
+		//	// dc blocker
+		//	ports.audio_out[i] = ports.audio_out[i] - prevDCInput + dcBlockCoefficient * prevDCOutput;
+
+		//	prevDCInput = dcInput;
+		//	prevDCOutput = ports.audio_out[i];
+		//}
 	}
 
 	uint32_t Plugin::options_get(LV2_Handle, LV2_Options_Option*)
@@ -305,7 +333,7 @@ namespace NAM {
 		{
 			if (options[i].key == nam->uris.bufSize_maxBlockLength && options[i].type == nam->uris.atom_Int)
 			{
-				nam->maxBufferSize = *(const int32_t*)options[i].value;
+				nam->set_max_buffer_size(*(const int32_t*)options[i].value);
 				break;
 			}
 		}

src/nam_plugin.h

@@ -21,8 +21,7 @@
 #include <lv2/state/state.h>
 #include <lv2/units/units.h>
 
-#include <NAM/dsp.h>
-#include <dsp/RecursiveLinearFilter.h>
+#include <NeuralAudio/NeuralModel.h>
 
 #define PlUGIN_URI "http://github.com/mikeoliphant/neural-amp-modeler-lv2"
 #define MODEL_URI PlUGIN_URI "#model"
@@ -44,12 +43,12 @@ namespace NAM {
 	struct LV2SwitchModelMsg {
 		LV2WorkType type;
 		char path[MAX_FILE_NAME];
-		::DSP* model;
+		NeuralAudio::NeuralModel* model;
 	};
 
 	struct LV2FreeModelMsg {
 		LV2WorkType type;
-		::DSP* model;
+		NeuralAudio::NeuralModel* model;
 	};
 
 	class Plugin {
@@ -71,16 +70,16 @@ namespace NAM {
 		LV2_Log_Logger logger = {};
 		LV2_Worker_Schedule* schedule = nullptr;
 
-		::DSP* currentModel = nullptr;
+		NeuralAudio::NeuralModel* currentModel = nullptr;
 		std::string currentModelPath;
-		recursive_linear_filter::HighPass mHighPass;
-
-		std::unordered_map<std::string, double> mNAMParams = {};
+		float prevDCInput = 0;
+		float prevDCOutput = 0;
 
 		Plugin();
 		~Plugin();
 
 		bool initialize(double rate, const LV2_Feature* const* features) noexcept;
+		void set_max_buffer_size(int size) noexcept;
 		void process(uint32_t n_samples) noexcept;
 
 		void write_current_path();
@@ -120,6 +119,6 @@ namespace NAM {
 
 		float inputLevel = 0;
 		float outputLevel = 0;
-		int32_t maxBufferSize = 0;
+		int32_t maxBufferSize = 512;
 	};
 }