From 767d0a1dfaa4d5cb8d5dbd133a71a6aba7cbb4d0 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Mon, 9 Nov 2026 23:46:09 +0000 Subject: [PATCH 1/4] Use proper const types for input views --- .../flucoma/algorithms/public/CepstrumF0.hpp | 5 +++-- .../algorithms/public/ChromaFilterBank.hpp | 8 ++++--- include/flucoma/algorithms/public/DCT.hpp | 4 ++-- include/flucoma/algorithms/public/HPS.hpp | 2 +- .../flucoma/algorithms/public/Loudness.hpp | 7 ++++--- .../flucoma/algorithms/public/MelBands.hpp | 7 ++++--- .../flucoma/algorithms/public/MultiStats.hpp | 4 ++-- include/flucoma/algorithms/public/NMF.hpp | 13 ++++++------ .../flucoma/algorithms/public/NMFCross.hpp | 11 +++++----- .../algorithms/public/Normalization.hpp | 9 ++++---- .../algorithms/public/NoveltyFeature.hpp | 2 +- .../algorithms/public/NoveltySegmentation.hpp | 6 +++--- include/flucoma/algorithms/public/PCA.hpp | 9 ++++---- .../algorithms/public/RobustScaling.hpp | 8 +++---- include/flucoma/algorithms/public/STFT.hpp | 21 +++++++------------ .../algorithms/public/SpectralShape.hpp | 2 +- .../algorithms/public/Standardization.hpp | 11 +++++----- .../algorithms/public/TransientExtraction.hpp | 7 +++---- .../public/TransientSegmentation.hpp | 4 ++-- include/flucoma/algorithms/public/YINFFT.hpp | 2 +- include/flucoma/algorithms/util/TruePeak.hpp | 3 +-- 21 files changed, 70 insertions(+), 75 deletions(-) diff --git a/include/flucoma/algorithms/public/CepstrumF0.hpp b/include/flucoma/algorithms/public/CepstrumF0.hpp index d6b8a55a1..a0d2dd505 100644 --- a/include/flucoma/algorithms/public/CepstrumF0.hpp +++ b/include/flucoma/algorithms/public/CepstrumF0.hpp @@ -41,8 +41,9 @@ class CepstrumF0 mCepstrum.setZero(); } - void processFrame(const RealVectorView& input, RealVectorView output, - double minFreq, double maxFreq, double sampleRate, Allocator& alloc) + void processFrame(const InputRealVectorView input, RealVectorView output, + double minFreq, double maxFreq, double sampleRate, + Allocator& alloc) { using namespace Eigen; using namespace std; diff --git a/include/flucoma/algorithms/public/ChromaFilterBank.hpp b/include/flucoma/algorithms/public/ChromaFilterBank.hpp index 6705b83ac..e30013d4c 100644 --- a/include/flucoma/algorithms/public/ChromaFilterBank.hpp +++ b/include/flucoma/algorithms/public/ChromaFilterBank.hpp @@ -17,6 +17,7 @@ under the European Union’s Horizon 2020 research and innovation programme #include "../util/FluidEigenMappings.hpp" #include "../../data/FluidIndex.hpp" #include "../../data/FluidMemory.hpp" +#include "../../data/TensorTypes.hpp" #include #include #include @@ -80,13 +81,14 @@ class ChromaFilterBank mSampleRate = sampleRate; } - void processFrame(const RealVectorView in, RealVectorView out, - double minFreq = 0, double maxFreq = -1, index normalize = 0) + void processFrame(const InputRealVectorView in, RealVectorView out, + double minFreq = 0, double maxFreq = -1, + index normalize = 0) { using namespace Eigen; using namespace std; - FluidEigenMap frame = _impl::asEigen(in); + auto frame = _impl::asEigen(in); if(minFreq != 0 || maxFreq != -1){ maxFreq = (maxFreq == -1) ? (mSampleRate / 2) : min(maxFreq, mSampleRate / 2); diff --git a/include/flucoma/algorithms/public/DCT.hpp b/include/flucoma/algorithms/public/DCT.hpp index f53ae8264..46fc1c939 100644 --- a/include/flucoma/algorithms/public/DCT.hpp +++ b/include/flucoma/algorithms/public/DCT.hpp @@ -61,7 +61,7 @@ class DCT mInitialized = true; } - void processFrame(const RealVectorView in, RealVectorView out) + void processFrame(const InputRealVectorView in, RealVectorView out) { assert(mInitialized && "DCT: processFrame() called before init()"); assert(in.size() == mInputSize && @@ -69,7 +69,7 @@ class DCT assert(out.size() == mOutputSize && "DCT: actual output size doesn't maatch expected size"); - FluidEigenMap frame = _impl::asEigen(in); + auto frame = _impl::asEigen(in); _impl::asEigen(out).noalias() = (mTable.topLeftCorner(mOutputSize, mInputSize) * frame); } diff --git a/include/flucoma/algorithms/public/HPS.hpp b/include/flucoma/algorithms/public/HPS.hpp index 8a2aa224c..692441711 100644 --- a/include/flucoma/algorithms/public/HPS.hpp +++ b/include/flucoma/algorithms/public/HPS.hpp @@ -22,7 +22,7 @@ class HPS { public: - void processFrame(const RealVectorView& input, RealVectorView output, + void processFrame(const InputRealVectorView input, RealVectorView output, index nHarmonics, double minFreq, double maxFreq, double sampleRate, Allocator& alloc) { diff --git a/include/flucoma/algorithms/public/Loudness.hpp b/include/flucoma/algorithms/public/Loudness.hpp index d042df4f4..eb38c9710 100644 --- a/include/flucoma/algorithms/public/Loudness.hpp +++ b/include/flucoma/algorithms/public/Loudness.hpp @@ -40,15 +40,16 @@ class Loudness mInitialized = true; } - void processFrame(const RealVectorView& input, RealVectorView output, - bool weighting, bool truePeak, Allocator& alloc = FluidDefaultAllocator()) + void processFrame(const InputRealVectorView input, RealVectorView output, + bool weighting, bool truePeak, + Allocator& alloc = FluidDefaultAllocator()) { using namespace Eigen; using namespace std; assert(mInitialized); assert(output.size() == 2); assert(input.size() == mSize); - FluidEigenMap in = _impl::asEigen(input); + auto in = _impl::asEigen(input); ScopedEigenMap filtered(mSize, alloc); for (index i = 0; i < mSize; i++) filtered(i) = weighting ? mFilter.processSample(input(i)) : input(i); diff --git a/include/flucoma/algorithms/public/MelBands.hpp b/include/flucoma/algorithms/public/MelBands.hpp index edd42cbef..086150fc7 100644 --- a/include/flucoma/algorithms/public/MelBands.hpp +++ b/include/flucoma/algorithms/public/MelBands.hpp @@ -14,6 +14,7 @@ under the European Union’s Horizon 2020 research and innovation programme #include "../util/FluidEigenMappings.hpp" #include "../../data/FluidIndex.hpp" #include "../../data/FluidMemory.hpp" +#include "../../data/TensorTypes.hpp" #include #include #include @@ -76,13 +77,13 @@ class MelBands mNBins = nBins; } - void processFrame(const RealVectorView in, RealVectorView out, bool magNorm, + void processFrame(const InputRealVectorView in, RealVectorView out, bool magNorm, bool usePower, bool logOutput, Allocator&) { using namespace Eigen; - FluidEigenMap frame = _impl::asEigen(in); - FluidEigenMap result = _impl::asEigen(out); + auto frame = _impl::asEigen(in); + auto result = _impl::asEigen(out); if (magNorm) frame = frame * mScale1; double energy = frame.sum() * mScale2; diff --git a/include/flucoma/algorithms/public/MultiStats.hpp b/include/flucoma/algorithms/public/MultiStats.hpp index 7ccbc3a71..2335cf22d 100644 --- a/include/flucoma/algorithms/public/MultiStats.hpp +++ b/include/flucoma/algorithms/public/MultiStats.hpp @@ -18,7 +18,7 @@ under the European Union’s Horizon 2020 research and innovation programme #include "../../data/TensorTypes.hpp" #include #include -#include + namespace fluid { namespace algorithm { @@ -45,7 +45,7 @@ class MultiStats return in.segment(1, in.size() - 1) - in.segment(0, in.size() - 1); } - void process(const RealMatrixView in, RealMatrixView out, double cutoff = -1, + void process(const InputRealMatrixView in, RealMatrixView out, double cutoff = -1, RealVectorView w = RealVectorView(nullptr, 0, 0)) { using namespace Eigen; diff --git a/include/flucoma/algorithms/public/NMF.hpp b/include/flucoma/algorithms/public/NMF.hpp index 6c6a4d161..bc7d65af8 100644 --- a/include/flucoma/algorithms/public/NMF.hpp +++ b/include/flucoma/algorithms/public/NMF.hpp @@ -30,7 +30,7 @@ class NMF // cancelled) using ProgressCallback = std::function; - static void estimate(const RealMatrixView W, const RealMatrixView H, + static void estimate(const InputRealMatrixView W, const InputRealMatrixView H, index idx, RealMatrixView V) { using namespace Eigen; @@ -42,14 +42,14 @@ class NMF } // processFrame computes activations of a dictionary W in a given frame - void processFrame(const RealVectorView x, const RealMatrixView W0, + void processFrame(const InputRealVectorView x, const InputRealMatrixView W0, RealVectorView out, index nIterations, RealVectorView v, index randomSeed, Allocator& alloc) { using namespace Eigen; using namespace _impl; index rank = W0.extent(0); - FluidEigenMap W = asEigen(W0); + auto W = asEigen(W0); ScopedEigenMap h(rank, alloc); h = EigenRandom(rank, RandomSeed{randomSeed}, Range{0.0, 1.0}); @@ -88,9 +88,10 @@ class NMF if (v.data()) _impl::asEigen(v).noalias() = (W.transpose() * h); } - void process(const RealMatrixView X, RealMatrixView W1, RealMatrixView H1, - RealMatrixView V1, index rank, index nIterations, bool updateW, - bool updateH = false, index randomSeed = -1, + void process(const InputRealMatrixView X, RealMatrixView W1, + RealMatrixView H1, RealMatrixView V1, index rank, + index nIterations, bool updateW, bool updateH = false, + index randomSeed = -1, RealMatrixView W0 = RealMatrixView(nullptr, 0, 0, 0), RealMatrixView H0 = RealMatrixView(nullptr, 0, 0, 0)) { diff --git a/include/flucoma/algorithms/public/NMFCross.hpp b/include/flucoma/algorithms/public/NMFCross.hpp index be89ce671..5c2501e84 100644 --- a/include/flucoma/algorithms/public/NMFCross.hpp +++ b/include/flucoma/algorithms/public/NMFCross.hpp @@ -14,14 +14,12 @@ under the European Union’s Horizon 2020 research and innovation programme #pragma once -#include "STFT.hpp" #include "../util/EigenRandom.hpp" #include "../util/FluidEigenMappings.hpp" #include "../../data/FluidIndex.hpp" #include "../../data/TensorTypes.hpp" #include #include -#include #include namespace fluid { @@ -46,7 +44,7 @@ class NMFCross NMFCross(index nIterations) : mIterations(nIterations) {} - static void synthesize(const RealMatrixView h, const ComplexMatrixView w, + static void synthesize(const InputRealMatrixView h, const ComplexMatrixView w, ComplexMatrixView out) { using namespace Eigen; @@ -57,8 +55,9 @@ class NMFCross out <<= asFluid(V); } - void process(const RealMatrixView X, RealMatrixView H1, RealMatrixView W0, - index r, index p, index c, index randomSeed = -1) const + void process(const InputRealMatrixView X, RealMatrixView H1, + RealMatrixView W0, index r, index p, index c, + index randomSeed = -1) const { index nFrames = X.extent(0); // index nBins = X.extent(1); @@ -129,7 +128,7 @@ class NMFCross VectorXd::Index maxIndex{0}; neighborhood.maxCoeff(&maxIndex); if (int(maxIndex) != halfSize) - { output(i, j) = H(i, j) * (1 - ((iteration + 1) / mIterations)); } + { output(i, j) = H(i, j) * (1 - ((iteration + 1.0) / mIterations)); } else { output(i, j) = H(i, j); diff --git a/include/flucoma/algorithms/public/Normalization.hpp b/include/flucoma/algorithms/public/Normalization.hpp index 3847c9d79..fca94056a 100644 --- a/include/flucoma/algorithms/public/Normalization.hpp +++ b/include/flucoma/algorithms/public/Normalization.hpp @@ -15,7 +15,6 @@ under the European Union’s Horizon 2020 research and innovation programme #include "../../data/TensorTypes.hpp" #include #include -#include namespace fluid { namespace algorithm { @@ -58,13 +57,13 @@ class Normalization mInitialized = true; } - void processFrame(const RealVectorView in, RealVectorView out, + void processFrame(const InputRealVectorView in, RealVectorView out, bool inverse = false) const { using namespace Eigen; using namespace _impl; - FluidEigenMap input = asEigen(in); - FluidEigenMap result = asEigen(out); + auto input = asEigen(in); + auto result = asEigen(out); if (!inverse) { result = (input - mDataMin) / mDataRange; @@ -77,7 +76,7 @@ class Normalization } } - void process(const RealMatrixView in, RealMatrixView out, + void process(const InputRealMatrixView in, RealMatrixView out, bool inverse = false) const { using namespace Eigen; diff --git a/include/flucoma/algorithms/public/NoveltyFeature.hpp b/include/flucoma/algorithms/public/NoveltyFeature.hpp index ebfc31eb6..94be368a8 100644 --- a/include/flucoma/algorithms/public/NoveltyFeature.hpp +++ b/include/flucoma/algorithms/public/NoveltyFeature.hpp @@ -41,7 +41,7 @@ class NoveltyFeature mInitialized = true; } - double processFrame(const RealVectorView input, Allocator& alloc) + double processFrame(const InputRealVectorView input, Allocator& alloc) { assert(mInitialized); double novelty = diff --git a/include/flucoma/algorithms/public/NoveltySegmentation.hpp b/include/flucoma/algorithms/public/NoveltySegmentation.hpp index 854471f4e..791a504a2 100644 --- a/include/flucoma/algorithms/public/NoveltySegmentation.hpp +++ b/include/flucoma/algorithms/public/NoveltySegmentation.hpp @@ -11,7 +11,6 @@ under the European Union’s Horizon 2020 research and innovation programme #pragma once #include "NoveltyFeature.hpp" -#include "../util/FluidEigenMappings.hpp" #include "../../data/FluidIndex.hpp" #include "../../data/FluidMemory.hpp" #include "../../data/TensorTypes.hpp" @@ -40,8 +39,9 @@ class NoveltySegmentation mPeakBuffer.setZero(); } - double processFrame(const RealVectorView input, double threshold, - index minSliceLength, Allocator& alloc = FluidDefaultAllocator()) + double processFrame(const InputRealVectorView input, double threshold, + index minSliceLength, + Allocator& alloc = FluidDefaultAllocator()) { double detected = 0.; diff --git a/include/flucoma/algorithms/public/PCA.hpp b/include/flucoma/algorithms/public/PCA.hpp index 24e7717f9..c8782d16f 100644 --- a/include/flucoma/algorithms/public/PCA.hpp +++ b/include/flucoma/algorithms/public/PCA.hpp @@ -10,12 +10,13 @@ under the European Union’s Horizon 2020 research and innovation programme #pragma once +#include "../util/AlgorithmUtils.hpp" #include "../util/FluidEigenMappings.hpp" #include "../../data/TensorTypes.hpp" #include #include #include -#include + namespace fluid { namespace algorithm { @@ -53,13 +54,13 @@ class PCA mInitialized = true; } - void processFrame(const RealVectorView in, RealVectorView out, index k, + void processFrame(const InputRealVectorView in, RealVectorView out, index k, bool whiten = false) const { using namespace Eigen; using namespace _impl; if (k > mBases.cols()) return; - FluidEigenMap input = asEigen(in); + auto input = asEigen(in); input = input - mMean; FluidEigenMap result = asEigen(out); // this avoids Eigen making a temporary (sorry): @@ -91,7 +92,7 @@ class PCA } } - double process(const RealMatrixView in, RealMatrixView out, index k, + double process(const InputRealMatrixView in, RealMatrixView out, index k, bool whiten = false) const { using namespace Eigen; diff --git a/include/flucoma/algorithms/public/RobustScaling.hpp b/include/flucoma/algorithms/public/RobustScaling.hpp index ddf0a8988..fe39d3006 100644 --- a/include/flucoma/algorithms/public/RobustScaling.hpp +++ b/include/flucoma/algorithms/public/RobustScaling.hpp @@ -68,13 +68,13 @@ class RobustScaling mInitialized = true; } - void processFrame(const RealVectorView in, RealVectorView out, + void processFrame(const InputRealVectorView in, RealVectorView out, bool inverse = false) const { using namespace Eigen; using namespace _impl; - FluidEigenMap input = asEigen(in); - FluidEigenMap result = asEigen(out); + auto input = asEigen(in); + auto result = asEigen(out); if (!inverse) { result = (input - mMedian) / mRange; } else { @@ -82,7 +82,7 @@ class RobustScaling } } - void process(const RealMatrixView in, RealMatrixView out, + void process(const InputRealMatrixView in, RealMatrixView out, bool inverse = false) const { using namespace Eigen; diff --git a/include/flucoma/algorithms/public/STFT.hpp b/include/flucoma/algorithms/public/STFT.hpp index cef092e0d..4fcdb63d6 100644 --- a/include/flucoma/algorithms/public/STFT.hpp +++ b/include/flucoma/algorithms/public/STFT.hpp @@ -11,7 +11,6 @@ under the European Union’s Horizon 2020 research and innovation programme #pragma once #include "WindowFuncs.hpp" -#include "../util/AlgorithmUtils.hpp" #include "../util/FFT.hpp" #include "../util/FluidEigenMappings.hpp" #include "../../data/FluidIndex.hpp" @@ -57,37 +56,31 @@ class STFT WindowFuncs::map()[mWindowType](mWindowSize, window); mFFT.resize(fftSize); } - - static void magnitude(const FluidTensorView, 2> in, - FluidTensorView out) + static void magnitude(const InputComplexMatrixView in, RealMatrixView out) { _impl::asEigen(out) = _impl::asEigen(in).abs().real(); } - static void magnitude(const FluidTensorView, 1> in, - FluidTensorView out) + static void magnitude(const InputComplexVectorView in, RealVectorView out) { _impl::asEigen(out) = _impl::asEigen(in).abs().real(); } - static void phase(const FluidTensorView, 2> in, - FluidTensorView out) + static void phase(const InputComplexMatrixView in, RealMatrixView out) { _impl::asEigen(out) = _impl::asEigen(in).arg().real(); } - static void phase(const FluidTensorView, 1> in, - FluidTensorView out) + static void phase(const InputComplexVectorView in, RealVectorView out) { - phase(FluidTensorView, 2>(in), - FluidTensorView(out)); + phase(InputComplexMatrixView(in), RealMatrixView(out)); } - void process(const RealVectorView audio, ComplexMatrixView spectrogram) + void process(const InputRealVectorView audio, ComplexMatrixView spectrogram) { index halfWindow = mWindowSize / 2; ArrayXdMap window(mWindowBuffer.data(), mWindowSize); @@ -107,7 +100,7 @@ class STFT spectrogram <<= _impl::asFluid(result); } - void processFrame(const RealVectorView frame, ComplexVectorView out) + void processFrame(const InputRealVectorView frame, ComplexVectorView out) { assert(frame.size() == mWindowSize); ArrayXdMap window(mWindowBuffer.data(), mWindowSize); diff --git a/include/flucoma/algorithms/public/SpectralShape.hpp b/include/flucoma/algorithms/public/SpectralShape.hpp index fcb84e28a..c5f98fa7c 100644 --- a/include/flucoma/algorithms/public/SpectralShape.hpp +++ b/include/flucoma/algorithms/public/SpectralShape.hpp @@ -101,7 +101,7 @@ class SpectralShape mOutputBuffer(6) = 20 * log10(max(crest, epsilon)); } - void processFrame(const RealVectorView input, RealVectorView output, + void processFrame(const InputRealVectorView input, RealVectorView output, double sampleRate, double minFreq, double maxFreq, double rolloffTarget, bool logFreq, bool usePower, Allocator& alloc) diff --git a/include/flucoma/algorithms/public/Standardization.hpp b/include/flucoma/algorithms/public/Standardization.hpp index bf8deb604..9adb9c275 100644 --- a/include/flucoma/algorithms/public/Standardization.hpp +++ b/include/flucoma/algorithms/public/Standardization.hpp @@ -15,7 +15,6 @@ under the European Union’s Horizon 2020 research and innovation programme #include "../../data/TensorTypes.hpp" #include #include -#include namespace fluid { namespace algorithm { @@ -38,7 +37,7 @@ class Standardization mInitialized = true; } - void init(const RealVectorView mean, const RealVectorView std) + void init(const InputRealVectorView mean, const InputRealVectorView std) { using namespace Eigen; using namespace _impl; @@ -48,13 +47,13 @@ class Standardization mInitialized = true; } - void processFrame(const RealVectorView in, RealVectorView out, + void processFrame(const InputRealVectorView in, RealVectorView out, bool inverse = false) const { using namespace Eigen; using namespace _impl; - FluidEigenMap input = asEigen(in); - FluidEigenMap result = asEigen(out); + auto input = asEigen(in); + auto result = asEigen(out); if (!inverse) { result = (input - mMean) / mStd; } else { @@ -62,7 +61,7 @@ class Standardization } } - void process(const RealMatrixView in, RealMatrixView out, + void process(const InputRealMatrixView in, RealMatrixView out, bool inverse = false) const { using namespace Eigen; diff --git a/include/flucoma/algorithms/public/TransientExtraction.hpp b/include/flucoma/algorithms/public/TransientExtraction.hpp index e9cff04a6..0c056b3b6 100644 --- a/include/flucoma/algorithms/public/TransientExtraction.hpp +++ b/include/flucoma/algorithms/public/TransientExtraction.hpp @@ -11,7 +11,6 @@ under the European Union’s Horizon 2020 research and innovation programme #pragma once #include "../util/ARModel.hpp" -#include "../util/FluidEigenMappings.hpp" #include "../../data/FluidIndex.hpp" #include "../../data/FluidMemory.hpp" #include "../../data/TensorTypes.hpp" @@ -108,7 +107,7 @@ class TransientExtraction return mCount; } - void process(const RealVectorView input, RealVectorView transients, + void process(const InputRealVectorView input, RealVectorView transients, RealVectorView residual, Allocator& alloc = FluidDefaultAllocator()) { assert(mInitialized && "Call init() before processing"); @@ -121,7 +120,7 @@ class TransientExtraction interpolate(transients.data(), residual.data(), alloc); } - void process(const RealVectorView input, const RealVectorView unknowns, + void process(const InputRealVectorView input, const InputRealVectorView unknowns, RealVectorView transients, RealVectorView residual, Allocator& alloc = FluidDefaultAllocator()) { @@ -263,7 +262,7 @@ class TransientExtraction mCount = count; } - template + template double calcStat(const double* input, index size) { RealVectorView view(const_cast(input), 0, size); diff --git a/include/flucoma/algorithms/public/TransientSegmentation.hpp b/include/flucoma/algorithms/public/TransientSegmentation.hpp index 176dcf4fb..a9c3a98da 100644 --- a/include/flucoma/algorithms/public/TransientSegmentation.hpp +++ b/include/flucoma/algorithms/public/TransientSegmentation.hpp @@ -14,7 +14,7 @@ under the European Union’s Horizon 2020 research and innovation programme #include "../../data/FluidIndex.hpp" #include "../../data/FluidMemory.hpp" #include "../../data/TensorTypes.hpp" -#include + namespace fluid { namespace algorithm { @@ -40,7 +40,7 @@ class TransientSegmentation : public algorithm::TransientExtraction mDebounce = 0; } - void process(const RealVectorView input, RealVectorView output, + void process(const InputRealVectorView input, RealVectorView output, Allocator& alloc = FluidDefaultAllocator()) { detect(input.data(), input.extent(0), alloc); diff --git a/include/flucoma/algorithms/public/YINFFT.hpp b/include/flucoma/algorithms/public/YINFFT.hpp index 0408ba7b9..7dc49551b 100644 --- a/include/flucoma/algorithms/public/YINFFT.hpp +++ b/include/flucoma/algorithms/public/YINFFT.hpp @@ -30,7 +30,7 @@ class YINFFT : mFFT(2 * maxInputSize - 1, alloc) {} - void processFrame(const RealVectorView& input, RealVectorView output, + void processFrame(const InputRealVectorView input, RealVectorView output, double minFreq, double maxFreq, double sampleRate, Allocator& alloc = FluidDefaultAllocator()) { diff --git a/include/flucoma/algorithms/util/TruePeak.hpp b/include/flucoma/algorithms/util/TruePeak.hpp index c242e3ed6..17c3eb4fc 100644 --- a/include/flucoma/algorithms/util/TruePeak.hpp +++ b/include/flucoma/algorithms/util/TruePeak.hpp @@ -11,7 +11,6 @@ under the European Union’s Horizon 2020 research and innovation programme #pragma once #include "AlgorithmUtils.hpp" -#include "FFT.hpp" #include "FluidEigenMappings.hpp" #include "../../data/FluidIndex.hpp" #include "../../data/FluidMemory.hpp" @@ -161,7 +160,7 @@ class TruePeak mInterpolator.init(nTaps, mFactor); } - double processFrame(const RealVectorView& input, Allocator&) + double processFrame(const InputRealVectorView input, Allocator&) { using namespace Eigen; From 602a4d82ff633f9a46b16c878a3457b8f1be95e3 Mon Sep 17 00:00:00 2001 From: Owen Green Date: Tue, 10 Nov 2026 00:22:50 +0000 Subject: [PATCH 2/4] Fix mutation of algorithm inputs --- include/flucoma/algorithms/public/MelBands.hpp | 8 +++++--- include/flucoma/algorithms/public/NMF.hpp | 3 ++- include/flucoma/algorithms/public/PCA.hpp | 7 +++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/include/flucoma/algorithms/public/MelBands.hpp b/include/flucoma/algorithms/public/MelBands.hpp index 086150fc7..34d6137ea 100644 --- a/include/flucoma/algorithms/public/MelBands.hpp +++ b/include/flucoma/algorithms/public/MelBands.hpp @@ -27,7 +27,8 @@ class MelBands public: MelBands( index maxBands, index maxFFT, Allocator& alloc = FluidDefaultAllocator()) - : mFilters(maxBands, maxFFT / 2 + 1, alloc) + : mFrame(maxFFT, alloc), + mFilters(maxBands, maxFFT / 2 + 1, alloc) {} /*static inline double mel2hz(double x) { @@ -81,8 +82,8 @@ class MelBands bool usePower, bool logOutput, Allocator&) { using namespace Eigen; - - auto frame = _impl::asEigen(in); + auto frame = mFrame.leftCols(in.rows()); + frame = _impl::asEigen(in); auto result = _impl::asEigen(out); if (magNorm) frame = frame * mScale1; @@ -101,6 +102,7 @@ class MelBands double mScale2{1.0}; private: + ScopedEigenMap mFrame; ScopedEigenMap mFilters; index mNBands; index mNBins; diff --git a/include/flucoma/algorithms/public/NMF.hpp b/include/flucoma/algorithms/public/NMF.hpp index bc7d65af8..90daacd33 100644 --- a/include/flucoma/algorithms/public/NMF.hpp +++ b/include/flucoma/algorithms/public/NMF.hpp @@ -49,7 +49,8 @@ class NMF using namespace Eigen; using namespace _impl; index rank = W0.extent(0); - auto W = asEigen(W0); + ScopedEigenMap W{W0.rows(),W0.cols(),alloc}; + W = asEigen(W0); ScopedEigenMap h(rank, alloc); h = EigenRandom(rank, RandomSeed{randomSeed}, Range{0.0, 1.0}); diff --git a/include/flucoma/algorithms/public/PCA.hpp b/include/flucoma/algorithms/public/PCA.hpp index c8782d16f..662584e56 100644 --- a/include/flucoma/algorithms/public/PCA.hpp +++ b/include/flucoma/algorithms/public/PCA.hpp @@ -60,12 +60,11 @@ class PCA using namespace Eigen; using namespace _impl; if (k > mBases.cols()) return; - auto input = asEigen(in); - input = input - mMean; - FluidEigenMap result = asEigen(out); + auto input = asEigen(in); + auto result = asEigen(out); // this avoids Eigen making a temporary (sorry): result.transpose().noalias() = - input.transpose() * mBases.block(0, 0, mBases.rows(), k); + (input - mMean).transpose() * mBases.block(0, 0, mBases.rows(), k); if (whiten) { From df9b14969958dd05f5c1e4832e926e2bd136423c Mon Sep 17 00:00:00 2001 From: Owen Green Date: Tue, 10 Nov 2026 00:50:19 +0000 Subject: [PATCH 3/4] fix row / column mix up --- include/flucoma/algorithms/public/MelBands.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/flucoma/algorithms/public/MelBands.hpp b/include/flucoma/algorithms/public/MelBands.hpp index 34d6137ea..bf4101771 100644 --- a/include/flucoma/algorithms/public/MelBands.hpp +++ b/include/flucoma/algorithms/public/MelBands.hpp @@ -82,7 +82,7 @@ class MelBands bool usePower, bool logOutput, Allocator&) { using namespace Eigen; - auto frame = mFrame.leftCols(in.rows()); + auto frame = mFrame.topRows(in.rows()); frame = _impl::asEigen(in); auto result = _impl::asEigen(out); From d5014adb82fd08ab872081b140533b310a2d0aea Mon Sep 17 00:00:00 2001 From: Owen Green Date: Tue, 10 Nov 2026 09:54:24 +0000 Subject: [PATCH 4/4] Fix input mutation in Chroma --- include/flucoma/algorithms/public/ChromaFilterBank.hpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/flucoma/algorithms/public/ChromaFilterBank.hpp b/include/flucoma/algorithms/public/ChromaFilterBank.hpp index e30013d4c..ed1cf8f75 100644 --- a/include/flucoma/algorithms/public/ChromaFilterBank.hpp +++ b/include/flucoma/algorithms/public/ChromaFilterBank.hpp @@ -29,7 +29,8 @@ class ChromaFilterBank { public: ChromaFilterBank(index maxBins, index maxFFT, Allocator& alloc) - : mMaxChroma(maxBins), mMaxFFT(maxFFT), mFilters(maxBins, maxFFT/2 + 1, alloc) + : mMaxChroma(maxBins), mMaxFFT(maxFFT), + mFilters(maxBins, maxFFT / 2 + 1, alloc), mFrame(maxFFT, alloc) {} @@ -88,7 +89,8 @@ class ChromaFilterBank using namespace Eigen; using namespace std; - auto frame = _impl::asEigen(in); + auto frame = mFrame.topRows(in.rows()); + frame = _impl::asEigen(in); if(minFreq != 0 || maxFreq != -1){ maxFreq = (maxFreq == -1) ? (mSampleRate / 2) : min(maxFreq, mSampleRate / 2); @@ -123,6 +125,7 @@ class ChromaFilterBank index mMaxChroma; index mMaxFFT; ScopedEigenMap mFilters; + ScopedEigenMap mFrame; }; } // namespace algorithm } // namespace fluid