/[MITgcm]/MITgcm/tools/do_tst_2+2

Diff of /MITgcm/tools/do_tst_2+2

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

-revision 1.2 by jmc,
Wed Jan  9 22:02:03 2008 UTC
+revision 1.14 by jmc,
Sun Apr 29 22:11:17 2012 UTC
 Line 12 
 usage()
          echo "  -help         : print usage"
          echo "  -t   LIST_EXP : only check experiments in LIST_EXP"
          echo "  -skd LIST_EXP : skip experiments in LIST_EXP"
+         echo "  -exe  COMMAND : use COMMAND to run the tests"
+         echo "  -mpi          : run the tests using MPI"
+         echo "  -mf    STRING :(MPI) file with list of possible machines to run on"
          echo "  -o     STRING : used to build output directory name"
          echo "                      (DEF=\"hostname\")"
          echo "  -a,-A  STRING : email address to send output to"
-Line 24 
 usage()
+Line 27 
 usage()
  CLEAN=0
  TESTDIRS=
  SKIPDIRS=
- OUTDIR=`hostname`
+ SCRIPT='../tools/tst_2+2'
+ LOGFILE='tst_2+2_out.log'
+ scrArg='All'
+ COMMAND=
+ mpi=0
+ MPI_MFILE=
+ OUTDIR=`hostname | sed 's/\..*$//'`
  SAVELOG=0
  ADDRESS=
- SCRIPT='../tools/tst_2+2'
  MPACK="../tools/mpack-1.6/mpack"
  here=`pwd`
  yy=
-Line 42 
 do
+Line 50 
 do
        -clean) CLEAN=1 ;;
        -t    ) yy=TESTDIRS ;;
        -skd  ) yy=SKIPDIRS ;;
+       -exe  ) yy=COMMAND ;;
+       -mpi  ) mpi=1 ;;
+       -mf   ) yy=MPI_MFILE ;;
        -a    ) yy=ADDRESS ;;
        -A    ) yy=ADDRESS ; SAVELOG=1 ;;
        -o    ) yy=OUTDIR ;;
-Line 88 
 if test $CLEAN = 1 ; then
+Line 99 
 if test $CLEAN = 1 ; then
      if test -r $xx/$yy/data.tst ; then
        echo "clean dir:" $xx/$yy
        cd $xx/$yy
-       echo ' ' >> outp.tst_2+2.log
+       echo ' ' >> $LOGFILE
-       echo $SCRIPT 4 >> outp.tst_2+2.log
+       echo $SCRIPT 4 >> $LOGFILE
-       $SCRIPT 4 >> outp.tst_2+2.log 2>&1
+       $SCRIPT 4 >> $LOGFILE 2>&1
        cd $here
      fi
    done
-Line 99 
 if test $CLEAN = 1 ; then
+Line 110 
 if test $CLEAN = 1 ; then
  fi
  #------------------------
  #  Create a uniquely named directory to store results
- DATE=`date +%Y%m%d`
+ CMDLINE=$0
+ for xx in "$@" ; do nw=`echo $xx | wc -w`
+     if test $nw = '1' ; then CMDLINE="$CMDLINE $xx"
+                         else CMDLINE="$CMDLINE '$xx'" ; fi
+ done
+ #for xx in "$@" ; do CMDLINE="$CMDLINE '$xx'" ; done
+ DATE=''
+ if test -f tr_out.txt ; then
+ #  try to use the date corresponding to 'Start time:' in file "tr_out.txt" :
+   sTime=`grep '^Start time:  ' tr_out.txt 2>/dev/null | sed 's/Start time:  //'`
+   if test "x$sTime" != x ; then DATE=`date -d "$sTime" "+%Y%m%d" 2>/dev/null` ; fi
+ fi
+ #  otherwise, use current date:
+ if test "x$DATE" = x ; then DATE=`date +%Y%m%d`; fi
  BASE="rs_"$OUTDIR"_"$DATE"_"
  xx=0
  DRESULTS="$BASE$xx"
-Line 118 
 OPTFILE=
+Line 142 
 OPTFILE=
  printf "Start time:  " >  $SUMMARY
  date  >> $SUMMARY
+ echo 'run:' $CMDLINE >> $SUMMARY
  if test -f tr_out.txt ; then
   echo ' using output from:' >> $SUMMARY
-  sed -n '2,/OPTFILE/ p' tr_out.txt >> $SUMMARY
+  sed -n '2,/^  OPTFILE=/ p' tr_out.txt >> $SUMMARY
   echo >> $SUMMARY
  fi
  echo  'test 2+2=4 summary :' >> $SUMMARY
-Line 128 
 echo  >> $SUMMARY
+Line 153 
 echo  >> $SUMMARY
  echo 'P. Run  Result     experiment'  >> $SUMMARY
  echo '  1 2 3'  >> $SUMMARY
+ #-- For MPI test:
+ LOC_MFILE='tr_mpi_mfile'
+ RUNOUTP="output.txt"
+ if [ $mpi -ge 1 ] ; then
+   SCRIPT="$SCRIPT -mpi"
+   RUNOUTP="STDOUT.0000"
+ fi
  for xx in $LIST
  do
    echo ==============================================================================
+   if [ $mpi -le 0 ] ; then
+     rCommand=$COMMAND
+   else
+     LOC_NPROC=2
+     mpi_size=$xx/build/SIZE.h.mpi
+     if test -f $mpi_size ; then
+       px=`grep '^     & *nPx *=' $mpi_size | sed 's/^     & *nPx *= *//' | sed 's/, *$//'`
+       py=`grep '^     & *nPy *=' $mpi_size | sed 's/^     & *nPy *= *//' | sed 's/, *$//'`
+       pp=`expr $px \* $py` > /dev/null 2>&1 ; out=$?
+       if test "x$out" = x0 ; then LOC_NPROC=$pp ; fi
+     fi
+     rCommand=`echo $COMMAND | sed "s/ TR_NPROC / $LOC_NPROC /"`
+     if test "x$MPI_MFILE" != x ; then
+       #- create new MPI machine-file with the right number of Procs
+       rm -f $LOC_MFILE
+       cat $MPI_MFILE | sort | uniq | head -$LOC_NPROC > $LOC_MFILE
+       nl=`wc -l $LOC_MFILE | awk '{print $1}'`
+       if [ $nl -lt $LOC_NPROC ] ; then
+         rm -f $LOC_MFILE
+         cat $MPI_MFILE | head -$LOC_NPROC > $LOC_MFILE
+       fi
+       rCommand=`echo $rCommand | sed "s/ TR_MFILE / ..\/..\/$LOC_MFILE /"`
+     fi
+   fi
    listD='run '`(cd $xx/results ; ls output.*.txt 2> /dev/null | sed 's/^output\./tr_run./g' | sed 's/\.txt$//g' )`
    for yy in $listD
    do
-     if test -f $xx/$yy/output.txt ; then
+     if test -f $xx/$yy/$RUNOUTP ; then
        if test "x$OPTFILE" = x -a -f $xx/build/Makefile ; then
          comm=`grep '^# OPTFILE=' $xx/build/Makefile 2>/dev/null | head -1 | sed 's/^# //'`
          echo "from '$xx/build/Makefile', extract:" > $DRESULTS/genmake_state
-         echo $comm >> $DRESULTS/genmake_state
+         sed -n '/^# executed by:/,+1 p' $xx/build/Makefile >> $DRESULTS/genmake_state
+         echo " $comm" >> $DRESULTS/genmake_state
          eval $comm
+         gmkLog=$xx/build/genmake.log
+         grep '^Get compiler version using:' $gmkLog > /dev/null 2>&1
+         out=$?
+         if test "x$out" = x0 ; then
+             echo "from '$gmkLog', extract compiler version:" >> $DRESULTS/genmake_state
+             sed -n '/Get compiler version/,/<-- compiler version/p' $gmkLog \
+                        | grep -v '^... compiler version ' > tr_vers.tmp_log
+             sed -n '1,/^$/p' tr_vers.tmp_log | sed '/^$/d' | sed 's/^./ &/' \
+                       >> $DRESULTS/genmake_state
+             rm -f tr_vers.tmp_log
+         fi
        fi
        if test $yy = 'run' ; then nam=$xx
        else nam=$xx`echo $yy | sed 's/tr_run//'` ; fi
        echo -n "Entering $xx/$yy :"
        cd $xx/$yy
-       pwd > outp.tst_2+2.log
+       pwd > $LOGFILE
-       echo $SCRIPT All >> outp.tst_2+2.log ; echo ' ' >> outp.tst_2+2.log
+       if test "x$COMMAND" = x ; then
-       $SCRIPT All >> outp.tst_2+2.log 2>&1
+         echo $SCRIPT $scrArg >> $LOGFILE ; echo ' ' >> $LOGFILE
-       out=$?
+         $SCRIPT $scrArg >> $LOGFILE 2>&1
+         out=$?
+       else
+         echo "$SCRIPT $scrArg -command \"$rCommand\"" >> $LOGFILE
+         echo ' ' >> $LOGFILE
+         $SCRIPT $scrArg -command "$rCommand" >> $LOGFILE 2>&1
+         out=$?
+       fi
        case $out in
 ) echo ' pass test 2+2=4'
             echo "Y Y Y Y  pass   <- $nam" >> ../../$SUMMARY ;;
-Line 161 
 do
+Line 238 
 do
        if test $out != '0' ; then
          echo " test 2+2=4 FAIL (exit $out)"
          echo " "
-         tail -5 outp.tst_2+2.log
+         tail -5 $LOGFILE
          echo " "
-         cp -p outp.tst_2+2.log ../../$DRESULTS/$nam.log
+         cp -p $LOGFILE ../../$DRESULTS/$nam.log
        elif test $SAVELOG = 1 ; then
-         cp -p outp.tst_2+2.log ../../$DRESULTS/$nam.log
+         cp -p $LOGFILE ../../$DRESULTS/$nam.log
        fi
        cd $here
      fi
    done
+   if test "x$mpi" != x0 -a "x$MPI_MFILE" != x ; then rm -f $LOC_MFILE ; fi
  done
  printf "End time:    " >> $SUMMARY
  date >> $SUMMARY

 Legend:



Removed from v.1.2
 


changed lines


 
Added in v.1.14
 Legend:



Removed from v.1.2
 


changed lines


 
Added in v.1.14
-Removed from v.1.2
+Added in v.1.14

	ViewVC Help
Powered by ViewVC 1.1.22