Force BayesFit to run single-threaded

gselzer · gselzer · commit d51b8e5673ba · 2024-04-10T09:03:40.000-05:00
diff --git a/scijava-ops-flim/src/main/java/org/scijava/ops/flim/impl/AbstractSingleFitWorker.java b/scijava-ops-flim/src/main/java/org/scijava/ops/flim/impl/AbstractSingleFitWorker.java
@@ -126,14 +126,18 @@ protected abstract AbstractSingleFitWorker<I> duplicate(FitParams<I> params,
 	 */
 	protected void onThreadInit() {}
 
+	protected boolean runMultiThreaded() {
+		return params.multithread;
+	}
+
 	@Override
 	public void fitBatch(List<int[]> pos, FitEventHandler<I> handler) {
 		final AbstractSingleFitWorker<I> thisWorker = this;
 
 		Consumer<int[]> worker = (data) -> {
 			int start = data[0];
 			int size = data[1];
-			if (!params.multithread) {
+			if (!runMultiThreaded()) {
 				// let the first fitting thread do all the work
 				if (start != 0) {
 					return;
@@ -146,7 +150,7 @@ public void fitBatch(List<int[]> pos, FitEventHandler<I> handler) {
 			final FitResults lResults;
 			final AbstractSingleFitWorker<I> fitWorker;
 			// don't make copy in single thread mode
-			if (!params.multithread || pos.size() == 1) {
+			if (!runMultiThreaded() || pos.size() == 1) {
 				lParams = params;
 				lResults = results;
 				fitWorker = thisWorker;
diff --git a/scijava-ops-flim/src/main/java/org/scijava/ops/flim/impl/BayesFit.java b/scijava-ops-flim/src/main/java/org/scijava/ops/flim/impl/BayesFit.java
@@ -213,6 +213,13 @@ protected AbstractSingleFitWorker<I> duplicate(FitParams<I> params,
 			child.gridMax = this.gridMax;
 			return child;
 		}
+
+		@Override
+		protected boolean runMultiThreaded() {
+			// TODO: Multithreaded execution runs worse, so we force single-threaded
+			// computation
+			return false;
+		}
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,13 @@ protected AbstractSingleFitWorker<I> duplicate(FitParams<I> params,`
`213`	`213`	`child.gridMax = this.gridMax;`
`214`	`214`	`return child;`
`215`	`215`	`}`
	`216`	`+`
	`217`	`+ @Override`
	`218`	`+ protected boolean runMultiThreaded() {`
	`219`	`+ // TODO: Multithreaded execution runs worse, so we force single-threaded`
	`220`	`+ // computation`
	`221`	`+ return false;`
	`222`	`+ }`
`216`	`223`	`}`
`217`	`224`
`218`	`225`	`}`