From c112e7332c08be2256809f3b4221c1c6e4d45438 Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Wed, 11 Nov 2026 16:08:43 +0100 Subject: [PATCH 1/3] add optimise as option in transform to match other flucoma behaviour --- include/flucoma/algorithms/public/UMAP.hpp | 28 ++++++++++++---------- include/flucoma/clients/nrt/UMAPClient.hpp | 4 ++-- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/include/flucoma/algorithms/public/UMAP.hpp b/include/flucoma/algorithms/public/UMAP.hpp index 9e52c161..608753d5 100644 --- a/include/flucoma/algorithms/public/UMAP.hpp +++ b/include/flucoma/algorithms/public/UMAP.hpp @@ -187,7 +187,7 @@ class UMAP SparseMatrixXd knnGraph = SparseMatrixXd(in.size(), in.size()); ArrayXXd dists = ArrayXXd::Zero(in.size(), k); mK = k; - makeGraph(in, mK, knnGraph, dists, true); + makeGraph(in, mK, knnGraph, dists, true);// why do we dismiss the diagonal here ArrayXd sigma = findSigma(k, dists); computeHighDimProb(dists, sigma, knnGraph); SparseMatrixXd knnGraphT = knnGraph.transpose(); @@ -209,28 +209,30 @@ class UMAP return out; } - DataSet transform(DataSet& in, index maxIter = 200, double learningRate = 1.0, index seed = -1) const + DataSet transform(DataSet& in, index maxIter = 200, double learningRate = 1.0, bool optimize = false, index seed = -1) const { if (!mInitialized) return DataSet(); - std::random_device rd; - std::mt19937_64 rng(static_cast(seed < 0 ? rd() : seed)); SparseMatrixXd knnGraph(in.size(), mEmbedding.rows()); ArrayXXd dists = ArrayXXd::Zero(in.size(), mK); - makeGraph(in, mK, knnGraph, dists, false); + makeGraph(in, mK, knnGraph, dists, false);//and not here knnGraph.makeCompressed(); ArrayXd sigma = findSigma(mK, dists); computeHighDimProb(dists, sigma, knnGraph); normalizeRows(knnGraph); ArrayXXd embedding = initTransformEmbedding(knnGraph, mEmbedding, in.size()); - ArrayXi rowIndices(knnGraph.nonZeros()); - ArrayXi colIndices(knnGraph.nonZeros()); - ArrayXd epochsPerSample(knnGraph.nonZeros()); - getGraphIndices(knnGraph, rowIndices, colIndices); - computeEpochsPerSample(knnGraph, epochsPerSample); - epochsPerSample = (epochsPerSample == 0).select(-1, epochsPerSample); - optimizeLayout(embedding, mEmbedding, rowIndices, colIndices, - epochsPerSample, learningRate, maxIter, rng); + if (optimize) { + std::random_device rd; + std::mt19937_64 rng(static_cast(seed < 0 ? rd() : seed)); + ArrayXi rowIndices(knnGraph.nonZeros()); + ArrayXi colIndices(knnGraph.nonZeros()); + ArrayXd epochsPerSample(knnGraph.nonZeros()); + getGraphIndices(knnGraph, rowIndices, colIndices); + computeEpochsPerSample(knnGraph, epochsPerSample); + epochsPerSample = (epochsPerSample == 0).select(-1, epochsPerSample); + optimizeLayout(embedding, mEmbedding, rowIndices, colIndices, + epochsPerSample, learningRate, maxIter, rng); + } DataSet out(in.getIds(), _impl::asFluid(embedding)); return out; } diff --git a/include/flucoma/clients/nrt/UMAPClient.hpp b/include/flucoma/clients/nrt/UMAPClient.hpp index e97bb600..710a3523 100644 --- a/include/flucoma/clients/nrt/UMAPClient.hpp +++ b/include/flucoma/clients/nrt/UMAPClient.hpp @@ -115,7 +115,7 @@ class UMAPClient : public FluidBaseClient, } MessageResult transform(InputDataSetClientRef sourceClient, - DataSetClientRef destClient) + DataSetClientRef destClient, bool optimize = false) { auto srcPtr = sourceClient.get().lock(); auto destPtr = destClient.get().lock(); @@ -130,7 +130,7 @@ class UMAPClient : public FluidBaseClient, StringVector ids{src.getIds()}; FluidDataSet result; result = mAlgorithm.transform(src, get(), get(), - get()); + optimize, get()); destPtr->setDataSet(result); return OK(); } From 28a119449a74d78a3406b2253c7382084a8b3d6e Mon Sep 17 00:00:00 2001 From: tremblap Date: Thu, 12 Nov 2026 16:05:26 +0100 Subject: [PATCH 2/3] Apply batched suggestions from code review Co-authored-by: Owen Green --- include/flucoma/algorithms/public/UMAP.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/flucoma/algorithms/public/UMAP.hpp b/include/flucoma/algorithms/public/UMAP.hpp index 608753d5..d6cfe2f5 100644 --- a/include/flucoma/algorithms/public/UMAP.hpp +++ b/include/flucoma/algorithms/public/UMAP.hpp @@ -187,7 +187,7 @@ class UMAP SparseMatrixXd knnGraph = SparseMatrixXd(in.size(), in.size()); ArrayXXd dists = ArrayXXd::Zero(in.size(), k); mK = k; - makeGraph(in, mK, knnGraph, dists, true);// why do we dismiss the diagonal here + makeGraph(in, mK, knnGraph, dists, true); ArrayXd sigma = findSigma(k, dists); computeHighDimProb(dists, sigma, knnGraph); SparseMatrixXd knnGraphT = knnGraph.transpose(); @@ -209,19 +209,19 @@ class UMAP return out; } - DataSet transform(DataSet& in, index maxIter = 200, double learningRate = 1.0, bool optimize = false, index seed = -1) const + DataSet transform(DataSet& in, index maxIter = 200, double learningRate = 1.0, bool updateEmbedding = false, index seed = -1) const { if (!mInitialized) return DataSet(); SparseMatrixXd knnGraph(in.size(), mEmbedding.rows()); ArrayXXd dists = ArrayXXd::Zero(in.size(), mK); - makeGraph(in, mK, knnGraph, dists, false);//and not here + makeGraph(in, mK, knnGraph, dists, false); knnGraph.makeCompressed(); ArrayXd sigma = findSigma(mK, dists); computeHighDimProb(dists, sigma, knnGraph); normalizeRows(knnGraph); ArrayXXd embedding = initTransformEmbedding(knnGraph, mEmbedding, in.size()); - if (optimize) { + if (updateEmbedding) { std::random_device rd; std::mt19937_64 rng(static_cast(seed < 0 ? rd() : seed)); ArrayXi rowIndices(knnGraph.nonZeros()); From 7012bc46fadda6f60aa41b0e1a02b9b1c71079f3 Mon Sep 17 00:00:00 2001 From: Pierre Alexandre Tremblay Date: Thu, 12 Nov 2026 16:08:42 +0100 Subject: [PATCH 3/3] mods from comments part 2 --- include/flucoma/clients/nrt/UMAPClient.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/flucoma/clients/nrt/UMAPClient.hpp b/include/flucoma/clients/nrt/UMAPClient.hpp index 710a3523..3a66ed26 100644 --- a/include/flucoma/clients/nrt/UMAPClient.hpp +++ b/include/flucoma/clients/nrt/UMAPClient.hpp @@ -115,7 +115,7 @@ class UMAPClient : public FluidBaseClient, } MessageResult transform(InputDataSetClientRef sourceClient, - DataSetClientRef destClient, bool optimize = false) + DataSetClientRef destClient, bool updateEmbedding) { auto srcPtr = sourceClient.get().lock(); auto destPtr = destClient.get().lock(); @@ -130,7 +130,7 @@ class UMAPClient : public FluidBaseClient, StringVector ids{src.getIds()}; FluidDataSet result; result = mAlgorithm.transform(src, get(), get(), - optimize, get()); + updateEmbedding, get()); destPtr->setDataSet(result); return OK(); }