/[escript]/branches/4.0fordebian/run-escript.in
ViewVC logotype

Diff of /branches/4.0fordebian/run-escript.in

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

trunk/bin/escript revision 2866 by gross, Fri Jan 22 05:38:56 2010 UTC trunk/bin/run-escript revision 2923 by jfenwick, Thu Feb 4 04:05:36 2010 UTC
# Line 131  do Line 131  do
131        "c")  cat $ESCRIPT_ROOT/lib/buildvars        "c")  cat $ESCRIPT_ROOT/lib/buildvars
132          exit 0          exit 0
133          ;;          ;;
134        "V")  echo "escript-pre4.0(build "`grep svn_revision $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`")"        "V")  echo "escript-development(build "`grep svn_revision $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`")"
135          exit 0          exit 0
136          ;;          ;;
137        "h")  echo "$HELPTEXT"        "h")  echo "$HELPTEXT"
# Line 315  then Line 315  then
315      exit 1      exit 1
316    fi    fi
317  fi  fi
318    if [ -z $@ ]
319    then
320       if [ ! -z $DOBINARY ]
321       then
322           echo "Program must be given."
323           exit 1
324       else
325          DOINTERACTIVE="yes"
326       fi
327    fi
328    
329  #=========================================================================================================  #=========================================================================================================
330  if [ ! -z $DOBINARY ]  if [ ! -z $DOBINARY ]
# Line 373  then Line 383  then
383     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
384     then     then
385        HOST_LIST=`awk 'BEGIN{S=""}{if (S == "") { S = $0 } else {S = S "," $0}}END{print S}' $HOSTFILE`        HOST_LIST=`awk 'BEGIN{S=""}{if (S == "") { S = $0 } else {S = S "," $0}}END{print S}' $HOSTFILE`
386        CMD="mpirun -x ${EXPORT_ENV//,/ -x } --bynode -np $TOTPROC --host $HOST_LIST $EXEC_CMD"        CMD="mpirun --gmca mpi_warn_on_fork 0 -x ${EXPORT_ENV//,/ -x } --bynode -np $TOTPROC --host $HOST_LIST $EXEC_CMD"
387     else     else
388        CMD="mpirun -x ${EXPORT_ENV//,/ -x } -np $TOTPROC $EXEC_CMD"        CMD="mpirun --gmca mpi_warn_on_fork 0 -x ${EXPORT_ENV//,/ -x } -np $TOTPROC $EXEC_CMD"
389     fi     fi
390     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi
391     $CMD     $CMD

Legend:
Removed from v.2866  
changed lines
  Added in v.2923

  ViewVC Help
Powered by ViewVC 1.1.26