/[escript]/branches/inv2jf/run-escript.in
ViewVC logotype

Diff of /branches/inv2jf/run-escript.in

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

trunk/run-escript.in revision 5275 by caltinay, Thu Nov 20 01:27:04 2014 UTC branches/inv2jf/run-escript.in revision 5551 by jfenwick, Fri Mar 20 01:25:10 2015 UTC
# Line 2  Line 2 
2    
3  ##############################################################################  ##############################################################################
4  #  #
5  # Copyright (c) 2003-2014 by University of Queensland  # Copyright (c) 2003-2015 by University of Queensland
6  # http://www.uq.edu.au  # http://www.uq.edu.au
7  #  #
8  # Primary Business: Queensland, Australia  # Primary Business: Queensland, Australia
# Line 353  then            #This could happen if th Line 353  then            #This could happen if th
353      die "Expression of total number of processors = $ESCRIPT_NUM_NODES * $ESCRIPT_NUM_PROCS is not numerical!"      die "Expression of total number of processors = $ESCRIPT_NUM_NODES * $ESCRIPT_NUM_PROCS is not numerical!"
354  fi  fi
355    
356  # set up thread binding if unset  # set up thread binding if unset -- disabled by default because it interfers
357  if [ "$OMP_PROC_BIND" = "" ]; then  # with MPI binding
358      #Force OpenMP binding for Intel (and GCC, though GCC is on by default)  #if [ "$OMP_PROC_BIND" = "" ]; then
359      export OMP_PROC_BIND=true  #    #Force OpenMP binding for Intel (and GCC, though GCC is on by default)
360  fi  #    export OMP_PROC_BIND=true
361  if [ "$KMP_AFFINITY" = "" ]; then  #fi
362      #Set the style of binding (overrides OMP_PROC_BIND in many cases)  #if [ "$KMP_AFFINITY" = "" ]; then
363      export KMP_AFFINITY=verbose,compact  #    #Set the style of binding (overrides OMP_PROC_BIND in many cases)
364  fi  #    export KMP_AFFINITY=verbose,compact
365    #fi
366    
367  #  #
368  # 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
# Line 426  then Line 427  then
427              # run memcheck by default              # run memcheck by default
428              LAST_N=$(ls -1 $LOGDIR|grep "^memcheck"|tail -1|cut -d. -f2)              LAST_N=$(ls -1 $LOGDIR|grep "^memcheck"|tail -1|cut -d. -f2)
429              NEW_N=$(printf "%04d" $((LAST_N + 1)))              NEW_N=$(printf "%04d" $((LAST_N + 1)))
430              LOGFILE=${LOGDIR}/memcheck.${NEW_N}.xml              LOGFILE=${LOGDIR}/memcheck.${NEW_N}.%p.xml
431              VALGRIND="valgrind --tool=memcheck --xml=yes --show-reachable=yes --error-limit=no --gen-suppressions=all --suppressions=$ESCRIPT_ROOT/scripts/escript.supp --leak-check=full --xml-file=$LOGFILE"              VALGRIND="valgrind --tool=memcheck --xml=yes --show-reachable=yes --error-limit=no --suppressions=$ESCRIPT_ROOT/scripts/escript.supp --leak-check=full --xml-file=$LOGFILE"
432              EXEC_CMD="$EXEC_CMD $VALGRIND"              EXEC_CMD="$EXEC_CMD $VALGRIND"
433          fi          fi
434      else      else

Legend:
Removed from v.5275  
changed lines
  Added in v.5551

  ViewVC Help
Powered by ViewVC 1.1.26