Skip to content
Snippets Groups Projects
Commit 66b7e065 authored by Moises Fernandez's avatar Moises Fernandez
Browse files

Change the path of CUDA executables from FSLDIR to FSLDEVDIR

parent 743f8d52
No related branches found
No related tags found
No related merge requests found
...@@ -216,7 +216,7 @@ do ...@@ -216,7 +216,7 @@ do
else else
gopts=$opts gopts=$opts
fi fi
echo "${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 > $subjdir.bedpostX/logs/log$partzp && echo Done" >> ${subjdir}.bedpostX/commands.txt echo "${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 > $subjdir.bedpostX/logs/log$partzp && echo Done" >> ${subjdir}.bedpostX/commands.txt
part=$(($part + 1)) part=$(($part + 1))
done done
...@@ -225,7 +225,7 @@ bedpostid=`${FSLDIR}/bin/fsl_sub -q $queue -l ${subjdir}.bedpostX/logs -M $mailt ...@@ -225,7 +225,7 @@ bedpostid=`${FSLDIR}/bin/fsl_sub -q $queue -l ${subjdir}.bedpostX/logs -M $mailt
echo Queuing post processing stage echo Queuing post processing stage
nvox=`${FSLDIR}/bin/fslstats $subjdir.bedpostX/nodif_brain_mask -V | cut -d ' ' -f1 ` nvox=`${FSLDIR}/bin/fslstats $subjdir.bedpostX/nodif_brain_mask -V | cut -d ' ' -f1 `
mergeid=`${FSLDIR}/bin/fsl_sub -q $queue -j $bedpostid -m as -N bpx_postproc -l ${subjdir}.bedpostX/logs ${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}` mergeid=`${FSLDIR}/bin/fsl_sub -q $queue -j $bedpostid -m as -N bpx_postproc -l ${subjdir}.bedpostX/logs ${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}`
[ "x$SGE_ROOT" = "x" ] && kill -USR1 $monitorpid [ "x$SGE_ROOT" = "x" ] && kill -USR1 $monitorpid
if [ "x$SGE_ROOT" != "x" ]; then if [ "x$SGE_ROOT" != "x" ]; then
......
...@@ -156,7 +156,7 @@ while [ $part -lt $njobs ];do ...@@ -156,7 +156,7 @@ while [ $part -lt $njobs ];do
gopts=$opts gopts=$opts
fi fi
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) 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)
array=(`echo $string | tr "<" ' '`) array=(`echo $string | tr "<" ' '`)
aux=${array[1]} aux=${array[1]}
array=(`echo $aux | tr ">" ' '`) array=(`echo $aux | tr ">" ' '`)
...@@ -174,7 +174,7 @@ while [ $part -lt $njobs ];do ...@@ -174,7 +174,7 @@ while [ $part -lt $njobs ];do
done done
nvox=`${FSLDIR}/bin/fslstats $subjdir.bedpostX/nodif_brain_mask -V | cut -d ' ' -f1 ` nvox=`${FSLDIR}/bin/fslstats $subjdir.bedpostX/nodif_brain_mask -V | cut -d ' ' -f1 `
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=$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
......
...@@ -13,7 +13,7 @@ do ...@@ -13,7 +13,7 @@ do
fi fi
done done
${FSLDIR}/bin/merge_parts_gpu $@ ${FSLDEVDIR}/bin/merge_parts_gpu $@
fib=1 fib=1
while [ $fib -le $numfib ] while [ $fib -le $numfib ]
......
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