--- MITgcm/verification/testreport 2003/09/02 21:06:21 1.3 +++ MITgcm/verification/testreport 2003/10/03 04:04:38 1.9.2.2 @@ -1,6 +1,6 @@ #!/bin/bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.3 2003/09/02 21:06:21 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.9.2.2 2003/10/03 04:04:38 edhill Exp $ # usage() @@ -10,9 +10,27 @@ echo echo "where possible OPTIONS are:" echo " (-help|-h) print usage" - echo " (-optfile=|-of=)STRING list of genmake2 \"optfiles\"" + echo " (-mpi) use MPI input files" + echo " (-optfile=|-of=)STRING list of optfiles to use" echo " (-a|-addr)STRING list of email recipients" - echo " (-t|-tdir)STRING list of \"test\" dirs" + echo " (DEF=\"edhill@mitgcm.org\")" + echo " (-t|-tdir)STRING list of test dirs to use" + echo " (DEF=\"\" which builds all)" + echo " (-b|-bash)STRING location of \"bash\" executable" + echo " (DEF=\"\" for \"/bin/bash\")" + echo " (-c|-command)STRING command to run" + echo " (DEF=\"make output.txt\")" + echo " (-m|-make)STRING command to use for \"make\"" + echo " (DEF=\"make\")" + echo " (-quick|-q) same as \"-nogenmake -noclean -nodepend\"" + echo " (-nogenmake|-ng) skip the genmake stage" + echo " (-noclean|-nc) skip the \"make clean\" stage" + echo " (-nodepend|-nd) skip the \"make depend\" stage" + echo + echo "and where STRING follows a whitespace-delimited format" + echo "such as:" + echo " -t 'exp0 exp2 exp3' " + echo " -addr='abc@123.com testing@home.org'" echo exit 1 } @@ -29,7 +47,7 @@ exit 1 fi echo -n "building mpack... " - ( cd $MPACKDIR && ./configure && make ) > build_mpack.out 2>&1 + ( cd $MPACKDIR && ./configure && $MAKE ) > build_mpack.out 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then echo @@ -160,68 +178,82 @@ genmakemodel() { # genmakemodel directory - GENMAKE2="../../../tools/genmake2" - ( - cd $1; - printf 'genmake ... ' 1>&2 - # ../../../tools/genmake -ieee -mods=../code > make.log 2>&1 - $GENMAKE2 -ds --mods=../code "--optfile="$OPTFILE > make.log 2>&1 - RETVAL=$? - for i in gm_state gm_optfile gm_local Makefile ; do - if test -r $i ; then - cp $i $CDIR + if test "x$NOGENMAKE" = xt ; then + echo "genmake skipped!" + else + GENMAKE2="$BASH ../../../tools/genmake2" + ( + cd $1; + printf 'genmake ... ' 1>&2 + # ../../../tools/genmake -ieee -mods=../code > make.log 2>&1 + $GENMAKE2 -ds -m $MAKE --mods=../code "--optfile="$OPTFILE > make.log 2>&1 + RETVAL=$? + for i in gm_state gm_optfile gm_local Makefile ; do + if test -r $i ; then + cp $i $CDIR + fi + done + if test "x$RETVAL" != x0 ; then + tail make.log + echo "genmakemodel: genmake failed" 1>&2 + cp make.log $CDIR + return 1 + else + echo "succesful" 1>&2 fi - done - if test "x$RETVAL" != x0 ; then - tail make.log - echo "genmakemodel: genmake failed" 1>&2 - cp make.log $CDIR - return 1 - else - echo "succesful" 1>&2 - fi - ) + ) + fi } makeclean() { # makeclean directory - ( - cd $1; - rm -f output.txt - printf 'make CLEAN ... ' 2>&1 - if test -r Makefile ; then - make CLEAN >> make.log 2>&1 - RETVAL=$? - if test "x$RETVAL" != x0 ; then - tail make.log - echo "makeclean: \"make CLEAN\" failed" 1>&2 - cp make.log $CDIR"/make.log" - return 1 + if test "x$NOCLEAN" = xt ; then + echo "make CLEAN skipped!" + else + ( + cd $1; + if test -e output.txt ; then + rm -f output.txt fi - fi - echo succesful 1>&2 - exit 0 - ) + printf 'make CLEAN ... ' 2>&1 + if test -r Makefile ; then + $MAKE CLEAN >> make.log 2>&1 + RETVAL=$? + if test "x$RETVAL" != x0 ; then + tail make.log + echo "makeclean: \"make CLEAN\" failed" 1>&2 + cp make.log $CDIR"/make.log" + return 1 + fi + fi + echo succesful 1>&2 + exit 0 + ) + fi } makedependmodel() { # makedependmodel directory - ( - cd $1; - printf 'make depend ... ' 1>&2 - make depend >> make.log 2>&1 - RETVAL=$? - if test "x$RETVAL" != x0 ; then - tail make.log - echo "makedependmodel: make depend failed" 1>&2 - cp make.log $CDIR"/make.log" - return 1 - else - echo succesful 1>&2 - fi - ) + if test "x$NODEPEND" = xt ; then + echo "make depend skipped!" + else + ( + cd $1; + printf 'make depend ... ' 1>&2 + $MAKE depend >> make.log 2>&1 + RETVAL=$? + if test "x$RETVAL" != x0 ; then + tail make.log + echo "makedependmodel: make depend failed" 1>&2 + cp make.log $CDIR"/make.log" + return 1 + else + echo succesful 1>&2 + fi + ) + fi } makemodel() @@ -231,7 +263,7 @@ cd $1; if test -r Makefile ; then printf 'make ... ' 1>&2 - make >> make.log 2>&1 + $MAKE >> make.log 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then tail make.log @@ -257,24 +289,21 @@ runmodel() { - # runmodel directory exe + # runmodel directory # - # runs the model "exe" in "directory" (exe is relative to directory) + # runs "$COMMAND" in "directory" + # (where "$COMMAND" is relative to "directory") ( cd $1 - if [ -x $2 ]; then - if [ $quick -eq 0 ]; then - rm -f output.txt - fi - printf 'runmodel: ' 1>&2 - make output.txt - RETVAL=$? - if test "x$RETVAL" = x0 ; then - cp output.txt $CDIR"/output.txt" - return 0 - else - return 1 - fi + printf 'runmodel: ' 1>&2 + # make output.txt + $COMMAND + RETVAL=$? + if test "x$RETVAL" = x0 ; then + cp output.txt $CDIR"/output.txt" + return 0 + else + return 1 fi ) } @@ -347,8 +376,8 @@ { cat - << EOF $0 [-help] [-quick] [-verbose] dir1 [dir2] [...] - -help Show this help message - -quick Skip "genmake" and "make depend" if the Makefile exists + + -help|-h Show this help message -quiet Reduce the amount of output -verbose Produce copious amounts of output -debug Produce even more output which will mean nothing to most @@ -383,16 +412,25 @@ # Default properties debug=0 verbose=1 -quick=0 clean=0 -ieee=1 expts='' +# ieee=1 + +CLEANUP=f +QUICK=f +NOGENMAKE=f +NOCLEAN=f +NODEPEND=f +BASH= OPTFILES= -ADDRESSES=edhill@mitgcm.org +ADDRESSES= TESTDIRS= MPACKDIR="../tools/mpack-1.6" MPACK="$MPACKDIR/mpack" +COMMAND="make output.txt" +MAKE=make +MPI=f echo -n "parsing options... " @@ -428,11 +466,37 @@ -tdir=* | --tdir=*) TESTDIRS=$ac_optarg ;; - -quick) quick=1 ;; + -bash | --bash | -b | --b) + ac_prev=BASH ;; + -bash=* | --bash=*) + BASH=$ac_optarg ;; + + -command | --command | -c | --c) + ac_prev=COMMAND ;; + -command=* | --command=*) + COMMAND=$ac_optarg ;; + + -make | --make | -m | --m) + ac_prev=MAKE ;; + -make=* | --make=*) + MAKE=$ac_optarg ;; + + -clean | --clean | -c | --c) + CLEANUP=t ;; + + -quick | --quick | -q | --q) + QUICK=t ;; + -nogenmake | --nogenmake | -ng | --ng) + NOGENMAKE=t ;; + -noclean | --noclean | -nc | --nc) + NOCLEAN=t ;; + -nodepend | --nodepend | -nd | --nd) + NODEPEND=t ;; + + -mpi) MPI=t ;; -verbose) verbose=2 ;; -debug) debug=1 ;; -clean) clean=1 ;; - -noieee) ieee=0 ;; -quiet) verbose=0 ;; -*) @@ -449,10 +513,26 @@ done +if test "x$QUICK" = xt ; then + NOGENMAKE=t + NOCLEAN=t + NODEPEND=t +fi + if test "x$TESTDIRS" = x ; then TESTDIRS=`scandirs` fi +if test "x$OPTFILES" = x ; then + OPTFILES=$MITGCM_OF +fi +if test "x$OPTFILES" = x ; then + echo "Error: please specify an optfile using either the command-line or" + echo " the MITGCM_OF environment variable. Also, examples are located " + echo " in \$ROOTDIR/tools/build_options" + exit 1 +fi + echo "OK" # create the FORTRAN comparison code @@ -506,6 +586,17 @@ # ...and each test directory... for dir in $TESTDIRS ; do + # Cleanup only! + if test "x$CLEANUP" = xt ; then + if test -r $dir/build/Makefile ; then + ( cd $dir/build ; make CLEAN ) + fi + if test -r $dir/input/Makefile ; then + ( cd $dir/input ; make CLEAN ) + fi + continue + fi + # Verify that the testdir exists and contains previous # results in the correct location--or skip this directory! if test ! -r $dir"/results/output.txt" ; then @@ -514,7 +605,43 @@ | tee -a $SUMMARY continue fi - + + # Is this an MPI run? + if test "x$MPI" = xt ; then + if test ! -r $dir"/code/CPP_EEOPTIONS.h_mpi" -o ! -r $dir"/code/SIZE.h_mpi" ; then + echo | tee -a $SUMMARY + echo "can't read \"$dir/code/CPP_EEOPTIONS.h_mpi\" or \"$dir/code/SIZE.h_mpi\"" \ + | tee -a $SUMMARY + continue + else + cmp $dir"/code/CPP_EEOPTIONS.h_mpi" $dir"/code/CPP_EEOPTIONS.h" + RETVAL=$? + if test "x$RETVAL" != x0 ; then + cp $dir"/code/CPP_EEOPTIONS.h_mpi" $dir"/code/CPP_EEOPTIONS.h" + fi + cmp $dir"/code/SIZE.h_mpi" $dir"/code/SIZE.h" + RETVAL=$? + if test "x$RETVAL" != x0 ; then + cp $dir"/code/SIZE.h_mpi" $dir"/code/SIZE.h" + fi + fi + else + if test -r $dir"/code/CPP_EEOPTIONS.h_nompi" ; then + cmp $dir"/code/CPP_EEOPTIONS.h_nompi" $dir"/code/CPP_EEOPTIONS.h" + RETVAL=$? + if test "x$RETVAL" != x0 ; then + cp $dir"/code/CPP_EEOPTIONS.h_nompi" $dir"/code/CPP_EEOPTIONS.h" + fi + fi + if test -r $dir"/code/SIZE.h_nompi" ; then + cmp $dir"/code/SIZE.h_nompi" $dir"/code/SIZE.h" + RETVAL=$? + if test "x$RETVAL" != x0 ; then + cp $dir"/code/SIZE.h_nompi" $dir"/code/SIZE.h" + fi + fi + fi + # Create an output dir for each OPTFILE/tdir combination CDIR=$DRESULTS"/"$DRESULTS"_"$NDIR mkdir $CDIR @@ -527,7 +654,7 @@ echo unset genmake makedepend make run results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --' - ( cd $dir/input; rm -f *.{o,f,c,F} *.[f,F]90 work* output.txt Make* make.log; ) + if [ -r $dir/build ]; then seperatebuilddir=1 builddir=build @@ -539,13 +666,18 @@ rundir=input fi - genmakemodel $dir/$builddir && genmake=Y \ - && makeclean $dir/$builddir \ - && makedependmodel $dir/$builddir && makedepend=Y \ - && makemodel $dir/$builddir && make=Y \ - && linkdata $seperatebuilddir $dir/$rundir \ - && runmodel $dir/$builddir mitgcmuv && run=Y \ - && results=`testoutput $dir $rundir` + if test "x$CLEANUP" = xt ; then + makeclean $dir/$builddir + else + genmakemodel $dir/$builddir && genmake=Y \ + && makeclean $dir/$builddir \ + && makedependmodel $dir/$builddir && makedepend=Y \ + && makemodel $dir/$builddir && make=Y \ + && linkdata $seperatebuilddir $dir/$rundir \ + && runmodel $dir/$builddir && run=Y \ + && results=`testoutput $dir $rundir` + fi + echo formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} \ ${run:-N} $results @@ -567,12 +699,16 @@ gzip $NDIR".tar" ) - $MPACK -s MITgcm-test -m 1000000 $DRESULTS"/"$NDIR".tar.gz" $ADDRESSES - RETVAL=$? - if test "x$RETVAL" != x0 ; then - echo "Warning: \"$MPACK\" failed -- please contact " + if test "x$ADDRESSES" = xNONE -o "x$ADDRESSES" = x ; then + echo "No mail sent" else - rm -f $DRESULTS"/"$NDIR".tar*" + $MPACK -s MITgcm-test -m 1000000 $DRESULTS"/"$NDIR".tar.gz" $ADDRESSES + RETVAL=$? + if test "x$RETVAL" != x0 ; then + echo "Warning: \"$MPACK\" failed -- please contact " + else + rm -f $DRESULTS"/"$NDIR".tar*" + fi fi NDIR=$(( $NDIR + 1 ))