/[escript]/trunk/scripts/finley_wrapper_template
ViewVC logotype

Diff of /trunk/scripts/finley_wrapper_template

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2362 by gross, Fri Apr 3 02:41:14 2009 UTC revision 2364 by gross, Fri Apr 3 08:06:30 2009 UTC
# Line 298  else Line 298  else
298          if [ -f $ESCRIPT_ROOT/lib/pyversion ]          if [ -f $ESCRIPT_ROOT/lib/pyversion ]
299          then          then
300             compversion=`cat $ESCRIPT_ROOT/lib/pyversion`             compversion=`cat $ESCRIPT_ROOT/lib/pyversion`
301             intversion=`$PYTHON_CMD --version 2>&1`             intversion=`$PYTHON_CMD -V 2>&1`
302             if [ "$compversion" != "$intversion" ]             if [ "$compversion" != "$intversion" ]
303             then             then
304                echo "Python versions do not match. Escript was compiled for "$compversion"."                echo "Python versions do not match. Escript was compiled for "$compversion"."
# Line 342  elif [ $MPI_FLAVOUR == "INTELMPI" ] Line 342  elif [ $MPI_FLAVOUR == "INTELMPI" ]
342  then  then
343     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
344     then     then
345        mpdboot -n $ESCRIPT_NUM_PROCS -r ssh -f $HOSTFILE        mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f $HOSTFILE
346        if [ $? -ne 0 ]        if [ $? -ne 0 ]
347        then        then
348           echo "mpdboot with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_PROCS nodes failed."           echo "mpdboot with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes failed."
349           exit 1           exit 1
350        else        else
351            if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdboot was started with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_PROCS nodes."; fi            if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdboot was started with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes."; fi
352        fi        fi
353     fi     fi
354     CMD="mpiexec -n $ESCRIPT_NUM_PROCS -perhost $ESCRIPT_NUM_PROCS -envall -$EXEC_CMD"     CMD="mpiexec -perhost $ESCRIPT_NUM_PROCS -envall -n $TOTPROC $EXEC_CMD"
355     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi
356     $CMD     $CMD
357     EXIT_CODE=$?     EXIT_CODE=$?

Legend:
Removed from v.2362  
changed lines
  Added in v.2364

  ViewVC Help
Powered by ViewVC 1.1.26