/[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

revision 2462 by jfenwick, Fri Jun 5 06:04:01 2009 UTC revision 2568 by jfenwick, Fri Jul 31 05:37:41 2009 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 72  EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib Line 72  EXTRA_LD_LIBRARY_PATH=$ESCRIPT_ROOT/lib
72    
73  if [ $STANDALONE == 1 ]  if [ $STANDALONE == 1 ]
74  then  then
75      EXTRA_PATH=$ESCRIPT_PARENT/packages/python/bin:$EXTRA_PATH      EXTRA_PATH=$ESCRIPT_PARENT/pkg/python/bin:$EXTRA_PATH
76      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
77      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
78      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
79      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
80  fi  fi
81    
82    
# Line 360  then Line 360  then
360     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
361     then     then
362        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`
363        CMD="mpirun  --bynode -np $TOTPROC --host $HOST_LIST $EXEC_CMD"        CMD="mpirun -x ${EXPORT_ENV//,/ -x } --bynode -np $TOTPROC --host $HOST_LIST $EXEC_CMD"
364     else     else
365        CMD="mpirun -np $TOTPROC $EXEC_CMD"        CMD="mpirun -x ${EXPORT_ENV//,/ -x } -np $TOTPROC $EXEC_CMD"
366     fi     fi
367     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi     if [ ! -z $ESCRIPT_VERBOSE ]; then echo "MPI command is \"$CMD\"."; fi
368     $CMD     $CMD
# Line 371  then Line 371  then
371  #=============== Intel MPI ===================================  #=============== Intel MPI ===================================
372  elif [ $MPI_FLAVOUR == "INTELMPI" ]  elif [ $MPI_FLAVOUR == "INTELMPI" ]
373  then  then
374    
375       if [  $WITH_OPENMP == "y"  ]
376       then
377           export I_MPI_PIN_DOMAIN=omp
378           EXPORT_ENV="$EXPORT_ENV, I_MPI_PIN_DOMAIN"
379       fi
380    
381     if [ ! -z $HOSTFILE ]     if [ ! -z $HOSTFILE ]
382     then     then
383        mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f $HOSTFILE        mpdboot -n $ESCRIPT_NUM_NODES -r ssh -f $HOSTFILE

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

  ViewVC Help
Powered by ViewVC 1.1.26