From 7e03d2bd3d978ebbfda712720332614d63daa571 Mon Sep 17 00:00:00 2001
From: Mike Oliphant <oliphant@nostatic.org>
Date: Wed, 5 Feb 2025 10:40:59 -0800
Subject: [PATCH 1/4] Use naopt NeuralAudio branch

---
 deps/NeuralAudio   |  2 +-
 src/nam_plugin.cpp | 30 +++++++++++++++---------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/deps/NeuralAudio b/deps/NeuralAudio
index c6ac620..dbb7a8b 160000
--- a/deps/NeuralAudio
+++ b/deps/NeuralAudio
@@ -1 +1 @@
-Subproject commit c6ac6206ca92d4fd6729f6d9bc1f8dc73509ad13
+Subproject commit dbb7a8bf7c9b035cd9568df883cf416862c209e8
diff --git a/src/nam_plugin.cpp b/src/nam_plugin.cpp
index 9af0d01..1c13c1b 100644
--- a/src/nam_plugin.cpp
+++ b/src/nam_plugin.cpp
@@ -13,21 +13,21 @@ namespace NAM {
 		// prevent allocations on the audio thread
 		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
-		);
+//		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()

From 436fb126647fa63d5650ab548d4b8fb2ac658bfe Mon Sep 17 00:00:00 2001
From: Mike Oliphant <oliphant@nostatic.org>
Date: Wed, 5 Feb 2025 15:54:28 -0800
Subject: [PATCH 2/4] Update NeuralAudio

---
 deps/NeuralAudio | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deps/NeuralAudio b/deps/NeuralAudio
index dbb7a8b..b04ccfc 160000
--- a/deps/NeuralAudio
+++ b/deps/NeuralAudio
@@ -1 +1 @@
-Subproject commit dbb7a8bf7c9b035cd9568df883cf416862c209e8
+Subproject commit b04ccfc4066d02a9f9848089c74bbd66e1849899

From 3960aa75e73208dde75732815774362e2275dd17 Mon Sep 17 00:00:00 2001
From: Mike Oliphant <oliphant@nostatic.org>
Date: Thu, 6 Feb 2025 07:55:46 -0800
Subject: [PATCH 3/4] Remove "prefer" cmake options

---
 src/CMakeLists.txt | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 877b882..ed71304 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -48,24 +48,6 @@ if (DISABLE_DENORMALS)
 	add_definitions(-DDISABLE_DENORMALS)
 endif (DISABLE_DENORMALS)
 
-option(LSTM_PREFER_NAM "Always use NAM Core for NAM LSTM models" ON)
-
-if (LSTM_PREFER_NAM)
-	add_definitions(-DLSTM_PREFER_NAM)
-	message("Using NAM Core for LSTM models")
-else()
-	message("Using RTNeural for LSTM models")
-endif (LSTM_PREFER_NAM)
-
-option(WAVENET_PREFER_NAM "Always use NAM Core for NAM WaveNet models" ON)
-
-if (WAVENET_PREFER_NAM)
-	add_definitions(-DWAVENET_PREFER_NAM)
-	message("Using NAM Core for WaveNet models")
-else()
-	message("Using RTNeural for WaveNet models")
-endif (WAVENET_PREFER_NAM)
-
 set_target_properties(neural_amp_modeler
 	PROPERTIES
 	CXX_VISIBILITY_PRESET hidden

From 9c55e904cba388af0d3f34c965e71a19a07a536b Mon Sep 17 00:00:00 2001
From: Mike Oliphant <oliphant@nostatic.org>
Date: Thu, 6 Feb 2025 07:56:33 -0800
Subject: [PATCH 4/4] Update README.md

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 40f1d3f..7915e7e 100644
--- a/README.md
+++ b/README.md
@@ -56,7 +56,3 @@ After building, the plugin will be in **build/neural_amp_modeler.lv2**.
 ### Optimization
 
 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.
-
-By default, NAM models are loading using the NAM Core implementation. It also supports loading NAM models using RTNeural, which generally performs better on x64 hardware.
-
-You can also alter the default model loading behavior with ```-DLSTM_PREFER_NAM=OFF``` (use RTNeural instead of NAM Core for NAM LSTM models) and ```-DWAVENET_PREFER_NAM=OFF``` (use RTNeural instead of NAM Core or NAM WaveNet models).