From 0ea71f1662098e1a34678f6e66295a648bb15696 Mon Sep 17 00:00:00 2001
From: Paul McCarthy <pauldmccarthy@gmail.com>
Date: Fri, 30 Aug 2024 13:16:05 +0100
Subject: [PATCH] Allow mmorf executable to be specified by an environment
variable
---
mmorf/feedsRun | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/mmorf/feedsRun b/mmorf/feedsRun
index 6f47121..1bb2de5 100755
--- a/mmorf/feedsRun
+++ b/mmorf/feedsRun
@@ -14,10 +14,14 @@ MMORF_CONFIG=${outdir}/mmorf_config.ini
cat mov_to_ref_mm.ini | \
sed "s%##MMORF_INPUT_DIR##%${indir}%g" | \
sed "s%##MMORF_OUTPUT_DIR##%${outdir}%g" > \
- ${MMORF_CONFIG}
+ ${MMORF_CONFIG}
+
+if [ "${MMORF_EXE}" == "" ]; then
+ MMORF_EXE=$(which mmorf)
+fi
echo "-----------"
-echo "MMORF Test: $(which mmorf)"
+echo "MMORF Test: ${MMORF_EXE}"
echo "-----------"
echo ""
@@ -32,7 +36,7 @@ echo ""
# cluster. This will just run normally if running
# locally (but fsl_sub will still return a job id
# that can be used in the subsequent hold call).
-job_id=$(fsl_sub --coprocessor=cuda --logdir=${outdir} mmorf --version --config ${MMORF_CONFIG})
+job_id=$(fsl_sub --coprocessor=cuda --logdir=${outdir} ${MMORF_EXE} --version --config ${MMORF_CONFIG})
touch ${outdir}/wait
fsl_sub --jobhold ${job_id} rm ${outdir}/wait
while [ -e ${outdir}/wait ]; do
--
GitLab