--- MITgcm/verification/testreport 2003/11/29 00:58:43 1.22 +++ MITgcm/verification/testreport 2003/12/05 17:36:03 1.29 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.22 2003/11/29 00:58:43 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/verification/testreport,v 1.29 2003/12/05 17:36:03 adcroft Exp $ # $Name: $ # @@ -22,6 +22,7 @@ echo " (-b|-bash) STRING preferred location of a \"bash\" or" echo " Bourne-compatible \"sh\" shell" echo " (DEF=\"\" for \"bash\")" + echo " (-adm|-ad) perform an adjoint run" echo " (-command) STRING command to run" echo " (DEF=\"make output.txt\")" echo " (-m|-make) STRING command to use for \"make\"" @@ -54,7 +55,10 @@ HAVE_MPACK=f fi echo -n "building mpack... " - ( cd $MPACKDIR && ./configure && $MAKE ) > build_mpack.out 2>&1 + if test "x$CC" = x ; then + export CC=cc + fi + ( cd $MPACKDIR && ./configure && $MAKE ) > tr_build_mpack.out 2>&1 RETVAL=$? if test "x$RETVAL" != x0 ; then echo @@ -62,6 +66,7 @@ echo HAVE_MPACK=f else + rm -f tr_build_mpack.out HAVE_MPACK=t fi else @@ -70,15 +75,6 @@ echo "OK" } -compare_lines() -{ - # use codelet to compare lines - if [ $verbose -gt 1 ]; then - cat tmp3.txt 1>&2 - fi - return `./a.out < tmp3.txt` -} - testoutput_for_prop() { # testoutput_for_prop dir s1 label subdir @@ -124,7 +120,9 @@ cat tmp3.txt 1>&2 fi echo "-1" >> tmp3.txt - digits_of_similarity=`./tmp_cmpnum < tmp3.txt` + # On the SGI O3K (*not* the O2K), "cat -n" inserts a ":" after the line number + cat tmp3.txt | sed -e 's|:||g' > tmp4.txt + digits_of_similarity=`./tmp_cmpnum < tmp4.txt` if [ $digits_of_similarity -eq 99 ]; then if [ $verbose -gt 0 ]; then echo testoutput_for_prop: No comparison was available for \"$2\" 1>&2 @@ -135,7 +133,7 @@ echo There were $digits_of_similarity decimal places of similarity for \"$2\" 1>&2 fi fi - rm tmp1.txt tmp2.txt tmp3.txt + rm -f tmp1.txt tmp2.txt tmp3.txt tmp4.txt return $digits_of_similarity } @@ -155,38 +153,56 @@ done } +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 + join t05.txt t15.txt > t5.txt + join t06.txt t16.txt > t6.txt + echo "-1" >> t5.txt + echo "-1" >> t6.txt + digits_5=`./tmp_cmpnum < t5.txt` + digits_6=`./tmp_cmpnum < t6.txt` + dashnum $digits_5 $digits_6 + rm -f t[01][56].txt t[56].txt +} + testoutput() { - # testoutput diretory subdir + # testoutput directory subdir # # test output in "directory" - - if [ $debug -gt 0 ]; then - echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2 - fi - testoutput_for_prop $1 "cg2d_init_res" "cg2d init. residual" $2; cg2dres=$? - if [ $debug -gt 0 ]; then - echo testoutput: cg2dres=$cg2dres 1>&2 + if test "x$ADM" = x ; then + if [ $debug -gt 0 ]; then + echo testoutput: testoutput_for_prop $1 cg2d_init_res 1>&2 + fi + testoutput_for_prop $1 "cg2d_init_res" "cg2d init. residual" $2; cg2dres=$? + if [ $debug -gt 0 ]; then + echo testoutput: cg2dres=$cg2dres 1>&2 + fi + testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$? + testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$? + testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$? + testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2; tsd=$? + testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2; smin=$? + testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2; smax=$? + testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2; smean=$? + testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2; ssd=$? + testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2; umin=$? + testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2; umax=$? + testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2; umean=$? + testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2; usd=$? + testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2; vmin=$? + testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2; vmax=$? + testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2; vmean=$? + testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2; vsd=$? + dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \ + $umin $umax $umean $usd $vmin $vmax $vmean $vsd + else + testoutput_ad $1 $2 "precision_grdchk_result" fi - testoutput_for_prop $1 "dynstat_theta_min" "theta minimum" $2; tmin=$? - testoutput_for_prop $1 "dynstat_theta_max" "theta maximum" $2; tmax=$? - testoutput_for_prop $1 "dynstat_theta_mean" "theta mean" $2; tmean=$? - testoutput_for_prop $1 "dynstat_theta_sd" "theta s.d." $2; tsd=$? - testoutput_for_prop $1 "dynstat_salt_min" "salt minimum" $2; smin=$? - testoutput_for_prop $1 "dynstat_salt_max" "salt maximum" $2; smax=$? - testoutput_for_prop $1 "dynstat_salt_mean" "salt mean" $2; smean=$? - testoutput_for_prop $1 "dynstat_salt_sd" "salt s.d." $2; ssd=$? - testoutput_for_prop $1 "dynstat_uvel_min" "U minimum" $2; umin=$? - testoutput_for_prop $1 "dynstat_uvel_max" "U maximum" $2; umax=$? - testoutput_for_prop $1 "dynstat_uvel_mean" "U mean" $2; umean=$? - testoutput_for_prop $1 "dynstat_uvel_sd" "U s.d." $2; usd=$? - testoutput_for_prop $1 "dynstat_vvel_min" "V minimum" $2; vmin=$? - testoutput_for_prop $1 "dynstat_vvel_max" "V maximum" $2; vmax=$? - testoutput_for_prop $1 "dynstat_vvel_mean" "V mean" $2; vmean=$? - testoutput_for_prop $1 "dynstat_vvel_sd" "V s.d." $2; vsd=$? - - dashnum $cg2dres $tmin $tmax $tmean $tsd $smin $smax $smean $ssd \ - $umin $umax $umean $usd $vmin $vmax $vmean $vsd } genmakemodel() @@ -198,7 +214,13 @@ GENMAKE2="$BASH ../../../tools/genmake2" ( cd $1; - command="$GENMAKE2 -ds -m $MAKE --mods=../code" + command="$GENMAKE2 -ds -m $MAKE" + if test "x$ADM" = x ; then + 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" fi @@ -279,7 +301,11 @@ cd $1; if test -r Makefile ; then printf 'make ... ' 1>&2 - $MAKE >> make.log 2>&1 + if test "x$ADM" = x ; then + $MAKE >> make.log 2>&1 + else + $MAKE adall >> make.log 2>&1 + fi RETVAL=$? if test "x$RETVAL" != x0 ; then tail make.log @@ -293,6 +319,53 @@ ) } +symlink_mpifiles() +{ + # Put special links so that MPI specific files are used + # This MUST be invoked between makeclean and makelinks because + # the Makefile will link to non-mpi files by default + + dir=$1 + code_dir=$2 + BUILD_DIR=$dir/$3 + CODE_DIR=$dir/$code_dir + + # These are files that should replace their counter-part when using -mpi + MPI_FILES=`(cd $CODE_DIR; find . -name "*_mpi")` + + # Is this an MPI run? + if test "x$MPI" = xt ; then + # YES: We symbolically link these files to the build + # dir so long as there is no real file in place + for ii in $MPI_FILES ; do + i=`echo $ii | sed 's:^\./::'` + name=`echo $i | sed 's:_mpi::' ` + cmp $CODE_DIR/$i $BUILD_DIR/$name > /dev/null 2>&1 + RETVAL=$? + if test "x$RETVAL" != x0 ; then + if ! test -f $BUILD_DIR/$i ; then + #echo Linking $name to $i + (cd $BUILD_DIR; ln -sf ../$code_dir/$i $name) + fi + fi + done + else + # NO: We undo any _mpi symbolically linked files + for ii in $MPI_FILES ; do + i=`echo $ii | sed 's:^\./::'` + name=`echo $i | sed 's:_mpi::' ` + if test -L $BUILD_DIR/$name ; then + linktarg=`(cd $BUILD_DIR; readlink $name)` + if test $linktarg = "../$code_dir/$name"_mpi ; then + #echo Un-linking $name from $linktarg + rm -f $BUILD_DIR/$name + fi + fi + done + fi + +} + linkdata() { # linkdata flag @@ -301,12 +374,27 @@ if test "x$1" = x1 ; then ( cd $2 - files=`( cd ../input ; ls -1 | grep -v CVS )` - for i in $files ; do - if test ! -d "../input/"$i ; then - ln -sf "../input/"$i $i - fi - done + 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 + 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 + fi ) fi } @@ -315,7 +403,7 @@ { # runmodel directory # - # runs "$COMMAND" in "directory" + # runs "$COMMAND in "directory" # (where "$COMMAND" is relative to "directory") ( cd $1 @@ -325,7 +413,11 @@ RETVAL=$? if test "x$RETVAL" = x0 ; then echo successful 1>&2 - cp output.txt $CDIR"/output.txt" + if test "x$ADM" = x ; then + cp output.txt $CDIR"/output.txt" + else + cp output.txt_adm $CDIR"/output.txt_adm" + fi return 0 else tail run.log @@ -463,10 +555,12 @@ MPACKDIR="../tools/mpack-1.6" HAVE_MPACK= MPACK="$MPACKDIR/mpack" -COMMAND="make output.txt" +COMMAND= MAKE=make MPI=f +ADM= + echo -n "parsing options... " ac_prev= @@ -530,6 +624,8 @@ -mpi) MPI=t ;; + -adm | -ad) ADM=t ;; + -ieee) IEEE=true ;; -noieee) IEEE= ;; @@ -565,6 +661,14 @@ OPTFILE=$MITGCM_OF fi +if test "x$ADM" = xt -a "x$COMMAND" = x ; then + COMMAND="./mitgcmuv_ad > output.txt_adm 2>&1" +fi + +if test "x$COMMAND" = x ; then + COMMAND="make output.txt" +fi + echo "OK" # create the FORTRAN comparison code @@ -577,7 +681,7 @@ MACH=`hostname` UNAMEA=`uname -a` DATE=`date +%Y%m%d` -BASE=$MACH"_"$DATE"_" +BASE="tr_"$MACH"_"$DATE"_" DNUM=0 DRESULTS="$BASE$DNUM" while test -e $DRESULTS ; do @@ -622,7 +726,8 @@ fi echo echo >> $SUMMARY -cat << EOF | tee -a $SUMMARY +if test "x$ADM" = x ; then + cat << EOF | tee -a $SUMMARY T S U V G D M c m s m s m s m s E p a R g m m e . m m e . m m e . m m e . @@ -630,6 +735,17 @@ 2 d e n d n x n . n x n . n x n . n x n . EOF +else + echo "ADJOINT=true" >> $SUMMARY + echo >> $SUMMARY + cat << EOF | tee -a $SUMMARY +G D M C G +E p a R o r +N n k u s a +2 d e n t d + +EOF +fi # ...and each test directory... for dir in $TESTDIRS ; do @@ -647,18 +763,17 @@ # 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 - echo "can't read \"$dir/results/output.txt\" -- skipping $dir" + fout= + if test "x$ADM" = x ; then + fout=$dir"/results/output.txt" + else + fout=$dir"/results_ad/output.txt_adm" + fi + if test ! -r $fout ; then + echo "can't read \"$fout\" -- skipping $dir" continue fi - echo "-------------------------------------------------------------------------------" - echo - echo "Experiment: $dir" - echo - unset genmake makedepend make run - results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --' - builddir="input" rundir="input" use_seperate_build=0 @@ -669,46 +784,27 @@ linkdata $use_seperate_build $dir/$rundir fi - CODE_DIR=$dir/code - BUILD_DIR=$dir/$builddir - MPI_FILES="CPP_EEOPTIONS.h_mpi SIZE.h_mpi" - NOMPI_FILES="CPP_EEOPTIONS.h_nompi SIZE.h_nompi" - - # Is this an MPI run? - if test "x$MPI" = xt ; then - FILES=$MPI_FILES - endings="_mpi" + if test "x$ADM" = x ; then + code_dir=code + CODE_DIR=$dir/code else - FILES=$NOMPI_FILES - endings="_nompi" + code_dir=code_ad + CODE_DIR=$dir/code_ad fi - - # Check to see that we have the files - have_files=t - for i in $FILES ; do - if test ! -r $CODE_DIR/$i ; then - echo "Warning: can't read file $CODE_DIR/$i" - have_files=f - fi - done - if test "x$have_files" != xt -a "x$MPI" = xt ; then - echo "Skipping $dir due to lack of input files (see above warning)" + BUILD_DIR=$dir/$builddir + + if test ! -r $CODE_DIR"/SIZE.h_mpi" -a "x$MPI" == "xt" ; then + echo "can't find \"$CODE_DIR/SIZE.h_mpi\" -- skipping $dir" continue fi - - # If we have the $FILES and they differ, copy the $FILES to $BUILD_DIR - if test "x$have_files" = xt ; then - for i in $FILES ; do - sstr="s|$endings||" - name=`echo $i | sed -e $sstr ` - cmp $CODE_DIR/$i $BUILD_DIR/$name > /dev/null 2>&1 - RETVAL=$? - if test "x$RETVAL" != x0 ; then - cp $CODE_DIR/$i $BUILD_DIR/$name - fi - done - fi - + + echo "-------------------------------------------------------------------------------" + echo + echo "Experiment: $dir" + echo + unset genmake makedepend make run + results='-- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --' + # Create an output dir for each OPTFILE/tdir combination rel_CDIR=$DRESULTS"/"$dir mkdir $rel_CDIR @@ -719,6 +815,7 @@ else genmakemodel $dir/$builddir && genmake=Y \ && makeclean $dir/$builddir \ + && symlink_mpifiles $dir $code_dir $builddir \ && makedependmodel $dir/$builddir && makedepend=Y \ && makemodel $dir/$builddir && make=Y \ && linkdata $use_seperate_build $dir/$rundir \ @@ -727,7 +824,12 @@ fi echo - fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results` + if test "x$ADM" = x ; then + fres=`formatresults $dir ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N} $results` + else + fres=`printf '%s %s %s %s' ${genmake:-N} ${makedepend:-N} ${make:-N} ${run:-N}` + fres=$fres"$results $dir" + fi echo echo "$fres" >> $SUMMARY echo "fresults='$fres'" > $CDIR"/summary.txt" @@ -777,9 +879,9 @@ if test "x$CLEANUP" != xt ; then cat $SUMMARY - if test -e tr.out ; then - mv tr.out tr.out.old + if test -e tr_out.txt ; then + mv tr_out.txt tr_out.txt.old fi - cat $SUMMARY > tr.out + cat $SUMMARY > tr_out.txt fi