--- MITgcm/verification/testreport 2004/11/24 17:06:07 1.50 +++ MITgcm/verification/testreport 2006/06/15 20:31:09 1.81 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.50 2004/11/24 17:06:07 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.81 2006/06/15 20:31:09 jmc Exp $ # $Name: $ # @@ -27,6 +27,8 @@ echo " (DEF=\"make output.txt\")" echo " (-m|-make) STRING command to use for \"make\"" echo " (DEF=\"make\")" + echo " (-odir) STRING used to build output directory name" + echo " (DEF=\"hostname\")" echo " (-ptracers|-ptr) STRING specify which ptracers to test" echo " (DEF=\"1 2 3 4 5\")" echo " (-j) JOBS use \"make -j JOBS\" for parallel builds" @@ -95,8 +97,8 @@ fi if [ -r $1/$4/output.txt ]; then grep "$2" $1/$4/output.txt | sed 's/.*=//' | cat -n > tmp1.txt - lncnt=`wc -l tmp1.txt | awk '{print $1}' ` - if [ $lncnt -lt 3 ]; then + lncntA=`wc -l tmp1.txt | awk '{print $1}' ` + if [ $lncntA -lt 3 ]; then if [ $verbose -gt 0 ]; then echo Not enough lines of output when searching for "$2" 1>&2 fi @@ -110,13 +112,29 @@ echo testoutput_for_prop: grep "$2" $1/results/output.txt$5 1>&2 fi grep "$2" $1/results/output.txt$5 | sed 's/.*=//' | cat -n > tmp2.txt - lncnt=`wc -l tmp2.txt | awk '{print $1}' ` - if [ $lncnt -lt 3 ]; then + lncntB=`wc -l tmp2.txt | awk '{print $1}' ` + if [ $lncntB -lt 3 ]; then if [ $verbose -gt 0 ]; then echo Not enough lines of output when searching for "$2" 1>&2 fi return 99 fi + if [ $lncntA -ne $lncntB ]; then + if [ $verbose -gt 0 ]; then + echo Not same Nb of lines when searching for "$2" ":" $lncntA $lncntB 1>&2 + fi + return 99 + fi + has_nan=`cat tmp1.txt | grep -i nan | wc -l` + if [ $has_nan -gt 0 ] ; then + echo testoutput_for_prop: output.txt contains $has_nan NaN values 1>&2 + return 99 + fi + has_inf=`cat tmp1.txt | grep -i inf | wc -l` + if [ $has_inf -gt 0 ] ; then + echo testoutput_for_prop: output.txt contains $has_inf Inf values 1>&2 + return 99 + fi if [ $debug -gt 0 ]; then echo testoutput_for_prop: join tmp1.txt tmp2.txt 1>&2 fi @@ -163,10 +181,10 @@ testoutput_ad() { - grep $3 $1/results_ad/output.txt_adm | awk '{print NR " " $5}' > t05.txt - grep $3 $1/$2/output.txt_adm | awk '{print NR " " $5}' > t15.txt - grep $3 $1/results_ad/output.txt_adm | awk '{print NR " " $6}' > t06.txt - grep $3 $1/$2/output.txt_adm | awk '{print NR " " $6}' > t16.txt + grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $5}' > t05.txt + grep $3 $1/$2/output_adm.txt | awk '{print NR " " $5}' > t15.txt + grep $3 $1/results_ad/output_adm.txt | awk '{print NR " " $6}' > t06.txt + grep $3 $1/$2/output_adm.txt | awk '{print NR " " $6}' > t16.txt join t05.txt t15.txt > t5.txt join t06.txt t16.txt > t6.txt echo "-1" >> t5.txt @@ -286,7 +304,6 @@ command="$command --mods=../code" else command="$command --mods=../code_ad" - command="$command -adof=../../../tools/adjoint_options/adjoint_staf" fi if test "x$OPTFILE" != xNONE ; then command="$command --optfile=$OPTFILE" @@ -294,6 +311,9 @@ if test "x$IEEE" != x ; then command="$command -ieee" fi + if test "x$MPI" = xt ; then + command="$command -mpi" + fi printf 'genmake ... ' 1>&2 $command > make.log 2>&1 RETVAL=$? @@ -339,6 +359,20 @@ fi } +postclean() +{ + # postclean directory + if test "x$POSTCLEAN" = xt ; then + ( + cd $1; + if test -r Makefile ; then + $MAKE CLEAN >> /dev/null 2>&1 + fi + exit 0 + ) + fi +} + makedependmodel() { # makedependmodel directory @@ -450,23 +484,25 @@ if test "x$ADM" = x ; then files=`( cd ../input ; ls -1 | grep -v CVS )` for i in $files ; do - if test ! -d "../input/"$i ; then + if test ! -d "../input/"$i -a ! -f $i ; then ln -sf "../input/"$i $i fi done else - files=`( cd ../input ; ls -1 *.bin | grep -v CVS )` - for i in $files ; do - if test ! -d "../input/"$i ; then - ln -sf "../input/"$i $i - fi - done files=`( cd ../input_ad ; ls -1 | grep -v CVS )` for i in $files ; do if test ! -d "../input_ad/"$i ; then ln -sf "../input_ad/"$i $i fi done + files=`( cd ../input ; ls -1 | grep -v CVS )` + for i in $files ; do + if test ! -d "../input/"$i ; then + if test ! -r $i ; then + ln -sf "../input/"$i $i + fi + fi + done fi ) fi @@ -480,14 +516,19 @@ # (where "$COMMAND" is relative to "directory") ( cd $1 - printf 'runmodel ... ' 1>&2 + printf 'runmodel in %s ...' $1 1>&2 # make output.txt echo rm -f run.log + if test $OUTPUTFILE -ot $EXECUTABLE ; then + ( eval $COMMAND ) > run.log 2>&1 + RETVAL=$? + else + echo " $OUTPUTFILE is up to date " > run.log 2>&1 + RETVAL=0 + fi # echo "COMMAND='$COMMAND'" # echo "pwd='"`pwd`"'" - ( eval $COMMAND ) > run.log 2>&1 - RETVAL=$? if test "x$RETVAL" = x0 ; then tail run.log echo successful 1>&2 @@ -495,7 +536,7 @@ # if test "x$ADM" = x ; then # cp output.txt $CDIR"/output.txt" # else - # cp output.txt_adm $CDIR"/output.txt_adm" + # cp output_adm.txt $CDIR"/output_adm.txt" # fi if test -s STDERR.0000 ; then cp STDERR.0000 $CDIR"/STDERR.0000" ; fi return 0 @@ -519,23 +560,19 @@ #include int main( int argc, char** argv ) { int linnum,best,lncnt; - double a,b,diff; - best = -16; + double a,b,abave,relerr; + best = -22; lncnt = 0; while( 1 & (lncnt+=1) < 999 ) { scanf("%d", &linnum); if (linnum == -1) break; scanf("%lf", &a); scanf("%lf", &b); - diff = 0.5*(fabs(a)+fabs(b)); - if (diff > 1.e-12) { - diff=fabs(a-b)/diff; - if (diff > 0.0) { - linnum = (int)log10(diff); - best = (best > linnum) ? best : linnum; - } - else { - if (best == -16 && diff != 0) best = -22; - } + abave = 0.5*(fabs(a)+fabs(b)); + if (abave > 0.0) { + relerr=fabs(a-b)/abave; + if (relerr > 0.0) { linnum = (int)rint(log10(relerr)); } + else { linnum = -16 ; } + best = (best > linnum) ? best : linnum; } } if (lncnt == 999) best=-29; @@ -543,14 +580,15 @@ return 0; } EOF - cc -o tmp_cmpnum tmp_cmpnum.c -lm + $CC -o tmp_cmpnum tmp_cmpnum.c -lm if [ -x ./tmp_cmpnum ]; then echo "OK" return 0 else echo - echo "ERROR: failed to compile comparison code" + echo "ERROR: failed to compile comparison code -- please specify" + echo " a C compiler using the CC environment variable." exit 1 fi } @@ -599,12 +637,12 @@ scandirs() { - if [ $# -eq 0 ]; then - for arg in * ; do - test -d $arg/input && echo $arg - done + if [ $# -eq 1 ]; then + for arg in * ; do + test -d $arg/$1 && echo $arg + done else - echo $* + echo $* fi } @@ -630,6 +668,7 @@ NOGENMAKE=f NOCLEAN=f NODEPEND=f +POSTCLEAN=f BASH= OPTFILE=NONE @@ -639,9 +678,15 @@ HAVE_MPACK= MPACK="$MPACKDIR/mpack" COMMAND= -MAKE=make +if test "x$MAKE" = x ; then + MAKE=make +fi +if test "x$CC" = x ; then + CC=cc +fi JOBS= MPI=f +OUTDIR= DELDIR= ADM= @@ -698,6 +743,11 @@ -make=* | --make=*) MAKE=$ac_optarg ;; + -odir | --odir) + ac_prev=OUTDIR ;; + -odir=* | --odir=*) + OUTDIR=$ac_optarg ;; + -ptracers | --ptracers | -ptr | --ptr) ac_prev=PTRACERS_NUM ;; -ptracers=* | --ptracers=* | -ptr=* | --ptr=*) @@ -707,7 +757,7 @@ -j=*) JOBS=$ac_optarg ;; -clean | --clean) - CLEANUP=t ;; + CLEANUP=t ; DELDIR=t ;; -quick | --quick | -q | --q) QUICK=t ;; @@ -718,6 +768,9 @@ -nodepend | --nodepend | -nd | --nd) NODEPEND=t ;; + -postclean | --postclean | -pc | --pc) + POSTCLEAN=t ;; + -mpi) MPI=t ;; -adm | -ad) ADM=t ;; @@ -752,22 +805,35 @@ fi if test "x$TESTDIRS" = x ; then - TESTDIRS=`scandirs` + if test "x$ADM" = xt ; then + TESTDIRS=`scandirs results_ad` + else + TESTDIRS=`scandirs results` + fi fi if test "x$OPTFILE" = xNONE -a "x$MITGCM_OF" != x ; then OPTFILE=$MITGCM_OF fi +if test "x$ADM" = xt ; then + EXECUTABLE="mitgcmuv_ad" + OUTPUTFILE="output_adm.txt" +else + EXECUTABLE="mitgcmuv" + OUTPUTFILE="output.txt" +fi + if test "x$ADM" = xt -a "x$COMMAND" = x ; then - COMMAND="./mitgcmuv_ad > output.txt_adm 2>&1" + COMMAND="./$EXECUTABLE > $OUTPUTFILE" fi if test "x$COMMAND" = x ; then - COMMAND="$MAKE output.txt" + COMMAND="./$EXECUTABLE > $OUTPUTFILE" fi -echo "OK" +#echo "OK" +echo "OK (COMMAND= $COMMAND )" # create the FORTRAN comparison code createcodelet @@ -784,6 +850,9 @@ UNAMEA=`uname -a` DATE=`date +%Y%m%d` BASE="tr_"$MACH"_"$DATE"_" +if test "x$OUTDIR" != x ; then + BASE="tr_"$OUTDIR"_"$DATE"_" +fi DNUM=0 DRESULTS="$BASE$DNUM" while test -e $DRESULTS ; do @@ -873,6 +942,10 @@ if test -r $dir/input/Makefile ; then ( cd $dir/input ; make CLEAN ) fi + ( + cd $dir + rm -rf tr_run.* + ) continue fi @@ -881,14 +954,16 @@ fout= if test "x$ADM" = x ; then fout=$dir"/results/output.txt" - check_for_add_mon_output $fout else - fout=$dir"/results_ad/output.txt_adm" + fout=$dir"/results_ad/output_adm.txt" fi if test ! -r $fout ; then echo "can't read \"$fout\" -- skipping $dir" continue fi + if test "x$ADM" = x ; then + check_for_add_mon_output $fout + fi # Check for additional types of monitor output @@ -935,7 +1010,7 @@ echo "Experiment: $dir" echo unset genmake makedepend make run - results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --' + results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --' # Create an output dir for each OPTFILE/tdir combination rel_CDIR=$DRESULTS"/"$dir @@ -966,26 +1041,34 @@ echo "DATE='$DATE'" >> $CDIR"/summary.txt" echo "tdir='$dir'" >> $CDIR"/summary.txt" - OLD_COMMAND=$COMMAND - COMMAND="./mitgcmuv > output.txt" for ex in $extra_runs ; do - test -e "$dir/tr_run.$ex" && rm -rf "$dir/tr_run.$ex" - mkdir "$dir/tr_run.$ex" - links=`( cd "$dir/input" > /dev/null 2>&1 ; ls -1 | grep -v CVS )` + unset run + results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --' + # Create an output dir for each OPTFILE/tdir.ex combination + rel_CDIR=$DRESULTS"/"$dir"."$ex + mkdir $rel_CDIR + CDIR=`pwd`"/$rel_CDIR" + test ! -e "$dir/tr_run.$ex" && mkdir "$dir/tr_run.$ex" + for ldir in input.$ex input ; do + ( + cd "$dir/$ldir" > /dev/null 2>&1 + ls -1 2>/dev/null \ + | sed -e 's|^CVS$||g' | sed -e 's|^output.txt$||g' + ) > tr_exrun_links + ( + cd "$dir/tr_run.$ex" + cat ../../tr_exrun_links | while read i ; do + if test ! "x$i" = x ; then + test ! -r $i && ln -s "../"$ldir"/"$i $i + fi + done + ) + test -e tr_exrun_links && rm -f tr_exrun_links + done + ldir=build ( - cd "$dir/tr_run.$ex" - for i in $links; do - ln -s ../input/$i $i - done - ) - links=`( cd "$dir/input.$ex" > /dev/null 2>&1 ; ls -1 | grep -v CVS )` - ( - cd "$dir/tr_run.$ex" - for i in $links; do - test -e $i && rm -f $i - ln -s ../input.$ex/$i $i - done - ln -s ../$builddir/mitgcmuv mitgcmuv + cd $dir/tr_run.$ex + test ! -e mitgcmuv && ln -s "../"$ldir"/"mitgcmuv . ) runmodel $dir/tr_run.$ex && run=Y \ && results=`testoutput $dir tr_run.$ex "."$ex` @@ -998,9 +1081,8 @@ echo "MACH='$MACH'" >> $CDIR"/summary.txt" echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt" echo "DATE='$DATE'" >> $CDIR"/summary.txt" - echo "tdir='$dir'" >> $CDIR"/summary.txt" + echo "tdir='$dir.$ex'" >> $CDIR"/summary.txt" done - COMMAND=$OLD_COMMAND else fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}` fres=$fres"$results $dir" @@ -1011,7 +1093,11 @@ echo "UNAMEA='$UNAMEA'" >> $CDIR"/summary.txt" echo "DATE='$DATE'" >> $CDIR"/summary.txt" echo "tdir='$dir'" >> $CDIR"/summary.txt" + grep -A3 'Seconds in section "ALL' $dir/$rundir/$OUTPUTFILE \ + >> $CDIR"/summary.txt" fi + + postclean $dir/$builddir echo "-------------------------------------------------------------------------------" @@ -1053,11 +1139,11 @@ rm -f tmp_cmpnum.c tmp_cmpnum if test "x$CLEANUP" != xt ; then - cat $SUMMARY + cat $SUMMARY | sed 's/ -- -- -- --//g' if test -e tr_out.txt ; then mv tr_out.txt tr_out.txt.old fi - cat $SUMMARY > tr_out.txt + cat $SUMMARY | sed 's/ -- -- -- --//g' > tr_out.txt fi if test "x$DELDIR" = xt ; then