/[escript]/trunk/run-escript.in
ViewVC logotype

Diff of /trunk/run-escript.in

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

trunk/bin/escript revision 2905 by gross, Tue Feb 2 04:26:42 2010 UTC trunk/bin/run-escript revision 4362 by caltinay, Tue Apr 16 04:37:13 2013 UTC
# 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 -ne 0 ]  if [ $STDLOCATION -ne 0 ]
30  then  then
31      ESCRIPT_ROOT=/usr/lib/escript      ESCRIPT_ROOT=/usr/lib/escript
32  else  else
33    #We don't know the escript root so we need to work it out from the invocation    # We don't know the escript root so we need to work it out from the invocation
34    #Need to match if the name contains /    # Need to match if the name contains /
35    if [[ $0 =~ / ]]    if [[ $0 =~ / ]]
36    then    then
37        # We are not using the PATH to find the script        # We are not using the PATH to find the script
38        cd `dirname $0`        cd "`dirname $0`"
39        scriptdir=`pwd`        scriptdir=`pwd`
40        cd $CURDIR        cd "$CURDIR"
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
# Line 49  else Line 49  else
49        scriptdir=`dirname $tscriptdir`        scriptdir=`dirname $tscriptdir`
50    fi    fi
51    
52    cd $scriptdir/..    cd "$scriptdir/.."
53    ESCRIPT_ROOT=`pwd`    ESCRIPT_ROOT=`pwd`
54    cd ..    cd ..
55    ESCRIPT_PARENT=`pwd`    ESCRIPT_PARENT=`pwd`
56    cd $CURDIR    cd "$CURDIR"
57    
58  fi  fi
59  ##### End finding ESCRIPT_ROOT  ########  ##### End finding ESCRIPT_ROOT ########
   
 if [ ! -r $ESCRIPT_ROOT/lib/buildvars ]; then  
     echo "Error! Unable to read escript build information. Exiting."  
     exit 1  
 fi  
60    
61  PYTHON_MPI_NULL="$ESCRIPT_ROOT/lib/pythonMPI"  PYTHON_MPI_NULL="$ESCRIPT_ROOT/lib/pythonMPI"
62  PYTHON_MPI_REDIRECT="$ESCRIPT_ROOT/lib/pythonMPIredirect"  PYTHON_MPI_REDIRECT="$ESCRIPT_ROOT/lib/pythonMPIredirect"
# Line 73  PYTHON_CMD=python Line 68  PYTHON_CMD=python
68  EXTRA_DYLD_LIBRARY_PATH=""  EXTRA_DYLD_LIBRARY_PATH=""
69  EXTRA_PATH=$ESCRIPT_ROOT/bin  EXTRA_PATH=$ESCRIPT_ROOT/bin
70  EXTRA_PYTHONPATH=$ESCRIPT_ROOT  EXTRA_PYTHONPATH=$ESCRIPT_ROOT
71  EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib  
72    if [ $STDLOCATION -eq 1 ]
73    then
74        EXTRA_LD_LIBRARY_PATH=/usr/lib/escript
75    else
76        EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib
77    fi
78    
79    
80  if [ $STANDALONE -eq 1 ]  if [ $STANDALONE -eq 1 ]
81  then  then
82      EXTRA_PATH=$ESCRIPT_PARENT/pkg/python/bin:$EXTRA_PATH      EXTRA_PATH=$ESCRIPT_PARENT/pkg/python/bin:$ESCRIPT_PARENT/pkg/scons/bin:$EXTRA_PATH
83      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/pkg/boost/lib:$ESCRIPT_PARENT/pkg/netcdf/lib/:$EXTRA_LD_LIBRARY_PATH      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/pkg/boost/lib:$ESCRIPT_PARENT/pkg/netcdf/lib/:$EXTRA_LD_LIBRARY_PATH
84      EXTRA_LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH      EXTRA_LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH
85      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/pkg/python/lib:$EXTRA_LD_LIBRARY_PATH      EXTRA_LD_LIBRARY_PATH=$ESCRIPT_PARENT/pkg/python/lib:$EXTRA_LD_LIBRARY_PATH
# Line 85  then Line 87  then
87  fi  fi
88    
89    
90    BUILDINFO_FILE="$ESCRIPT_ROOT/lib/buildvars"
91    if [ "$STDLOCATION" = "1" ]
92    then
93        BUILDINFO_FILE=/usr/lib/escript/buildvars
94    fi
95    if [ ! -r "$BUILDINFO_FILE" ]; then
96        if [ "$1" = "-e" ]; then
97            echo "export LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:\$LD_LIBRARY_PATH"
98            echo "export PYTHONPATH=$EXTRA_PYTHONPATH:\$PYTHONPATH"
99            echo "export PATH=$EXTRA_PATH:\$PATH"
100            if [ "`uname`" = "Darwin" ]
101            then
102                echo "export DYLD_LIBRARY_PATH=$EXTRA_DYLD_LIBRARY_PATH:$EXTRA_LD_LIBRARY_PATH:\$DYLD_LIBRARY_PATH"
103            fi  
104            exit 0
105        fi
106        echo "Error! Unable to read escript build information. Exiting."
107        exit 1
108    fi
109    
110    get_buildvar () {
111        echo `grep "^$1=" "$BUILDINFO_FILE" |cut -d= -f2`
112    }
113    
114    #
115    #   Add VisIt paths if required
116    #
117    WITH_VISIT=`get_buildvar visit`
118    if [ "$WITH_VISIT" = "1" ]; then
119        VISIT_BIN=`which visit 2>/dev/null`
120        if [ $? -eq 0 ]; then
121            VISIT_PY_PATH=`$VISIT_BIN -env | grep LIBPATH | cut -d= -f2`
122            EXTRA_PYTHONPATH=$EXTRA_PYTHONPATH:$VISIT_PY_PATH
123            EXTRA_LD_LIBRARY_PATH=$EXTRA_LD_LIBRARY_PATH:$VISIT_PY_PATH
124        elif [ ! -z $ESCRIPT_VERBOSE ]; then
125            echo "VisIt module enabled but VisIt not in path!"
126        fi
127    fi
128    
129  HELP_TEXT="  HELP_TEXT="
130  Usage: escript [options] script.py [arguments...]  Usage: run-escript [options] script.py [arguments...]
131      -n nn       number of nodes to use      -n nn       number of nodes to use
132      -p np       number of MPI processes to spawn      -p np       number of MPI processes to spawn per node
133      -t nt       number of OpenMP threads to use      -t nt       number of OpenMP threads to use
134      -f file     name of MPI hostfile      -f file     name of MPI hostfile
135      -c      print compile information for escript and exit      -c      print compile information for escript and exit
136      -V      print escript version and exit      -V      print escript version and exit
137      -i      interactive mode      -i      interactive mode
138      -b      do not invoke python (run non-python programs)      -b      do not invoke python (run non-python programs)
139      -e      print export statements for environment and exit      -e      print export statements for environment and exit
140      -o      redirect output from MPI to files      -o      redirect output from MPI to files
141      -v      print diagnostics      -v      print diagnostics
142      -x      ..reserved for future use ..      -x      run in new xterm instance
143      script.py   Your python script      script.py   Your python script
144      arguments...    The optional command-line arguments to your script      arguments...    The optional command-line arguments to your script
145  "  "
# Line 108  if [ "$1" = "--help" ]; then Line 148  if [ "$1" = "--help" ]; then
148    echo "$HELP_TEXT"    echo "$HELP_TEXT"
149    exit 0    exit 0
150  fi  fi
151  #=======================================================================================  #==============================================================================
   
 # Avoid bug in hybrid runs with MPT MPI  
   
152    
153  # Parse the command-line options  # Parse the command-line options
154  # option e should not be followed by a :  # option e should not be followed by a :
155  while getopts 'bn:p:t:f:h:ecVviox' option  while getopts 'bn:p:t:f:hecVviox' option
156  do  do
157      case "$option" in      case "$option" in
158        "b")  DOBINARY=yes        "b")  DO_BINARY=y
159          ;;          ;;
160        "n")  ESCRIPT_NUM_NODES=$OPTARG        "n")  ESCRIPT_NUM_NODES=$OPTARG
161          ;;          ;;
162        "p")  ESCRIPT_NUM_PROCS=$OPTARG        "p")  ESCRIPT_NUM_PROCS=$OPTARG
163          ;;          ;;
164        "t")  ESCRIPT_NUM_THREADS=$OPTARG        "t")  ESCRIPT_NUM_THREADS=$OPTARG
165          ;;          ;;
166        "f")  ESCRIPT_HOSTFILE=$OPTARG        "f")  ESCRIPT_HOSTFILE=$OPTARG
167          ;;          ;;
168        "c")  cat $ESCRIPT_ROOT/lib/buildvars        "c")  cat "$BUILDINFO_FILE"
169          exit 0          exit 0
170          ;;          ;;
171        "V")  echo "escript-development(build "`grep svn_revision $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`")"        "V")  echo "escript-development(build "`get_buildvar svn_revision`")"
172          exit 0          exit 0
173          ;;          ;;
174        "h")  echo "$HELPTEXT"        "h")  echo "$HELP_TEXT"
175          exit 0          exit 0
176          ;;          ;;
177        "i")  DOINTERACTIVE=yes        "i")  DO_INTERACTIVE=y
178          ;;          ;;
179        "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"
180          echo "export PYTHONPATH=$EXTRA_PYTHONPATH:\$PYTHONPATH"          echo "export PYTHONPATH=$EXTRA_PYTHONPATH:\$PYTHONPATH"
181          echo "export PATH=$EXTRA_PATH:\$PATH"          echo "export PATH=$EXTRA_PATH:\$PATH"
182          if [ "`uname`" = "Darwin" ]          if [ "`uname`" = "Darwin" ]
183          then          then
184              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"
185          fi          fi
186          exit 0          exit 0
187          ;;          ;;
188        "o")  ESCRIPT_CREATESTDFILES="yes"        "o")  ESCRIPT_CREATESTDFILES=y
189          ;;          ;;
190        "v")  ESCRIPT_VERBOSE="yes"        "v")  ESCRIPT_VERBOSE=y
191          ;;          ;;
192        "x")  echo "-x not implemented yet"        "x")  DO_XTERM=y
193          exit 1          ;;
194          ;;        ?)    echo "$HELP_TEXT"
195        ?)    echo "$HELP_TEXT"          exit 1
196          exit 1          ;;
197          ;;      esac
     esac  
198  done  done
199  shift `expr $OPTIND - 1`  shift `expr $OPTIND - 1`
200  #==============================================  #==============================================
201  #  #
202  #   Read the MPI_FLAVOUR from the buildvars  #   Read MPI_FLAVOUR and WITH_OPENMP from the buildvars
203  #  #
204  MPI_FLAVOUR=`grep mpi_flavour $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`  MPI_FLAVOUR=`get_buildvar mpi`
205  WITH_OPENMP=`grep useopenmp $ESCRIPT_ROOT/lib/buildvars |cut -d= -f2`  WITH_OPENMP=`get_buildvar openmp`
206    
207  if [ ! -z $ESCRIPT_VERBOSE ]; then  if [ ! -z $ESCRIPT_VERBOSE ]; then
208      echo "MPI flavour is $MPI_FLAVOUR."      echo "MPI flavour is $MPI_FLAVOUR."
209      if [ "$WITH_OPENMP" = "y" ]; then echo "OpenMP enabled."; fi      if [ "$WITH_OPENMP" = "1" ]; then echo "OpenMP enabled."; fi
210  fi  fi
211    
212  #  #
# Line 206  then Line 242  then
242      then      then
243          echo "Warning: MPI disabled but number of processors per node set. Option ignored."          echo "Warning: MPI disabled but number of processors per node set. Option ignored."
244      fi      fi
245      if [ ! -z $ESCRIPT_HOSTFILE ]      if [ ! -z "$ESCRIPT_HOSTFILE" ]
246      then      then
247          echo "Warning: MPI disabled but host file is given. Option ignored."          echo "Warning: MPI disabled but host file is given. Option ignored."
248      fi      fi
249      ESCRIPT_NUM_NODES=1      ESCRIPT_NUM_NODES=1
250      ESCRIPT_NUM_PROCS=1      ESCRIPT_NUM_PROCS=1
251  else  else
252      if [ ! -z $ESCRIPT_HOSTFILE ]      # use the PBS_NODEFILE if not otherwise specified
253        if [ ! -z "$PBS_NODEFILE" ] && [ -z "$ESCRIPT_HOSTFILE" ]
254        then
255            ESCRIPT_HOSTFILE=$PBS_NODEFILE
256        fi
257    
258        if [ ! -z "$ESCRIPT_HOSTFILE" ]
259      then      then
260          if [ -f $ESCRIPT_HOSTFILE ]          if [ -f "$ESCRIPT_HOSTFILE" ]
261          then          then
262              cat $ESCRIPT_HOSTFILE | sort -u > $HOSTFILE              cat "$ESCRIPT_HOSTFILE" | sort -u > $HOSTFILE
263              NUM_HOSTS=`cat $HOSTFILE | wc -l`              NUM_HOSTS=`cat "$HOSTFILE" | wc -l`
264              if [ ! -z $ESCRIPT_NUM_NODES ]              if [ ! -z $ESCRIPT_NUM_NODES ]
265              then              then
266                  if [ $NUM_HOSTS -ne $ESCRIPT_NUM_NODES ]                  if [ $NUM_HOSTS -ne $ESCRIPT_NUM_NODES ]
# Line 239  else Line 281  else
281    
282      if [ -z $ESCRIPT_NUM_NODES ]      if [ -z $ESCRIPT_NUM_NODES ]
283      then      then
284        ESCRIPT_NUM_NODES=1          ESCRIPT_NUM_NODES=1
285      fi      fi
286    
287      if [ -z $ESCRIPT_NUM_PROCS ]      if [ -z $ESCRIPT_NUM_PROCS ]
288      then      then
289        ESCRIPT_NUM_PROCS=1          ESCRIPT_NUM_PROCS=1
290      fi      fi
291    
292      if [ ! -z $ESCRIPT_VERBOSE ]      if [ ! -z $ESCRIPT_VERBOSE ]
293      then      then
294            echo "ESCRIPT_NUM_NODES = $ESCRIPT_NUM_NODES "          echo "ESCRIPT_NUM_NODES = $ESCRIPT_NUM_NODES "
295            echo "ESCRIPT_NUM_PROCS = $ESCRIPT_NUM_PROCS "          echo "ESCRIPT_NUM_PROCS = $ESCRIPT_NUM_PROCS "
296      fi      fi
297  fi  fi
298    
299  if [ "$WITH_OPENMP" = "y" ]  if [ "$WITH_OPENMP" = "1" ]
300  then  then
301     if [ -z $ESCRIPT_NUM_THREADS ]     if [ -z $ESCRIPT_NUM_THREADS ]
302     then     then
# Line 269  then Line 311  then
311          echo "ESCRIPT_NUM_THREADS is $ESCRIPT_NUM_THREADS."          echo "ESCRIPT_NUM_THREADS is $ESCRIPT_NUM_THREADS."
312     fi     fi
313  else  else
314     if [[ ( ! -z $ESCRIPT_NUM_THREADS ) && ( $ESCRIPT_NUM_THREADS != 1 ) ]]     if [ ! -z $ESCRIPT_NUM_THREADS ] && [ $ESCRIPT_NUM_THREADS != 1 ]
315     then     then
316         echo "Warning: OpenMP is disabled but number of threads requested is $ESCRIPT_NUM_THREADS!=1. Running without threads."         echo "Warning: OpenMP is disabled but number of threads requested is $ESCRIPT_NUM_THREADS!=1. Running without threads."
317     fi     fi
# Line 278  fi Line 320  fi
320  #  #
321  # Now we compute total number of Processes  # Now we compute total number of Processes
322  #  #
323  (( TOTPROC=$ESCRIPT_NUM_NODES * $ESCRIPT_NUM_PROCS))  TOTPROC=$((ESCRIPT_NUM_NODES * ESCRIPT_NUM_PROCS))
324  if [ $? -ne 0 ]     #Some compute error  if [ $? -ne 0 ]     #Some compute error
325  then            #This could happen if the args were not a number  then            #This could happen if the args were not a number
326    echo "expression of total number of processors = $ESCRIPT_NUM_NODES * $ESCRIPT_NUM_PROCS is not numerical."      echo "expression of total number of processors = $ESCRIPT_NUM_NODES * $ESCRIPT_NUM_PROCS is not numerical."
327    exit 1      exit 1
328  fi  fi
329    
330  #  #
331  # Test to ensure people aren't trying to combine interactive and multi-process  # Test to ensure people aren't trying to combine interactive and multi-process
332  #  #
333  if [[ ( ( ! -z $DOINTERACTIVE ) || ( $# -eq 0 ) ) && ( $TOTPROC -gt 1) ]]  if ([ ! -z $DO_INTERACTIVE ] || [ $# -eq 0 ]) && ([ $TOTPROC -gt 1 ])
334  then  then
335    echo "Interactive mode cannot be used with more than one process"      echo "Interactive mode cannot be used with more than one process"
336    exit 1      exit 1
337  fi  fi
338    
339  if [ $TOTPROC -gt 1 ]  if [ $TOTPROC -gt 1 ]
340  then  then
341     if [ "$ESCRIPT_CREATESTDFILES" = "yes" ]      if [ "$ESCRIPT_CREATESTDFILES" = "y" ]
342     then      then
343         PYTHON_MPI=$PYTHON_MPI_REDIRECT          PYTHON_MPI=$PYTHON_MPI_REDIRECT
344     else      else
345         PYTHON_MPI=$PYTHON_MPI_NULL          PYTHON_MPI=$PYTHON_MPI_NULL
346     fi      fi
347  else  else
348      PYTHON_MPI=$PYTHON_MPI_NULL      PYTHON_MPI=$PYTHON_MPI_NULL
349  fi  fi
350  #=========================================================================================================  #==============================================================================
351  # Must have at least one command-line arg: the python script  # Must have at least one command-line arg: the python script
352  if [ $# -eq 0 ]  if [ $# -eq 0 ]
353  then  then
354    if [ ! -z $DOBINARY ]      if [ ! -z $DO_BINARY ]
355    then      then
356      echo "No program to run was specified. Exiting."          echo "No program to run was specified. Exiting."
357      exit 1          exit 1
358    fi      else
359            DO_INTERACTIVE=y
360        fi
361  fi  fi
362  if [ -z $@ ]  
363    #==============================================================================
364    if [ ! -z $DO_XTERM ]
365  then  then
366     if [ ! -z $DOBINARY ]      EXEC_CMD="xterm -e"
367     then  else
368         echo "Program must be given."      EXEC_CMD=""
        exit 1  
    else  
       DOINTERACTIVE="yes"  
    fi  
369  fi  fi
370    
371  #=========================================================================================================  if [ ! -z $DO_BINARY ]
 if [ ! -z $DOBINARY ]  
372  then  then
373      EXEC_CMD="$@"      EXEC_CMD="$EXEC_CMD $@"
374  else  else
375      if [ "$MPI_FLAVOUR" = "none" ]      # Check to see if the python version we were compiled with matches the
376      then      # one of PYTHON_CMD.
377          # Check to see if the python version we were compiled with matches the one of EXEC_CMD      compfull=`get_buildvar python_version`
378          # We should only do this check if they are running a python script      compversion=`echo $compfull | cut -d. -f1,2`
379          if [ -f $ESCRIPT_ROOT/lib/pyversion ]      compmajor=`echo $compfull | cut -d. -f1`
380        if [ "$PYTHON_CMD" = "python" ] # if people have customised the command they
381        then                                # might not want us changing it
382            if [ "$compmajor" = "3" ]
383          then          then
384             compversion=`cat $ESCRIPT_ROOT/lib/pyversion`              PYTHON_CMD=python3
            intversion=`$PYTHON_CMD -V 2>&1`  
            if [ "$compversion" != "$intversion" ]  
            then  
               echo "Python versions do not match. Escript was compiled for "$compversion"."  
               echo "Current version of Python appears to be "$intversion"."  
               exit 1  
            fi  
385          fi          fi
386      if [ ! -z $DOINTERACTIVE ]      fi
387        intversion=`$PYTHON_CMD -c 'from __future__ import print_function;import sys;print("%d.%d"%(sys.version_info[0], sys.version_info[1]))'`
388        if [ "$compversion" != "$intversion" ]
389        then
390            echo "Python versions do not match. Escript was compiled for "$compversion"."
391            echo "Current version of Python appears to be "$intversion"."
392            exit 1
393        fi
394        if [ "$MPI_FLAVOUR" = "none" ]
395        then
396            if [ ! -z $DO_INTERACTIVE ]
397          then          then
398             EXEC_CMD="$PYTHON_CMD -i $@"             EXEC_CMD="$EXEC_CMD $PYTHON_CMD -i $@"
399          else          else
400             EXEC_CMD="$PYTHON_CMD $@"             EXEC_CMD="$EXEC_CMD $PYTHON_CMD $@"
401          fi          fi
402      else      else
403      if [ ! -z $DOINTERACTIVE ]          if [ ! -z $DO_INTERACTIVE ]
404          then          then
405             EXEC_CMD="$PYTHON_MPI -i $@"             EXEC_CMD="$EXEC_CMD $PYTHON_MPI -i $@"
406          else          else
407             EXEC_CMD="$PYTHON_MPI $@"             EXEC_CMD="$EXEC_CMD $PYTHON_MPI $@"
408          fi          fi
409      fi      fi
410  fi  fi
411  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
412  #===============================================================================================  #==============================================================================
413  #  #
414  #   now we start to spwan things:  #   now we start to spawn things:
415  #  #
416  if [ "$WITH_OPENMP" = "y" ]  if [ "$WITH_OPENMP" = "1" ]
417  then  then
418     export OMP_NUM_THREADS=$ESCRIPT_NUM_THREADS     export OMP_NUM_THREADS=$ESCRIPT_NUM_THREADS
419     EXPORT_ENV="$EXPORT_ENV,OMP_NUM_THREADS"     EXPORT_ENV="$EXPORT_ENV,OMP_NUM_THREADS"
# Line 380  then Line 427  then
427  #=============== OpenMPI ===================================  #=============== OpenMPI ===================================
428  elif [ "$MPI_FLAVOUR" = "OPENMPI" ]  elif [ "$MPI_FLAVOUR" = "OPENMPI" ]
429  then  then
430     if [ ! -z $HOSTFILE ]     if [ ! -z "$HOSTFILE" ]
431     then     then
432        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"`
433        CMD="mpirun --gmca mpi_warn_on_fork 0 -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 --bind-to-socket --cpus-per-rank $ESCRIPT_NUM_THREADS --host $HOST_LIST $EXEC_CMD"
434     else     else
435        CMD="mpirun --gmca mpi_warn_on_fork 0 -x ${EXPORT_ENV//,/ -x } -np $TOTPROC $EXEC_CMD"        CMD="mpirun --gmca mpi_warn_on_fork 0 -x ${EXPORT_ENV//,/ -x } --cpus-per-rank $ESCRIPT_NUM_THREADS -np $TOTPROC $EXEC_CMD"
436     fi     fi
437     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi
438     $CMD     $CMD
# Line 395  then Line 442  then
442  elif [ "$MPI_FLAVOUR" = "INTELMPI" ]  elif [ "$MPI_FLAVOUR" = "INTELMPI" ]
443  then  then
444    
445     if [ "$WITH_OPENMP" = "y" ]     if [ "$WITH_OPENMP" = "1" ]
446     then     then
447         export I_MPI_PIN_DOMAIN=omp         export I_MPI_PIN_DOMAIN=omp
448         EXPORT_ENV="$EXPORT_ENV, I_MPI_PIN_DOMAIN"         EXPORT_ENV="$EXPORT_ENV, I_MPI_PIN_DOMAIN"
449     fi     fi
450    
451     if [ ! -z $HOSTFILE ]     if [ ! -z "$HOSTFILE" ]
452     then     then
453        mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f $HOSTFILE        mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f "$HOSTFILE"
454        if [ $? -ne 0 ]        if [ $? -ne 0 ]
455        then        then
456           echo "mpdboot with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes failed."           echo "mpdboot with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes failed."
# Line 432  elif [ "$MPI_FLAVOUR" = "MPT" ] Line 479  elif [ "$MPI_FLAVOUR" = "MPT" ]
479  then  then
480     export MPI_NUM_MEMORY_REGIONS=0     export MPI_NUM_MEMORY_REGIONS=0
481     EXPORT_ENV="$EXPORT_ENV,MPI_NUM_MEMORY_REGIONS"     EXPORT_ENV="$EXPORT_ENV,MPI_NUM_MEMORY_REGIONS"
482     if [ ! -z $HOSTFILE ]     if [ ! -z "$HOSTFILE" ]
483     then     then
484        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"`
485        CMD="mpirun $HOST_LIST -np $ESCRIPT_NUM_PROCS $EXEC_CMD"        CMD="mpirun $HOST_LIST -np $ESCRIPT_NUM_PROCS $EXEC_CMD"
486     else     else
487        CMD="mpirun -np $TOTPROC $EXEC_CMD"        CMD="mpirun -np $TOTPROC $EXEC_CMD"
# Line 445  then Line 492  then
492  #=============== MPICH ===================================  #=============== MPICH ===================================
493  elif [ "$MPI_FLAVOUR" = "MPICH" ]  elif [ "$MPI_FLAVOUR" = "MPICH" ]
494  then  then
495     if [ ! -z $HOSTFILE ]     if [ ! -z "$HOSTFILE" ]
496     then     then
497        touch $HOSTFILE2        touch "$HOSTFILE2"
498        for (( i=1;i<=$ESCRIPT_NUM_PROCS;i+=1 )) ; do cat $HOSTFILE >> $HOSTFILE2  ; done        for (( i=1;i<=$ESCRIPT_NUM_PROCS;i+=1 )) ; do cat "$HOSTFILE" >> "$HOSTFILE2"  ; done
499        CMD="mpirun -machinefile $HOSTFILE2  -np $TOTPROC $EXEC_CMD"        CMD="mpirun -machinefile \"$HOSTFILE2\"  -np $TOTPROC $EXEC_CMD"
500     else     else
501        CMD="mpirun -np $TOTPROC $EXEC_CMD"        CMD="mpirun -np $TOTPROC $EXEC_CMD"
502     fi     fi
# Line 459  then Line 506  then
506  #=============== MPICH2 ===================================  #=============== MPICH2 ===================================
507  elif [ "$MPI_FLAVOUR" = "MPICH2" ]  elif [ "$MPI_FLAVOUR" = "MPICH2" ]
508  then  then
509     if [ ! -z $HOSTFILE ]     if [ ! -z "$HOSTFILE" ]
510     then     then
511           mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f $HOSTFILE           mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f "$HOSTFILE"
512           if [ $? -ne 0 ]           if [ $? -ne 0 ]
513           then           then
514              echo "mpdboot with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes failed."              echo "mpdboot with host file $ESCRIPT_HOSTFILE for $ESCRIPT_NUM_NODES nodes failed."
# Line 489  else Line 536  else
536     echo "unknown MPI flavour '$MPI_FLAVOUR'."     echo "unknown MPI flavour '$MPI_FLAVOUR'."
537  fi  fi
538  exit $EXIT_CODE  exit $EXIT_CODE
539    

Legend:
Removed from v.2905  
changed lines
  Added in v.4362

  ViewVC Help
Powered by ViewVC 1.1.26