Explicitly force build of internal static WaveNet and LSTM

Add NAM A2 model support

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
       env:
         CXX: clang++
       run: |
-        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_UTILS=ON -DBUILD_NAMCORE=ON -DBUILD_STATIC_RTNEURAL=ON 
+        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_UTILS=ON -DBUILD_INTERNAL_STATIC_WAVENET=ON -DBUILD_INTERNAL_STATIC_LSTM=ON -DBUILD_NAMCORE=ON -DBUILD_STATIC_RTNEURAL=ON 
         cmake --build . --config $BUILD_TYPE -j4
         cpack
 
@@ -51,7 +51,7 @@ jobs:
     - name: Build Plugin
       working-directory: ${{github.workspace}}/build
       run: |
-        cmake.exe -G "Visual Studio 17 2022" -A x64 -DBUILD_UTILS=ON -DBUILD_NAMCORE=ON -DBUILD_STATIC_RTNEURAL=ON -T ClangCL ..
+        cmake.exe -G "Visual Studio 17 2022" -A x64 -DBUILD_UTILS=ON -DBUILD_INTERNAL_STATIC_WAVENET=ON -DBUILD_INTERNAL_STATIC_LSTM=ON -DBUILD_NAMCORE=ON -DBUILD_STATIC_RTNEURAL=ON -T ClangCL ..
         cmake --build . --config=release -j4
 
     - name: Run ModelTest

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
       env:
         CXX: clang++
       run: |
-        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DLSTM_PREFER_NAM=OFF -DWAVENET_PREFER_NAM=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DLSTM_PREFER_NAM=OFF -DBUILD_NAMCORE=ON -DWAVENET_PREFER_NAM=OFF -DBUILD_INTERNAL_STATIC_WAVENET=ON -DBUILD_INTERNAL_STATIC_LSTM=ON
         cmake --build . --config $BUILD_TYPE -j4
 
     - name: Add LV2 Archive
@@ -73,7 +73,7 @@ jobs:
       env:
         CXX: clang++
       run: |
-        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_NATIVE_ARCH=ON -DLSTM_PREFER_NAM=OFF -DWAVENET_PREFER_NAM=OFF
+        cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_NATIVE_ARCH=ON -DBUILD_NAMCORE=ON -DLSTM_PREFER_NAM=OFF -DWAVENET_PREFER_NAM=OFF -DBUILD_INTERNAL_STATIC_WAVENET=ON -DBUILD_INTERNAL_STATIC_LSTM=ON
         cmake --build . --config $BUILD_TYPE -j4
 
     - name: Add LV2 Archive
@@ -102,7 +102,7 @@ jobs:
     - 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.exe -G "Visual Studio 17 2022" -A x64  -T ClangCL -DLSTM_PREFER_NAM=OFF -DWAVENET_PREFER_NAM=OFF -DBUILD_NAMCORE=ON -DBUILD_INTERNAL_STATIC_WAVENET=ON -DBUILD_INTERNAL_STATIC_LSTM=ON ..
         cmake --build . --config=release -j4
 
     - name: Add LV2 Archive

models/README.md

@@ -1,4 +1,4 @@
-These are some sample NAM models designed to be used for performance testing on CPU-limited devices. They are all based on a [LiveSpice model of a Boss SD-1 pedal](https://blog.nostatic.org/2023/04/this-boss-sd-1-pedal-does-not-exist.html).
+These are some sample NAM models designed to be used for performance testing on CPU-limited devices. They are all based on a [LiveSpice model of a Boss SD-1 pedal](https://blog.nostatic.org/2023/04/this-boss-sd-1-pedal-does-not-exist.html). They are provided here under the [CC BY-NC-ND 4.0 license](https://creativecommons.org/licenses/by-nc-nd/4.0/deed.en).
 
 All models were trained for 300 epochs using the NAM "v1_1_1.wav" capture signal.
 

resources/neural_amp_modeler.ttl.in

@@ -101,4 +101,12 @@ A large collection of models is available at https://tonehunt.org
 		lv2:minimum -20.0;
 		lv2:maximum 20.0;
 		units:unit units:db;
+	], [
+		a lv2:ControlPort, lv2:InputPort;
+		lv2:index 6;
+		lv2:symbol "quality_scale";
+		lv2:name "Quality";
+		lv2:default 1.0;
+		lv2:minimum 0.0;
+		lv2:maximum 1.0;
 	].

src/nam_plugin.cpp

@@ -252,6 +252,18 @@ namespace NAM {
 			}
 		}
 
+		if (*(ports.quality_scale) != qualityScale)
+		{
+			qualityScale = *(ports.quality_scale);
+
+			NeuralAudio::NeuralModel::SetDefaultQualityScaleFactor(qualityScale);
+
+			if (currentModel != nullptr)
+			{
+				currentModel->SetQualityScaleFactor(qualityScale);
+			}
+		}
+
 		float level;
 
 		float modelInputAdjustmentDB = 0;

src/nam_plugin.h

@@ -60,6 +60,7 @@ namespace NAM {
 			float* audio_out;
 			float* input_level;
 			float* output_level;
+			float* quality_scale;
 		};
 
 		Ports ports = {};
@@ -74,6 +75,7 @@ namespace NAM {
 		std::string currentModelPath;
 		float prevDCInput = 0;
 		float prevDCOutput = 0;
+		float qualityScale = 1.0f;
 
 		Plugin();
 		~Plugin();