From c2da65540b9054332378e99559999a6fae1950b3 Mon Sep 17 00:00:00 2001
From: Moises Fernandez <moisesf@fmrib.ox.ac.uk>
Date: Tue, 9 Jul 2013 11:06:37 +0000
Subject: [PATCH] Change FSLDEVDIR path with FSLDIR
---
CUDA/bedpostx_multigpu_LSF | 6 +++---
CUDA/bedpostx_postproc_gpu.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/CUDA/bedpostx_multigpu_LSF b/CUDA/bedpostx_multigpu_LSF
index d47f2c9..0d6c66b 100755
--- a/CUDA/bedpostx_multigpu_LSF
+++ b/CUDA/bedpostx_multigpu_LSF
@@ -4,7 +4,7 @@
#
# SHCOPYRIGHT
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${FSLDEVDIR}/lib:${CUDA}/lib64
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${FSLDIR}/lib:${CUDA}/lib64
export DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH
Usage() {
@@ -156,7 +156,7 @@ while [ $part -lt $njobs ];do
gopts=$opts
fi
- string=$(bsub -o ${subjdir}.bedpostX/logs/log$partzp -e ${subjdir}.bedpostX/logs/error$partzp -W 2:00 -n 1 ${FSLDEVDIR}/bin/xfibres_gpu --data=${subjdir}/data --mask=$subjdir.bedpostX/nodif_brain_mask -b ${subjdir}.bedpostX/bvals -r ${subjdir}.bedpostX/bvecs --forcedir --logdir=$subjdir.bedpostX/diff_parts/data_part_$partzp $gopts ${subjdir} $part $njobs)
+ string=$(bsub -o ${subjdir}.bedpostX/logs/log$partzp -e ${subjdir}.bedpostX/logs/error$partzp -W 2:00 -n 1 ${FSLDIR}/bin/xfibres_gpu --data=${subjdir}/data --mask=$subjdir.bedpostX/nodif_brain_mask -b ${subjdir}.bedpostX/bvals -r ${subjdir}.bedpostX/bvecs --forcedir --logdir=$subjdir.bedpostX/diff_parts/data_part_$partzp $gopts ${subjdir} $part $njobs)
array=(`echo $string | tr "<" ' '`)
aux=${array[1]}
array=(`echo $aux | tr ">" ' '`)
@@ -174,7 +174,7 @@ while [ $part -lt $njobs ];do
done
nvox=`${FSLDIR}/bin/fslstats $subjdir.bedpostX/nodif_brain_mask -V | cut -d ' ' -f1 `
-post_string=$post_string" ${FSLDEVDIR}/bin/bedpostx_postproc_gpu.sh --data=${subjdir}/data --mask=$subjdir.bedpostX/nodif_brain_mask -b ${subjdir}.bedpostX/bvals -r ${subjdir}.bedpostX/bvecs --forcedir --logdir=$subjdir.bedpostX/diff_parts $gopts $nvox $njobs ${subjdir}"
+post_string=$post_string" ${FSLDIR}/bin/bedpostx_postproc_gpu.sh --data=${subjdir}/data --mask=$subjdir.bedpostX/nodif_brain_mask -b ${subjdir}.bedpostX/bvals -r ${subjdir}.bedpostX/bvecs --forcedir --logdir=$subjdir.bedpostX/diff_parts $gopts $nvox $njobs ${subjdir}"
$post_string
diff --git a/CUDA/bedpostx_postproc_gpu.sh b/CUDA/bedpostx_postproc_gpu.sh
index fd76ac0..5a77d79 100644
--- a/CUDA/bedpostx_postproc_gpu.sh
+++ b/CUDA/bedpostx_postproc_gpu.sh
@@ -13,7 +13,7 @@ do
fi
done
-${FSLDEVDIR}/bin/merge_parts_gpu $@
+${FSLDIR}/bin/merge_parts_gpu $@
fib=1
while [ $fib -le $numfib ]
--
GitLab