Create release.yml

.github/workflows/build.yml

@@ -25,13 +25,13 @@ jobs:
         cpack
 
     - name: Upload binary
-      uses: actions/upload-artifact@v1
+      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@v1
+#      uses: actions/upload-artifact@v4
 #      with:
 #        name: neural_amp_modeler.lv2-linux-deb-amd64
 #        path: ${{github.workspace}}/build/*.deb
@@ -51,7 +51,7 @@ jobs:
         cmake --build . --config=release -j4
         
     - name: Upload artifact
-      uses: actions/upload-artifact@v1
+      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,57 @@
+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-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 ..
+        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.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.zip
+        asset_name: neural_amp_modeler.lv2.zip
+        asset_content_type: application/zip

.gitmodules

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

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10)
 
-project(NeuralAmpModelerLv2 VERSION 0.1.4)
+project(NeuralAmpModelerLv2 VERSION 0.1.5)
 
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -20,15 +20,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/json)
-include_directories(SYSTEM deps/denormal)
-
-add_definitions(-DNAM_SAMPLE_FLOAT)
-add_definitions(-DDSP_SAMPLE_FLOAT)
-
 add_subdirectory(src)
 
 

CREDITS.md

@@ -1,9 +1,11 @@
 This repository uses code from a number of sources:
 
-https://github.com/sdatkinson/NeuralAmpModelerPlugin
+https://github.com/sdatkinson/NeuralAmpModelerCore
 
 https://gitlab.com/libeigen/eigen
 
+https://github.com/jatinchowdhury18/RTNeural
+
 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.

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";
 	rdfs:label "Neural Model";
 	rdfs:range atom:Path.
 
@@ -39,11 +39,13 @@
 	opts:supportedOption <http://lv2plug.in/ns/ext/buf-size#maxBlockLength>;
 
 	rdfs:comment """
-LV2 plugin for Neural Amp Modeler machine learning guitar amplifier simulation models
+LV2 plugin for neural network machine learning guitar amplifier simulation models
 
-Based on the Neural Amp Modeler Core codebase: https://github.com/sdatkinson/NeuralAmpModelerCore
+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 models 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,26 +1,21 @@
+add_subdirectory(../deps/NeuralAudio NeuralAudio)
+
+include_directories(SYSTEM ../deps/NeuralAudio)
+include_directories(SYSTEM ../deps/lv2/include)
+include_directories(SYSTEM ../deps/denormal)
+
 set(SOURCES nam_lv2.cpp
 	nam_plugin.cpp
 	nam_plugin.h)
 
-set(NAM_SOURCES	../deps/NeuralAmpModelerCore/NAM/activations.h
+set(NA_SOURCES ../deps/NeuralAudio/NeuralAudio/NeuralModel.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)
 
-add_library(neural_amp_modeler MODULE ${SOURCES} ${NAM_SOURCES})
+add_library(neural_amp_modeler SHARED ${SOURCES} ${NA_SOURCES})
+
+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(NAM ${CMAKE_CURRENT_SOURCE_DIR} FILES ${NA_SOURCES})
 
 option(DISABLE_DENORMALS "Disable floating point denormals" ON)
 

src/nam_lv2.cpp

@@ -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
-		nam::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
 
@@ -88,7 +87,7 @@ namespace NAM {
 				auto msg = static_cast<const LV2LoadModelMsg*>(data);
 				auto nam = static_cast<NAM::Plugin*>(instance);
 
-				nam::DSP* model = nullptr;
+				NeuralAudio::NeuralModel* model = nullptr;
 				LV2SwitchModelMsg response = { kWorkTypeSwitch, {}, {} };
 				LV2_Worker_Status result = LV2_WORKER_SUCCESS;
 
@@ -107,19 +106,19 @@ namespace NAM {
 					{
 						lv2_log_trace(&nam->logger, "Staging model change: `%s`\n", msg->path);
 
-						model = nam::get_dsp(msg->path).release();
+						model = NeuralAudio::NeuralModel::CreateFromFile(msg->path);
 
 						// Pre-run model to ensure all needed buffers are allocated in advance
-						if (const int32_t numSamples = nam->maxBufferSize)
+						//if (const int32_t numSamples = nam->maxBufferSize)
-						{
+						//{
-							float* buffer = new float[numSamples];
+						//	float* buffer = new float[numSamples];
-							memset(buffer, 0, numSamples * sizeof(float));
+						//	memset(buffer, 0, numSamples * sizeof(float));
 
-							model->process(buffer, buffer, numSamples);
+						//	model->Process(buffer, buffer, numSamples);
-							model->finalize_(numSamples);
+						//	//model->finalize_(numSamples);
 
-							delete[] buffer;
+						//	delete[] buffer;
-						}
+						//}
 					}
 
 					response.model = model;
@@ -221,8 +220,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)
 		{
@@ -251,14 +257,9 @@ namespace NAM {
 
 		if (currentModel != nullptr)
 		{
-			currentModel->process(ports.audio_out, ports.audio_out, n_samples);
+			currentModel->Process(ports.audio_out, ports.audio_out, n_samples);
-			currentModel->finalize_(n_samples);
 
-			if (currentModel->HasLoudness())
+			modelLoudnessAdjustmentDB = currentModel->GetRecommendedOutputDBAdjustment();
-			{
-				// Normalize model to -18dB
-				modelLoudnessAdjustmentDB = -18 - currentModel->GetLoudness();
-			}
 		}
 
 		// Convert output level from db
@@ -288,18 +289,18 @@ namespace NAM {
 			}
 		}
 
-		float dcBlockCoefficient = 1 - (220.0 / sampleRate);
+		//float dcBlockCoefficient = 1 - (220.0 / sampleRate);
 
-		for (unsigned int i = 0; i < n_samples; i++)
+		//for (unsigned int i = 0; i < n_samples; i++)
-		{
+		//{
-			float dcInput = ports.audio_out[i];
+		//	float dcInput = ports.audio_out[i];
 
-			// dc blocker
+		//	// dc blocker
-			ports.audio_out[i] = ports.audio_out[i] - prevDCInput + dcBlockCoefficient * prevDCOutput;
+		//	ports.audio_out[i] = ports.audio_out[i] - prevDCInput + dcBlockCoefficient * prevDCOutput;
 
-			prevDCInput = dcInput;
+		//	prevDCInput = dcInput;
-			prevDCOutput = ports.audio_out[i];
+		//	prevDCOutput = ports.audio_out[i];
-		}
+		//}
 	}
 
 	uint32_t Plugin::options_get(LV2_Handle, LV2_Options_Option*)

src/nam_plugin.h

@@ -21,7 +21,7 @@
 #include <lv2/state/state.h>
 #include <lv2/units/units.h>
 
-#include <NAM/dsp.h>
+#include <NeuralAudio/NeuralModel.h>
 
 #define PlUGIN_URI "http://github.com/mikeoliphant/neural-amp-modeler-lv2"
 #define MODEL_URI PlUGIN_URI "#model"
@@ -43,12 +43,12 @@ namespace NAM {
 	struct LV2SwitchModelMsg {
 		LV2WorkType type;
 		char path[MAX_FILE_NAME];
-		nam::DSP* model;
+		NeuralAudio::NeuralModel* model;
 	};
 
 	struct LV2FreeModelMsg {
 		LV2WorkType type;
-		nam::DSP* model;
+		NeuralAudio::NeuralModel* model;
 	};
 
 	class Plugin {
@@ -70,7 +70,7 @@ namespace NAM {
 		LV2_Log_Logger logger = {};
 		LV2_Worker_Schedule* schedule = nullptr;
 
-		nam::DSP* currentModel = nullptr;
+		NeuralAudio::NeuralModel* currentModel = nullptr;
 		std::string currentModelPath;
 		float prevDCInput = 0;
 		float prevDCOutput = 0;