Update to latest NeuralAmpModelerCore 0.2.0 release

brummer10 · Oct 28, 2024 · cac09b5 · cac09b5
1 parent f202044
commit cac09b5
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 15 deletions.
diff --git a/NeuralAmpModelerCore b/NeuralAmpModelerCore
diff --git a/Ratatouille/ModelerSelector.h b/Ratatouille/ModelerSelector.h
@@ -18,6 +18,7 @@
 #include <condition_variable>
 
 #include "dsp.h"
+#include "get_dsp.h"
 #include "activations.h"
 
 #include "RTNeural.h"

diff --git a/Ratatouille/NeuralModel.cpp b/Ratatouille/NeuralModel.cpp
@@ -71,15 +71,14 @@ inline void NeuralModel::compute(int count, float *input0, float *output0)
                 memcpy(buf1, buf, ReCounta * sizeof(float));
             }
             model->process(buf1, buf1, ReCounta);
-            model->finalize_(ReCounta);
+
             if (needResample == 1) {
                 smp.down(buf1, buf);
             } else if (needResample == 2) {
                 smp.up(ReCounta, buf1, buf);
             }
         } else {
             model->process(buf, buf, count);
-            model->finalize_(count);
         }
         memcpy(output0, buf, count*sizeof(float));
     }
@@ -121,7 +120,6 @@ bool NeuralModel::loadModel() {
             memset(buffer, 0, warmUpSize * sizeof(float));
 
             model->process(buffer, buffer, warmUpSize);
-            model->finalize_(warmUpSize);
 
             delete[] buffer;
             //fprintf(stderr, "sample rate = %i file = %i l = %f\n",fSampleRate, modelSampleRate, loudness);

diff --git a/Ratatouille/ParallelThread.h b/Ratatouille/ParallelThread.h
@@ -108,6 +108,8 @@ class ProcessPtr
     void process() const {
         return memberFunc[i](instPtr[i]);
     }
+
+    void dummyFunc() {}
 
 private:
     typedef void* InstancePtr;
@@ -118,8 +120,6 @@ class ProcessPtr
         return (static_cast<C*>(instance)->*Function)();
     }
 
-    void dummyFunc() {}
-
     InstancePtr instPtr[2];
     MemberFunc memberFunc[2];
     uint32_t i;
@@ -185,9 +185,7 @@ class ParallelThread: public ProcessPtr
                 if (pthread_cond_timedwait(&pProcCond, &pWaitProc, getTimeOut()) == ETIMEDOUT) {
                     pthread_mutex_unlock(&pWaitProc);
                     maxDuration +=1;
-                    //fprintf(stderr, "%s wait for process %i\n", threadName.c_str(), maxDuration);
                     if (maxDuration > 2) {
-                        //fprintf(stderr, "%s break waitForProcess\n", threadName.c_str());
                         break;
                     }
                 } else {
@@ -219,16 +217,13 @@ class ParallelThread: public ProcessPtr
                 if (pthread_cond_timedwait(&pProcCond, &pWaitProc, getTimeOut()) == ETIMEDOUT) {
                     pthread_mutex_unlock(&pWaitProc);
                     maxDuration +=1;
-                    //fprintf(stderr, "%s wait for data %i\n", threadName.c_str(), maxDuration);
                     if (maxDuration > 5) {
                         pWait.store(false, std::memory_order_release);
-                        //fprintf(stderr, "%s break processWait\n", threadName.c_str());
                     }
                 } else {
                     pthread_mutex_unlock(&pWaitProc);;
                 }
             }
-            //fprintf(stderr, "%s processed data %i\n", threadName.c_str(), maxDuration);
         }
     }
 
@@ -237,6 +232,7 @@ class ParallelThread: public ProcessPtr
         if (isRunning()) {
             pRun.store(false, std::memory_order_release);
             if (pThd.joinable()) {
+                set<ProcessPtr, &ProcessPtr::dummyFunc>(this);
                 #if __cplusplus > 201703L
                 pWorkCond.store(true);
                 #endif

diff --git a/Ratatouille/makefile b/Ratatouille/makefile
@@ -45,13 +45,13 @@ endif
 # check for sse optimisation level only on x86_64 architecture
 ifeq ($(TARGET_ARCH), x86_64)
   ifneq ($$(filter $(CPU_INFO) | grep sse3 ) , )
-    SSE_CFLAGS = -msse3 -mfpmath=sse -mfxsr -DUSE_SSE
+    SSE_CFLAGS = -msse3 -mfpmath=sse -mfxsr -DUSE_SSE=1
     FFT_FLAG = -DFFTCONVOLVER_USE_SSE=1
   else ifneq ($$(filter $(CPU_INFO) | grep sse2 ) , )
-    SSE_CFLAGS = -msse2 -mfpmath=sse -mfxsr -DUSE_SSE
+    SSE_CFLAGS = -msse2 -mfpmath=sse -mfxsr -DUSE_SSE=1
     FFT_FLAG = -DFFTCONVOLVER_USE_SSE=1
   else ifneq ($$(filter $(CPU_INFO) | grep sse ) , )
-    SSE_CFLAGS = -msse -mfpmath=sse -mfxsr -DUSE_SSE
+    SSE_CFLAGS = -msse -mfpmath=sse -mfxsr -DUSE_SSE=1
     FFT_FLAG = -DFFTCONVOLVER_USE_SSE=1
   else ifneq ($$(filter $(CPU_INFO) | grep ARM ) , )
     ifneq ($$(filter $(CPU_INFO) | grep ARMv7 ) , )

diff --git a/libxputty b/libxputty
+9 −2		.github/workflows/build.yml
+1 −1		CMakeLists.txt
+4 −2		NAM/activations.cpp
+19 −0		NAM/activations.h
+6 −3		NAM/convnet.cpp
+4 −1		NAM/convnet.h
+34 −15		NAM/dsp.cpp
+55 −10		NAM/dsp.h
+41 −26		NAM/get_dsp.cpp
+15 −0		NAM/get_dsp.h
+9 −1		NAM/lstm.cpp
+3 −0		NAM/lstm.h
+1 −1		NAM/version.h
+12 −16		NAM/wavenet.cpp
+6 −5		NAM/wavenet.h
+4 −2		README.md
+1 −0		example_models/lstm.nam
+1 −0		example_models/wavenet.nam
+7 −1		tools/CMakeLists.txt
+19 −12		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 −0		Build/Makefile.base
+1 −1		build.sh
+1 −0		xputty/header/widgets/xkeyboard.h
+5 −5		xputty/widgets/xkeyboard.c