From 8a81da2237cfdc47112b5a846b8e61c1058554d1 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Thu, 18 Jan 2024 11:41:22 +0000
Subject: [PATCH] MNT: Only run single threaded when being invoked by pyfeeds
(requires pyfeeds 0.12.4)
---
eddy/runEddy | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/eddy/runEddy b/eddy/runEddy
index 377d75e..10242dc 100755
--- a/eddy/runEddy
+++ b/eddy/runEddy
@@ -10,8 +10,10 @@
# output as the final line of output. Thne script returns
# an exit code of non-0 if something goes wrong.
#
-# The eddy_cpu executable is executed twice - once with
-# --nthr=1, and again with --nthr=8.
+# If called from pyfeeds, the eddy_cpu executable is
+# executed twice - once with --nthr=1, and again with
+# --nthr=6. If not called from pyfeeds, the eddy_cpu
+# executable is executed only once, with --nthr=6.
#
# Outputs of each eddy_<variant> executable is saved with
# prefix ${outdir}/eddyOutput_<variant>. For example, the
@@ -52,7 +54,12 @@ done
# the FMRIB cluster
cpu_exes=""
if [ -x "${exedir}/eddy_cpu" ]; then
- cpu_exes="${cpu_exes} ${exedir}/eddy_cpu_nthr_1"
+
+ # Only run single-threaded when running
+ # through pyfeeds
+ if [ "$PYFEEDS_TESTING" = "1" ]; then
+ cpu_exes="${cpu_exes} ${exedir}/eddy_cpu_nthr_1"
+ fi
cpu_exes="${cpu_exes} ${exedir}/eddy_cpu_nthr_6"
fi
--
GitLab