reset num threads in SLiMgui if altered

MesserLab · Jul 29, 2023 · 889b68d · 889b68d
1 parent 34b26ea
commit 889b68d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/SLiMgui/SLiMWindowController.mm b/SLiMgui/SLiMWindowController.mm
@@ -463,6 +463,12 @@ - (void)startNewSimulationFromScript
 		slimgui = nullptr;
 	}
 
+	// Reset the number of threads to be used in parallel regions, if it has been changed by parallelSetNumThreads();
+	// note that we do not save/restore the value across context switches between models, as we do RNGs and such,
+	// since we don't support end users running SLiMgui multithreaded anyhow
+	gEidosNumThreads = gEidosMaxThreads;
+	omp_set_num_threads(gEidosMaxThreads);
+
 	// Free the old simulation RNG and make a new one, to have clean state
 	if (sim_RNG_initialized)
 	{

diff --git a/eidos/eidos_functions_other.cpp b/eidos/eidos_functions_other.cpp
@@ -737,6 +737,9 @@ EidosValue_SP Eidos_ExecuteFunction_parallelSetNumThreads(__attribute__((unused)
 	gEidosNumThreads = (int)numThreads;
 	omp_set_num_threads((int)numThreads);
 
+	// Note that this affects every running model, in SLiMgui.  Since we don't really support end users running SLiMgui
+	// multithreaded, I'm not going to bother fixing that by saving/restoring it across SLiMgui context switches.
+
 	return gStaticEidosValueVOID;
 }