Skip to content
Snippets Groups Projects
Commit 8a81da22 authored by Paul McCarthy's avatar Paul McCarthy :mountain_bicyclist:
Browse files

MNT: Only run single threaded when being invoked by pyfeeds (requires pyfeeds 0.12.4)

parent bb6c1862
No related branches found
No related tags found
1 merge request!42Update runEddy script to work with new multi-threaded version.
Pipeline #22300 skipped
...@@ -10,8 +10,10 @@ ...@@ -10,8 +10,10 @@
# output as the final line of output. Thne script returns # output as the final line of output. Thne script returns
# an exit code of non-0 if something goes wrong. # an exit code of non-0 if something goes wrong.
# #
# The eddy_cpu executable is executed twice - once with # If called from pyfeeds, the eddy_cpu executable is
# --nthr=1, and again with --nthr=8. # 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 # Outputs of each eddy_<variant> executable is saved with
# prefix ${outdir}/eddyOutput_<variant>. For example, the # prefix ${outdir}/eddyOutput_<variant>. For example, the
...@@ -52,7 +54,12 @@ done ...@@ -52,7 +54,12 @@ done
# the FMRIB cluster # the FMRIB cluster
cpu_exes="" cpu_exes=""
if [ -x "${exedir}/eddy_cpu" ]; then 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" cpu_exes="${cpu_exes} ${exedir}/eddy_cpu_nthr_6"
fi fi
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment