← Back to branch summary

~vcs-imports/escript-finley/trunk

« back to all changes in this revision

Viewing changes to bin/run-escript

  • Committer: jfenwick
  • Date: 2010-10-11 01:48:14 UTC
  • Revision ID: svn-v4:77569008-7704-0410-b7a0-a92fef0b09fd:trunk:3259
Merging dudley and scons updates from branches

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/run-escript
65
65
fi
66
66
 
67
67
function get_buildvar {
68
 
    echo `grep $1 $BUILDINFO_FILE |cut -d= -f2`
 
68
    echo `grep "^$1=" $BUILDINFO_FILE |cut -d= -f2`
69
69
}
70
70
 
71
71
PYTHON_MPI_NULL="$ESCRIPT_ROOT/lib/pythonMPI"
92
92
#
93
93
#   Add VisIt paths if required
94
94
#
95
 
WITH_VISIT=`get_buildvar usevisit`
96
 
if [ "$WITH_VISIT" = "y" ]; then
 
95
WITH_VISIT=`get_buildvar visit`
 
96
if [ "$WITH_VISIT" = "1" ]; then
97
97
    VISIT_BIN=`which visit`
98
98
    if [ $? -eq 0 ]; then
99
99
        VISIT_PY_PATH=`$VISIT_BIN -env | grep LIBPATH | cut -d= -f2`
183
183
#
184
184
#   Read MPI_FLAVOUR and WITH_OPENMP from the buildvars
185
185
#
186
 
MPI_FLAVOUR=`get_buildvar mpi_flavour`
187
 
WITH_OPENMP=`get_buildvar useopenmp`
 
186
MPI_FLAVOUR=`get_buildvar mpi`
 
187
WITH_OPENMP=`get_buildvar openmp`
188
188
 
189
189
if [ ! -z $ESCRIPT_VERBOSE ]; then
190
190
    echo "MPI flavour is $MPI_FLAVOUR."
191
 
    if [ "$WITH_OPENMP" = "y" ]; then echo "OpenMP enabled."; fi
 
191
    if [ "$WITH_OPENMP" = "1" ]; then echo "OpenMP enabled."; fi
192
192
fi
193
193
 
194
194
#
278
278
    fi
279
279
fi
280
280
 
281
 
if [ "$WITH_OPENMP" = "y" ]
 
281
if [ "$WITH_OPENMP" = "1" ]
282
282
then
283
283
   if [ -z $ESCRIPT_NUM_THREADS ]
284
284
   then
349
349
else
350
350
    # Check to see if the python version we were compiled with matches the
351
351
    # one of PYTHON_CMD.
352
 
    compversion=`get_buildvar python`
 
352
    compversion=`get_buildvar python_version`
353
353
    intversion=`$PYTHON_CMD -c 'import sys;print "%d.%d.%d"%(sys.version_info[0], sys.version_info[1], sys.version_info[2])'`
354
354
    if [ "$compversion" != "$intversion" ]
355
355
    then
379
379
#
380
380
#   now we start to spwan things:
381
381
#
382
 
if [ "$WITH_OPENMP" = "y" ]
 
382
if [ "$WITH_OPENMP" = "1" ]
383
383
then
384
384
   export OMP_NUM_THREADS=$ESCRIPT_NUM_THREADS
385
385
   EXPORT_ENV="$EXPORT_ENV,OMP_NUM_THREADS"
408
408
elif [ "$MPI_FLAVOUR" = "INTELMPI" ]
409
409
then
410
410
 
411
 
   if [ "$WITH_OPENMP" = "y" ]
 
411
   if [ "$WITH_OPENMP" = "1" ]
412
412
   then
413
413
       export I_MPI_PIN_DOMAIN=omp
414
414
       EXPORT_ENV="$EXPORT_ENV, I_MPI_PIN_DOMAIN"