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

BF: Wrong variable name

parent 59def6e8
No related branches found
No related tags found
1 merge request!37Major re-arrangement of eddy tests
Pipeline #11680 passed
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
set -e set -e
# First argument is directory in which to search # First argument is directory in which to search
# for eddy executables (typically $FSLDIR/bin). # for eddy executables (typically $FSLDIR/bin).
# All remaining arguments are to be passed to # All remaining arguments are to be passed to
# eddy. Don't pass the --out option, as that is # eddy. Don't pass the --out option, as that is
...@@ -60,7 +60,7 @@ for exe in ${cuda_exes} ${cpu_exes}; ...@@ -60,7 +60,7 @@ for exe in ${cuda_exes} ${cpu_exes};
do do
variant=`basename ${exe}` variant=`basename ${exe}`
variant=`echo ${variant} | sed 's/eddy_//'` variant=`echo ${variant} | sed 's/eddy_//'`
if [[ "${exe}" == *"cuda"* ]]; then if [[ "${exe}" == *"cuda"* ]]; then
fsl_sub="fsl_sub -l ${outdir} -q cuda.q" fsl_sub="fsl_sub -l ${outdir} -q cuda.q"
else else
...@@ -72,12 +72,12 @@ do ...@@ -72,12 +72,12 @@ do
echo "Error submitting ${exe} ${eddy_args}" echo "Error submitting ${exe} ${eddy_args}"
exit 1 exit 1
fi fi
if [[ "${exe}" == *"cuda"* ]]; then if [[ "${exe}" == *"cuda"* ]]; then
cuda_jids="${cuda_jids} ${jid}" cuda_jids="${cuda_jids} ${jid}"
else else
cpu_jids="${cpu_jids} ${jid}" cpu_jids="${cpu_jids} ${jid}"
fi fi
done done
# If running on a cluster, wait # If running on a cluster, wait
...@@ -87,7 +87,7 @@ done ...@@ -87,7 +87,7 @@ done
# have blocked until completion. # have blocked until completion.
if [ ! -z "${SGE_ROOT}" ]; then if [ ! -z "${SGE_ROOT}" ]; then
# Ensure that slots are being reserved # Ensure that slots are being reserved
# on the queue for CPU jobs # on the queue for CPU jobs
for jid in ${cpu_jids}; do for jid in ${cpu_jids}; do
qalter ${jid} -R y qalter ${jid} -R y
...@@ -111,12 +111,12 @@ if [ ! -z "${SGE_ROOT}" ]; then ...@@ -111,12 +111,12 @@ if [ ! -z "${SGE_ROOT}" ]; then
fi fi
# Gather output prefixes for each run, # Gather output prefixes for each run,
# and check that the main output file # and check that the main output file
# was created # was created
outputs="" outputs=""
for exe in ${cuda_exes} ${cpu_exes}; for exe in ${cuda_exes} ${cpu_exes};
do do
tmp=`basename ${cuda_exe}` tmp=`basename ${exe}`
variant=`echo ${tmp} | sed 's/eddy_//'` variant=`echo ${tmp} | sed 's/eddy_//'`
prefix="${outdir}/eddyOutput_${variant}" prefix="${outdir}/eddyOutput_${variant}"
outputs="${outputs} ${prefix}" outputs="${outputs} ${prefix}"
......
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