From b05c75a68e7d733863d0a7a7d35a8eed594d16c8 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Thu, 17 Mar 2022 17:15:37 +0000
Subject: [PATCH] BF: Keep track of which jobs were submitted, so we know what
outputs to expect
---
eddy/feedsRun.EddyLSRTest | 2 +-
eddy/feedsRun.EddyMBSTest | 2 +-
eddy/feedsRun.EddyS2VTest | 2 +-
eddy/feedsRun.EddyTest | 2 +-
eddy/runEddy | 7 +++++--
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/eddy/feedsRun.EddyLSRTest b/eddy/feedsRun.EddyLSRTest
index fd8212f..2006a70 100755
--- a/eddy/feedsRun.EddyLSRTest
+++ b/eddy/feedsRun.EddyLSRTest
@@ -49,7 +49,7 @@ eddy_args="--imain=${indir}/EddyLSRTestData/eddyData/testData
--dont_peas --very_verbose"
# run eddy
-${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} > ${odir}/EddyLSRTest.runEddy.o$$
+${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} | tee ${odir}/EddyLSRTest.runEddy.o$$
output_prefixes=$(tail -n1 ${odir}/EddyLSRTest.runEddy.o$$)
diff --git a/eddy/feedsRun.EddyMBSTest b/eddy/feedsRun.EddyMBSTest
index 488fdf8..bae58d6 100755
--- a/eddy/feedsRun.EddyMBSTest
+++ b/eddy/feedsRun.EddyMBSTest
@@ -55,7 +55,7 @@ eddy_args="--imain=${indir}/EddyMBSTestData/eddyData/testData
--mbs_niter=20 --mbs_lambda=10 --mbs_ksp=10 --very_verbose"
# run eddy
-${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} > ${odir}/EddyMBSTest.runEddy.o$$
+${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} | tee ${odir}/EddyMBSTest.runEddy.o$$
output_prefixes=$(tail -n1 ${odir}/EddyMBSTest.runEddy.o$$)
# Define some constants
diff --git a/eddy/feedsRun.EddyS2VTest b/eddy/feedsRun.EddyS2VTest
index 6d79f0d..9c4bf80 100755
--- a/eddy/feedsRun.EddyS2VTest
+++ b/eddy/feedsRun.EddyS2VTest
@@ -53,7 +53,7 @@ eddy_args="--imain=${indir}/EddyS2VTestData/eddyData/testData
--slspec=${indir}/EddyS2VTestData/eddyData/testSlspec "
# run eddy
-${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} > ${odir}/EddyS2VTest.runEddy.o$$
+${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} | tee ${odir}/EddyS2VTest.runEddy.o$$
output_prefixes=$(tail -n1 ${odir}/EddyS2VTest.runEddy.o$$)
# Define some constants
diff --git a/eddy/feedsRun.EddyTest b/eddy/feedsRun.EddyTest
index 6edd25f..ac0d677 100755
--- a/eddy/feedsRun.EddyTest
+++ b/eddy/feedsRun.EddyTest
@@ -46,7 +46,7 @@ eddy_args="--imain=${indir}/EddyTestData/eddyData/testData
--repol --fwhm=10,0,0,0,0 --dfields -v"
# run eddy
-${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} > ${odir}/EddyTest.runEddy.o$$
+${thisdir}/runEddy ${exedir} ${odir} ${eddy_args} | tee ${odir}/EddyTest.runEddy.o$$
output_prefixes=$(tail -n1 ${odir}/EddyTest.runEddy.o$$)
# Define some constants
diff --git a/eddy/runEddy b/eddy/runEddy
index 24df8ae..6ec20d5 100755
--- a/eddy/runEddy
+++ b/eddy/runEddy
@@ -56,6 +56,7 @@ fi
# can qalter the openmp jobs below
cuda_jids=""
cpu_jids=""
+submitted=""
for exe in ${cuda_exes} ${cpu_exes};
do
variant=`basename ${exe}`
@@ -77,6 +78,8 @@ do
continue
fi
+ submitted="${submitted} ${exe}"
+
if [[ "${exe}" == *"cuda"* ]]; then
cuda_jids="${cuda_jids} ${jid}"
else
@@ -84,7 +87,7 @@ do
fi
done
-if [ "${cuda_jids}" == "" ] && [ "${cpu_jids}" == "" ]; then
+if [ "${submitted}" == "" ]; then
echo "Unable to submit any eddy executables!"
exit 1
fi
@@ -123,7 +126,7 @@ fi
# and check that the main output file
# was created
outputs=""
-for exe in ${cuda_exes} ${cpu_exes};
+for exe in ${submitted};
do
tmp=`basename ${exe}`
variant=`echo ${tmp} | sed 's/eddy_//'`
--
GitLab