/[escript]/branches/py3_attempt2/bin/run-escript
ViewVC logotype

Diff of /branches/py3_attempt2/bin/run-escript

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

trunk/bin/escript revision 2462 by jfenwick, Fri Jun 5 06:04:01 2009 UTC trunk/bin/run-escript revision 3096 by caltinay, Thu Aug 19 01:40:52 2010 UTC
# Line 6  Line 6 
6  #Extra paths can be configured about a page further down  #Extra paths can be configured about a page further down
7  #Search for EXTRA_PATH=""  #Search for EXTRA_PATH=""
8    
9  #set to 1 if performing this is a standalone build and /packages contains the relevant tools  #set to 1 if performing this is a standalone build and ../../pkg contains the relevant tools
10  STANDALONE=0  STANDALONE=0
11    
12  #set to 1 if this is part of a packaged build (.deb) and files will be installed in standard locations  #set to 1 if this is part of a packaged build (.deb) and files will be installed in standard locations
# Line 22  CURDIR=`pwd` Line 22  CURDIR=`pwd`
22  #Environment vars which control operations:  #Environment vars which control operations:
23  # ESCRIPT_NUM_NODES, ESCRIPT_NUM_PROCS, ESCRIPT_NUM_THREADS, ESCRIPT_HOSTFILE, ESCRIPT_CREATESTDFILES  # ESCRIPT_NUM_NODES, ESCRIPT_NUM_PROCS, ESCRIPT_NUM_THREADS, ESCRIPT_HOSTFILE, ESCRIPT_CREATESTDFILES
24    
25  HOSTFILE=/tmp/escript.$$  HOSTFILE=/tmp/escript.$USER.$$
26  HOSTFILE2=/tmp/escript2.$$  HOSTFILE2=/tmp/escript2.$USER.$$
27    
28  #Begin finding ESCRIPT_ROOT  #Begin finding ESCRIPT_ROOT
29  if [ $STDLOCATION != 0 ]  if [ $STDLOCATION -ne 0 ]
30  then  then
31      ESCRIPT_ROOT=/usr/lib/escript      ESCRIPT_ROOT=/usr/lib/escript
32  else  else
# Line 41  else Line 41  else
41    else    else
42        # name does not contain / therefore we are using        # name does not contain / therefore we are using
43        tscriptdir=`which $0`        tscriptdir=`which $0`
44        if [ $? != 0 ]        if [ $? -ne 0 ]
45        then        then
46            echo "Error unable to determine script directory. Exiting."            echo "Error! Unable to determine script directory. Exiting."
47        exit 1            exit 1
48        fi        fi
49        scriptdir=`dirname $tscriptdir`        scriptdir=`dirname $tscriptdir`
50    fi    fi
# Line 58  else Line 58  else
58  fi  fi
59  ##### End finding ESCRIPT_ROOT  ########  ##### End finding ESCRIPT_ROOT  ########
60    
61    if [ ! -r $ESCRIPT_ROOT/lib/buildvars ]; then
62        echo "Error! Unable to read escript build information. Exiting."
63        exit 1
64    fi
65    
66  PYTHON_MPI_NULL="$ESCRIPT_ROOT/lib/pythonMPI"  PYTHON_MPI_NULL="$ESCRIPT_ROOT/lib/pythonMPI"
67  PYTHON_MPI_REDIRECT="$ESCRIPT_ROOT/lib/pythonMPIredirect"  PYTHON_MPI_REDIRECT="$ESCRIPT_ROOT/lib/pythonMPIredirect"
68  PYTHON_CMD=python  PYTHON_CMD=python
# Line 70  EXTRA_PATH=$ESCRIPT_ROOT/bin Line 75  EXTRA_PATH=$ESCRIPT_ROOT/bin
75  EXTRA_PYTHONPATH=$ESCRIPT_ROOT  EXTRA_PYTHONPATH=$ESCRIPT_ROOT
76  EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib  EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib
77    
78  if [ $STANDALONE == 1 ]  if [ $STANDALONE -eq 1 ]
79  then  then
80      EXTRA_PATH=$ESCRIPT_PARENT/packages/python/bin:$EXTRA_PATH      EXTRA_PATH=$ESCRIPT_PARENT/pkg/python/bin:$EXTRA_PATH
81      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/packages/boost/lib:$ESCRIPT_PARENT/packages/netcdf/lib/:$EXTRA_LD_LIBRARY_PATH      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/pkg/boost/lib:$ESCRIPT_PARENT/pkg/netcdf/lib/:$EXTRA_LD_LIBRARY_PATH
82      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/packages/vtk/lib/vtk-5.2:$ESCRIPT_PARENT/packages/mesa/lib:$EXTRA_LD_LIBRARY_PATH      EXTRA_LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH
83      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/packages/python/lib:$EXTRA_LD_LIBRARY_PATH      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/pkg/python/lib:$EXTRA_LD_LIBRARY_PATH
84      EXTRA_PYTHONPATH=$ESCRIPT_PARENT/packages/numpy/lib/python2.6/site-packages:$ESCRIPT_PARENT/packages/vtk/lib/python2.6/site-packages:$EXTRA_PYTHONPATH      EXTRA_PYTHONPATH=$ESCRIPT_PARENT/pkg/numpy/lib/python2.6/site-packages:$ESCRIPT_PARENT/pkg/matplotlib/lib/python2.6/site-packages:$EXTRA_PYTHONPATH
85  fi  fi
86    
87    #
88    #   Add VisIt paths if required
89    #
90    WITH_VISIT=`grep usevisit $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`
91    if [ "$WITH_VISIT" = "y" ]; then
92        VISIT_BIN=`which visit`
93        if [ $? -eq 0 ]; then
94            VISIT_PY_PATH=`$VISIT_BIN -env | grep LIBPATH | cut -d= -f2`
95            EXTRA_PYTHONPATH=$EXTRA_PYTHONPATH:$VISIT_PY_PATH
96            EXTRA_LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:$VISIT_PY_PATH
97        elif [ ! -z $ESCRIPT_VERBOSE ]; then
98            echo "VisIt module enabled but VisIt not in path!"
99        fi
100    fi
101    
102  HELP_TEXT="  HELP_TEXT="
103  Usage: escript [options] script.py [arguments...]  Usage: escript [options] script.py [arguments...]
# Line 126  do Line 144  do
144        "c")  cat $ESCRIPT_ROOT/lib/buildvars        "c")  cat $ESCRIPT_ROOT/lib/buildvars
145          exit 0          exit 0
146          ;;          ;;
147        "V")  echo "escript-pre2.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`")"
148          exit 0          exit 0
149          ;;          ;;
150        "h")  echo "$HELPTEXT"        "h")  echo "$HELPTEXT"
# Line 137  do Line 155  do
155        "e")  echo "export LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:\$LD_LIBRARY_PATH"        "e")  echo "export LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:\$LD_LIBRARY_PATH"
156          echo "export PYTHONPATH=$EXTRA_PYTHONPATH:\$PYTHONPATH"          echo "export PYTHONPATH=$EXTRA_PYTHONPATH:\$PYTHONPATH"
157          echo "export PATH=$EXTRA_PATH:\$PATH"          echo "export PATH=$EXTRA_PATH:\$PATH"
158          if [ `uname` == Darwin ]          if [ "`uname`" = "Darwin" ]
159          then          then
160              echo "export DYLD_LIBRARY_PATH=$EXTRA_DYLD_LIBRARY_PATH:$EXTRA_LD_LIBRARY_PATH:\$DYLD_LIBRARY_PATH"              echo "export DYLD_LIBRARY_PATH=$EXTRA_DYLD_LIBRARY_PATH:$EXTRA_LD_LIBRARY_PATH:\$DYLD_LIBRARY_PATH"
161          fi          fi
# Line 163  shift `expr $OPTIND - 1` Line 181  shift `expr $OPTIND - 1`
181  MPI_FLAVOUR=`grep mpi_flavour $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`  MPI_FLAVOUR=`grep mpi_flavour $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`
182  WITH_OPENMP=`grep useopenmp $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`  WITH_OPENMP=`grep useopenmp $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`
183    
184  if [ ! -z $ESCRIPT_VERBOSE  ]; then echo "MPI flavor is $MPI_FLAVOUR."; fi  if [ ! -z $ESCRIPT_VERBOSE ]; then
185  if [ ! -z $ESCRIPT_VERBOSE ] && [  $WITH_OPENMP == "y"  ]; then echo "OpenMP enabled."; fi      echo "MPI flavour is $MPI_FLAVOUR."
186        if [ "$WITH_OPENMP" = "y" ]; then echo "OpenMP enabled."; fi
187    fi
188    
189  #  #
190  #  extend path variables  #  extend path variables
191  #  #
# Line 172  export PATH=$EXTRA_PATH:$PATH Line 193  export PATH=$EXTRA_PATH:$PATH
193  export LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:$LD_LIBRARY_PATH  export LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:$LD_LIBRARY_PATH
194  export PYTHONPATH=$EXTRA_PYTHONPATH:$PYTHONPATH  export PYTHONPATH=$EXTRA_PYTHONPATH:$PYTHONPATH
195  EXPORT_ENV="PATH,LD_LIBRARY_PATH,PYTHONPATH"  EXPORT_ENV="PATH,LD_LIBRARY_PATH,PYTHONPATH"
196  if [ `uname` == Darwin ]  if [ "`uname`" = "Darwin" ]
197  then  then
198      export DYLD_LIBRARY_PATH=$EXTRA_DYLD_LIBRARY_PATH:$EXTRA_LD_LIBRARY_PATH:$DYLD_LIBRARY_PATH      export DYLD_LIBRARY_PATH=$EXTRA_DYLD_LIBRARY_PATH:$EXTRA_LD_LIBRARY_PATH:$DYLD_LIBRARY_PATH
199      EXPORT_ENV="$EXPORT_ENV,DYLD_LIBRARY_PATH"      EXPORT_ENV="$EXPORT_ENV,DYLD_LIBRARY_PATH"
200  fi  fi
201  if [ ! -z $ESCRIPT_VERBOSE  ]  if [ ! -z $ESCRIPT_VERBOSE ]
202  then  then
203      echo "PATH = $PATH "      echo "PATH = $PATH "
204      echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH "      echo "LD_LIBRARY_PATH = $LD_LIBRARY_PATH "
# Line 188  fi Line 209  fi
209  #  #
210  #  Ensure the variables have sensible values  #  Ensure the variables have sensible values
211  #  #
212  if [ $MPI_FLAVOUR  == "none" ]  if [ "$MPI_FLAVOUR" = "none" ]
213  then  then
214      if [ ! -z $ESCRIPT_NUM_NODES ]      if [ ! -z $ESCRIPT_NUM_NODES ]
215      then      then
# Line 205  then Line 226  then
226      ESCRIPT_NUM_NODES=1      ESCRIPT_NUM_NODES=1
227      ESCRIPT_NUM_PROCS=1      ESCRIPT_NUM_PROCS=1
228  else  else
229        # use the PBS_NODEFILE if not otherwise specified
230        if [[ ( ! -z $PBS_NODEFILE ) && ( -z $ESCRIPT_HOSTFILE ) ]]
231        then
232        ESCRIPT_HOSTFILE=$PBS_NODEFILE
233    
234        fi
235    
236      if [ ! -z $ESCRIPT_HOSTFILE ]      if [ ! -z $ESCRIPT_HOSTFILE ]
237      then      then
238          if [ -f $ESCRIPT_HOSTFILE ]          if [ -f $ESCRIPT_HOSTFILE ]
# Line 239  else Line 267  else
267        ESCRIPT_NUM_PROCS=1        ESCRIPT_NUM_PROCS=1
268      fi      fi
269    
270      if [ ! -z $ESCRIPT_VERBOSE  ]      if [ ! -z $ESCRIPT_VERBOSE ]
271      then      then
272            echo "ESCRIPT_NUM_NODES = $ESCRIPT_NUM_NODES "            echo "ESCRIPT_NUM_NODES = $ESCRIPT_NUM_NODES "
273            echo "ESCRIPT_NUM_PROCS = $ESCRIPT_NUM_PROCS "            echo "ESCRIPT_NUM_PROCS = $ESCRIPT_NUM_PROCS "
274      fi      fi
275  fi  fi
276    
277  if [  $WITH_OPENMP == "y"  ]  if [ "$WITH_OPENMP" = "y" ]
278  then  then
279     if [ -z $ESCRIPT_NUM_THREADS ]     if [ -z $ESCRIPT_NUM_THREADS ]
280     then     then
# Line 288  fi Line 316  fi
316    
317  if [ $TOTPROC -gt 1 ]  if [ $TOTPROC -gt 1 ]
318  then  then
319     if [ "$ESCRIPT_CREATESTDFILES" == "yes" ]     if [ "$ESCRIPT_CREATESTDFILES" = "yes" ]
320     then     then
321         PYTHON_MPI=$PYTHON_MPI_REDIRECT         PYTHON_MPI=$PYTHON_MPI_REDIRECT
322     else     else
# Line 307  then Line 335  then
335      exit 1      exit 1
336    fi    fi
337  fi  fi
338    if [ -z "$@" ]
339    then
340       if [ ! -z $DOBINARY ]
341       then
342           echo "Program must be given."
343           exit 1
344       else
345          DOINTERACTIVE="yes"
346       fi
347    fi
348    
349  #=========================================================================================================  #=========================================================================================================
350  if [ ! -z $DOBINARY ]  if [ ! -z $DOBINARY ]
351  then  then
352      EXEC_CMD="$@"      EXEC_CMD="$@"
353  else  else
354      if [ $MPI_FLAVOUR  == "none" ]      if [ "$MPI_FLAVOUR" = "none" ]
355      then      then
356          # Check to see if the python version we were compiled with matches the one of EXEC_CMD          # Check to see if the python version we were compiled with matches the one of EXEC_CMD
357          # We should only do this check if they are running a python script          # We should only do this check if they are running a python script
# Line 335  else Line 373  else
373             EXEC_CMD="$PYTHON_CMD $@"             EXEC_CMD="$PYTHON_CMD $@"
374          fi          fi
375      else      else
376          EXEC_CMD="$PYTHON_MPI $@"      if [ ! -z $DOINTERACTIVE ]
377            then
378               EXEC_CMD="$PYTHON_MPI -i $@"
379            else
380               EXEC_CMD="$PYTHON_MPI $@"
381            fi
382      fi      fi
383  fi  fi
384  if [ ! -z $ESCRIPT_VERBOSE ]; then echo "Command to be executed is \"$EXEC_CMD\"."; fi  if [ ! -z $ESCRIPT_VERBOSE ]; then echo "Command to be executed is \"$EXEC_CMD\"."; fi
# Line 343  if [ ! -z $ESCRIPT_VERBOSE ]; then echo Line 386  if [ ! -z $ESCRIPT_VERBOSE ]; then echo
386  #  #
387  #   now we start to spwan things:  #   now we start to spwan things:
388  #  #
389  if [  $WITH_OPENMP == "y"  ]  if [ "$WITH_OPENMP" = "y" ]
390  then  then
391     export OMP_NUM_THREADS=$ESCRIPT_NUM_THREADS     export OMP_NUM_THREADS=$ESCRIPT_NUM_THREADS
392     EXPORT_ENV="$EXPORT_ENV,OMP_NUM_THREADS"     EXPORT_ENV="$EXPORT_ENV,OMP_NUM_THREADS"
393  fi  fi
394  EXIT_CODE=1  EXIT_CODE=1
395  #=============== no MPI ===================================  #=============== no MPI ===================================
396  if [ $MPI_FLAVOUR  == "none" ]  if [ "$MPI_FLAVOUR" = "none" ]
397  then  then
398     $EXEC_CMD     $EXEC_CMD
399     EXIT_CODE=$?     EXIT_CODE=$?
400  #=============== OpenMPI ===================================  #=============== OpenMPI ===================================
401  elif [ $MPI_FLAVOUR == "OPENMPI" ]  elif [ "$MPI_FLAVOUR" = "OPENMPI" ]
402  then  then
403     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
404     then     then
405        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`
406        CMD="mpirun  --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"
407     else     else
408        CMD="mpirun -np $TOTPROC $EXEC_CMD"        CMD="mpirun --gmca mpi_warn_on_fork 0 -x ${EXPORT_ENV//,/ -x } -np $TOTPROC $EXEC_CMD"
409     fi     fi
410     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi
411     $CMD     $CMD
412     EXIT_CODE=$?     EXIT_CODE=$?
413    
414  #=============== Intel MPI ===================================  #=============== Intel MPI ===================================
415  elif [ $MPI_FLAVOUR == "INTELMPI" ]  elif [ "$MPI_FLAVOUR" = "INTELMPI" ]
416  then  then
417    
418       if [ "$WITH_OPENMP" = "y" ]
419       then
420           export I_MPI_PIN_DOMAIN=omp
421           EXPORT_ENV="$EXPORT_ENV, I_MPI_PIN_DOMAIN"
422       fi
423    
424     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
425     then     then
426        mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f $HOSTFILE        mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f $HOSTFILE
# Line 381  then Line 431  then
431        else        else
432            if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdboot was started with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes."; fi            if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdboot was started with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes."; fi
433        fi        fi
434       else
435          mpdboot -n 1 -r ssh
436          if [ $? -ne 0 ]
437          then
438             echo "mpdboot failed."
439             exit 1
440          else
441              if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdboot was started."; fi
442          fi
443     fi     fi
444     CMD="mpiexec -perhost $ESCRIPT_NUM_PROCS -envall -n $TOTPROC $EXEC_CMD"     CMD="mpiexec -perhost $ESCRIPT_NUM_PROCS -envall -n $TOTPROC $EXEC_CMD"
445     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi
446     $CMD     $CMD
447     EXIT_CODE=$?     EXIT_CODE=$?
448     if [ ! -z $HOSTFILE ]     mpdallexit
449     then     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdallexit executed."; fi
        mpdallexit  
        if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdallexit executed."; fi  
    fi  
450  #=============== SGI's MPIMPT ===================================  #=============== SGI's MPIMPT ===================================
451  elif [ $MPI_FLAVOUR == "MPT" ]  elif [ "$MPI_FLAVOUR" = "MPT" ]
452  then  then
453     export MPI_NUM_MEMORY_REGIONS=0     export MPI_NUM_MEMORY_REGIONS=0
454     EXPORT_ENV="$EXPORT_ENV,MPI_NUM_MEMORY_REGIONS"     EXPORT_ENV="$EXPORT_ENV,MPI_NUM_MEMORY_REGIONS"
455     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
456     then     then
457        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`
458        CMD="mpirun $HOST_LIST $ESCRIPT_NUM_PROCS $EXEC_CMD"        CMD="mpirun $HOST_LIST -np $ESCRIPT_NUM_PROCS $EXEC_CMD"
459     else     else
460        CMD="mpirun -np $TOTPROC $EXEC_CMD"        CMD="mpirun -np $TOTPROC $EXEC_CMD"
461     fi     fi
# Line 407  then Line 463  then
463     $CMD     $CMD
464     EXIT_CODE=$?     EXIT_CODE=$?
465  #=============== MPICH ===================================  #=============== MPICH ===================================
466  elif [ $MPI_FLAVOUR == "MPICH" ]  elif [ "$MPI_FLAVOUR" = "MPICH" ]
467  then  then
468     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
469     then     then
# Line 421  then Line 477  then
477     $CMD     $CMD
478     EXIT_CODE=$?     EXIT_CODE=$?
479  #=============== MPICH2 ===================================  #=============== MPICH2 ===================================
480  elif [ $MPI_FLAVOUR == "MPICH2" ]  elif [ "$MPI_FLAVOUR" = "MPICH2" ]
481  then  then
482     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
483     then     then
# Line 433  then Line 489  then
489           else           else
490               if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdboot was started with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes."; fi               if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdboot was started with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes."; fi
491           fi           fi
492       else
493          mpdboot -n 1 -r ssh
494          if [ $? -ne 0 ]
495          then
496             echo "mpdboot failed."
497             exit 1
498          else
499              if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdboot was started."; fi
500          fi
501     fi     fi
502     CMD="mpiexec -genvlist $EXPORT_ENV -np $TOTPROC $EXEC_CMD"     CMD="mpiexec -genvlist $EXPORT_ENV -np $TOTPROC $EXEC_CMD"
503     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi
504     $CMD     $CMD
505     EXIT_CODE=$?     EXIT_CODE=$?
506     if [ ! -z $HOSTFILE ]     mpdallexit
507     then     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdallexit executed."; fi
        mpdallexit  
        if [ ! -z $ESCRIPT_VERBOSE ]; then echo "mpdallexit executed."; fi  
    fi  
508  else  else
509     echo "unknown MPI falvour $MPI_FLAVOUR."     echo "unknown MPI flavour '$MPI_FLAVOUR'."
510  fi  fi
511  exit $EXIT_CODE  exit $EXIT_CODE

Legend:
Removed from v.2462  
changed lines
  Added in v.3096

  ViewVC Help
Powered by ViewVC 1.1.26