/[MITgcm]/MITgcm/tools/genmake2

Diff of /MITgcm/tools/genmake2

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

-revision 1.232 by jahn,
Fri Aug 10 17:59:13 2012 UTC
+revision 1.237 by jmc,
Fri Aug 24 23:41:17 2012 UTC
 Line 17 
 Usage: "$0" [OPTIONS]
    where [OPTIONS] can be:
      -help | --help | -h | --h
            Print this help message and exit.
      -adoptfile NAME | --adoptfile NAME | -adof NAME | --adof NAME
        -adoptfile=NAME | --adoptfile=NAME | -adof=NAME | --adof=NAME
            Use "NAME" as the adoptfile.  By default, the file at
            "tools/adjoint_options/adjoint_default" will be used.
      -nooptfile | --nooptfile
        -optfile NAME | --optfile NAME | -of NAME | --of NAME
        -optfile=NAME | --optfile=NAME | -of=NAME | --of=NAME
            Use "NAME" as the optfile.  By default, an attempt will be
            made to find an appropriate "standard" optfile in the
            tools/build_options/ directory.
      -pdepend NAME | --pdepend NAME
        -pdepend=NAME | --pdepend=NAME
            Get package dependency information from "NAME".
      -pgroups NAME | --pgroups NAME
        -pgroups=NAME | --pgroups=NAME
            Get the package groups information from "NAME".
      -bash NAME
            Explicitly specify the Bourne or BASH shell to use
      -make NAME | -m NAME
        --make=NAME | -m=NAME
            Use "NAME" for the MAKE program. The default is "make" but
            many platforms, "gmake" is the preferred choice.
      -makefile NAME | -mf NAME
        --makefile=NAME | -mf=NAME
            Call the makefile "NAME".  The default is "Makefile".
      -makedepend NAME | -md NAME
        --makedepend=NAME | -md=NAME
            Use "NAME" for the MAKEDEPEND program.
      -rootdir NAME | --rootdir NAME | -rd NAME | --rd NAME
        -rootdir=NAME | --rootdir=NAME | -rd=NAME | --rd=NAME
            Specify the location of the MITgcm ROOTDIR as "NAME".
            By default, genamke will try to find the location by
            looking in parent directories (up to the 5th parent).
      -mods NAME | --mods NAME | -mo NAME | --mo NAME
        -mods=NAME | --mods=NAME | -mo=NAME | --mo=NAME
            Here, "NAME" specifies a list of directories that are
            used for additional source code.  Files found in the
            "mods list" are given preference over files of the same
            name found elsewhere.
      -disable NAME | --disable NAME
        -disable=NAME | --disable=NAME
            Here "NAME" specifies a list of packages that we don't
            want to use.  If this violates package dependencies,
            genamke will exit with an error message.
      -enable NAME | --enable NAME
        -enable=NAME | --enable=NAME
            Here "NAME" specifies a list of packages that we wish
            to specifically enable.  If this violates package
            dependencies, genamke will exit with an error message.
      -standarddirs NAME | --standarddirs NAME
        -standarddirs=NAME | --standarddirs=NAME
            Here, "NAME" specifies a list of directories to be
            used as the "standard" code.
      -fortran NAME | --fortran NAME | -fc NAME | --fc NAME
        -fc=NAME | --fc=NAME
            Use "NAME" as the fortran compiler.  By default, genmake
            will search for a working compiler by trying a list of
            "usual suspects" such as g77, f77, etc.
      -cc NAME | --cc NAME | -cc=NAME | --cc=NAME
            Use "NAME" as the C compiler.  By default, genmake
            will search for a working compiler by trying a list of
            "usual suspects" such as gcc, c89, cc, etc.
      -use_real4 | -use_r4 | -ur4 | --use_real4 | --use_r4 | --ur4
            Use "real*4" type for _RS variable (#undef REAL4_IS_SLOW)
            *only* works if CPP_EEOPTIONS.h allows this.
      -ignoretime | -ignore_time | --ignoretime | --ignore_time
            Ignore all the "wall clock" routines entirely.  This will
            not in any way hurt the model results -- it simply means
            that the code that checks how long the model spends in
            various routines will give junk values.
      -ts | --ts
            Produce timing information per timestep
      -papis | --papis
            Produce summary MFlop/s (and IPC) with PAPI per timestep
      -pcls | --pcls
            Produce summary MFlop/s etc. with PCL per timestep
      -foolad | --foolad
            Fool the AD code generator
      -papi | --papi
            Performance analysis with PAPI
      -pcl | --pcl
            Performance analysis with PCL
      -hpmt | --hpmt
            Performance analysis with the HPM Toolkit
      -ieee | --ieee
            use IEEE numerics.  Note that this option *only* works
            if it is supported by the OPTFILE that is being used.
      -devel | --devel
            Add additional warning and debugging flags for development
            (if supported by the OPTFILE); also switch to IEEE numerics.
      -gsl | --gsl
            Use GSL to control floating point rounding and precision
      -mpi | --mpi
            Include MPI header files and link to MPI libraries
      -mpi=PATH | --mpi=PATH
            Include MPI header files and link to MPI libraries using MPI_ROOT
            set to PATH. i.e. Include files from \$PATH/include, link to libraries
            from \$PATH/lib and use binaries from \$PATH/bin.
      -omp | --omp
            Activate OpenMP code + use Compiler option OMPFLAG
      -omp=OMPFLAG | --omp=OMPFLAG
            Activate OpenMP code + use Compiler option OMPFLAG
      -es | --es | -embed-source | --embed-source
            Embed a tarball containing the full source code
            (including the Makefile, etc.) used to build the
            executable [off by default]
      -ds | --ds
            Report genmake internal variables status (DUMPSTATE)
            to file "genmake_state" (for debug purpose)
    While it is most often a single word, the "NAME" variables specified
    above can in many cases be a space-delimited string such as:
 Line 207 
 test_for_string_in_file() {
      RETVAL=$?
      if test "x${RETVAL}" = x0 ; then
          printf "Error: In $file there is an illegal line: "
          grep -i "$strng" $file
          exit 99
      fi
      return 0
 Line 305 
 EOF
              FS90='fr9'
              check_for_broken_Ff
          else
-             cat <<EOF 2>&1
+             echo "ERROR: test: '$MAKE -f $MAKEFILE genmake_hello.$tfs' Failed"
- ERROR: Your file system cannot distinguish between *.F and *.f files
+             echo "       see simple makefile: '$MAKEFILE' (left here)"
-   (fails the "make/ln" test) and this program cannot find a suitable
+             echo "  Please check (1) your '$MAKE' command, (2) your '$LN' command"
-   replacement extension.  Please try a different build environment or
+             echo "           and (3) the allowed sufix '.F' and '.$tfs' in makefile"
-   contact the <MITgcm-support@mitgcm.org> list for help.
+             echo "  or contact the <MITgcm-support@mitgcm.org> list for help."
+             echo ""
- EOF
              exit -1
              return
          fi
-Line 436 
 build_embed_encode()
+Line 435 
 build_embed_encode()
  {
      printf "  building the embed-encode utility...  "
      if test ! -e "$ROOTDIR/tools/embed_encode/encode_files" ; then
          if test ! -d "$ROOTDIR/tools/embed_encode" ; then
              echo
              echo "    Error: can't locate \"$ROOTDIR/tools/embed_encode\""
              echo
              EMBED_SRC=f
              return 1
          fi
          clist="cc gcc c89 $CC"
          for ic in $clist ; do
              comm="$ic -o encode_files encode_files.c"
-Line 578 
 EOF
+Line 577 
 EOF
      if test "x$OPTFILE" = x ; then
          OPTFILE=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$FC
          if test ! -r $OPTFILE ; then
               echo "  I looked for the file "$OPTFILE" but did not find it"
          fi
      fi
      if test "x$OPTFILE" = x ; then
-Line 650 
 get_fortran_c_namemangling()  {
+Line 649 
 get_fortran_c_namemangling()  {
      #echo "FC_NAMEMANGLE = \"$FC_NAMEMANGLE\""
      if test ! "x$FC_NAMEMANGLE" = x ; then
          return 0
      fi
      echo " running: get_fortran_c_namemangling()" >> $LOGFILE
-Line 1037 
 check_lapack_libs()  {
+Line 1036 
 check_lapack_libs()  {
      echo "running: check_lapack_libs()" >> $LOGFILE
      cat <<EOF > genmake_tla.F
        program fgenla
        integer info
        integer ipiv( 2 )
        double precision ab( 4, 2 ), b( 2 )
        data ab / 0., 0., 1., 2., 0., 2., 1., 0. /
-Line 1108 
 EOF
+Line 1107 
 EOF
                  LIBS="$LIBS -llapack -lf77blas -lcblas"
                  HAVE_LAPACK=t
                  echo "check_lapack: successful" >> $LOGFILE
              else
              # try again with "-latlas" added to the libs
                  echo "==> try again with added '-llapack -lf77blas -lcblas -latlas'" > genmake_tla.log
                  echo "cat genmake_tla.F | $CPP $DEFINES $INCLUDES > genmake_tla.$FS \ " >> genmake_tla.log
                  echo " &&  $FC $FFLAGS $FOPTIM -c genmake_tla.$FS \ " >> genmake_tla.log
                  echo " &&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS -llapack -lf77blas -lcblas -latlas" >> genmake_tla.log
                  cat genmake_tla.F | $CPP $DEFINES $INCLUDES > genmake_tla.$FS 2>/dev/null  \
                      &&  $FC $FFLAGS $FOPTIM -c genmake_tla.$FS >> genmake_tla.log 2>&1  \
                      &&  $LINK $FFLAGS $FOPTIM -o genmake_tla genmake_tla.o $LIBS -llapack -lf77blas -lcblas -latlas >> genmake_tla.log 2>&1
                  RET_COMPILE=$?
                  echo >> $LOGFILE
                  cat genmake_tla.log >> $LOGFILE
                  if test "x$RET_COMPILE" = x0 ; then
                      LIBS="$LIBS -llapack -lf77blas -lcblas -latlas"
                      HAVE_LAPACK=t
                      echo "check_lapack: successful" >> $LOGFILE
                  fi
              fi
          fi
      fi
-Line 1207 
 SOURCEDIRS=
+Line 1206 
 SOURCEDIRS=
  INCLUDEDIRS=
  STANDARDDIRS="USE_THE_DEFAULT"
+ #- local config file
+ gm_local="genmake_local"
  G2ARGS=
  BASH=
  PWD=`pwd`
-Line 1278 
 LOGFILE="genmake.log"
+Line 1280 
 LOGFILE="genmake.log"
  rm -f genmake_state genmake_*optfile $LOGFILE
  echo "===  Processing options files and arguments  ==="
- gm_local="genmake_local"
- printf "  getting local config information:  "
- if test -f $gm_local ; then
-     echo "using $gm_local"
-     . $gm_local
-     # echo "DISABLE=$DISABLE"
-     # echo "ENABLE=$ENABLE"
- else
-     echo "none found"
- fi
  #echo "$0::$1:$2:$3:$4:$5:$6:$7:"
  #parse_options
-Line 1306 
 for ac_option in "$@" ; do
+Line 1298 
 for ac_option in "$@" ; do
      ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
      case $ac_option in
          -help | --help | -h | --h)
              usage ;;
          -nooptfile | --nooptfile)
              OPTFILE="NONE" ;;
          -optfile | --optfile | -of | --of)
              ac_prev=OPTFILE ;;
          -optfile=* | --optfile=* | -of=* | --of=*)
              OPTFILE=$ac_optarg ;;
          -adoptfile | --adoptfile | -adof | --adof)
              ac_prev=AD_OPTFILE ;;
          -adoptfile=* | --adoptfile=* | -adof=* | --adof=*)
              AD_OPTFILE=$ac_optarg ;;
          -pdepend | --pdepend)
              ac_prev=PKG_DEPEND ;;
          -pdepend=* | --pdepend=*)
              PKG_DEPEND=$ac_optarg ;;
          -pgroups | --pgroups)
              ac_prev=PKG_GROUPS ;;
          -pgroups=* | --pgroups=*)
              PKG_GROUPS=$ac_optarg ;;
          -make | --make | -m | --m)
              ac_prev=MAKE ;;
          -make=* | --make=* | -m=* | --m=*)
              MAKE=$ac_optarg ;;
          -bash | --bash)
              ac_prev=BASH ;;
          -bash=* | --bash=*)
              BASH=$ac_optarg ;;
          -makedepend | --makedepend | -md | --md)
              ac_prev=MAKEDEPEND ;;
          -makedepend=* | --makedepend=* | -md=* | --md=*)
              MAKEDEPEND=$ac_optarg ;;
-         -makefile | --makefile | -ma | --ma)
+         -makefile | --makefile | -mf | --mf)
              ac_prev=MAKEFILE ;;
-         -makefile=* | --makefile=* | -ma=* | --ma=*)
+         -makefile=* | --makefile=* | -mf=* | --mf=*)
              MAKEFILE=$ac_optarg ;;
          -platform | --platform | -pl | --pl | -platform=* | --platform=* | -pl=* | --pl=*)
              echo "ERROR: The platform option has been removed.  Please specify"
              echo "  the build options using the \"optfile\" mechanism."
              echo
              usage
              ;;
          -rootdir | --rootdir | -rd | --rd)
              ac_prev=ROOTDIR ;;
          -rootdir=* | --rootdir=* | -rd=* | --rd=*)
              ROOTDIR=$ac_optarg ;;
          -mods | --mods | -mo | --mo)
              ac_prev=MODS ;;
          -mods=* | --mods=* | -mo=* | --mo=*)
              MODS=$ac_optarg ;;
          -disable | --disable)
              ac_prev=DISABLE ;;
          -disable=* | --disable=*)
              DISABLE=$ac_optarg ;;
          -enable | --enable)
              ac_prev=ENABLE ;;
          -enable=* | --enable=*)
              ENABLE=$ac_optarg ;;
          -standarddirs | --standarddirs)
              ac_prev=STANDARDDIRS ;;
          -standarddirs=* | --standarddirs=*)
-Line 1388 
 for ac_option in "$@" ; do
+Line 1380 
 for ac_option in "$@" ; do
  #               ac_prev=cpp ;;
  #           -cpp=* | --cpp=*)
  #               CPP=$ac_optarg ;;
          -cc | --cc)
              ac_prev=CC ;;
          -cc=* | --cc=*)
              CC=$ac_optarg ;;
          -fortran | --fortran | -fc | --fc)
              ac_prev=FC ;;
          -fc=* | --fc=*)
              FC=$ac_optarg ;;
          -fs | --fs)
              ac_prev=FS ;;
          -fs=* | --fs=*)
              FS=$ac_optarg ;;
          -fs90 | --fs90)
              ac_prev=FS90 ;;
          -fs90=* | --fs90=*)
              FS90=$ac_optarg ;;
          -use_real4 | -use_r4 | -ur4 | --use_real4 | --use_r4 | --ur4 )
              USE_R4=true ;;
-Line 1416 
 for ac_option in "$@" ; do
+Line 1408 
 for ac_option in "$@" ; do
              IEEE=true ;;
          -noieee | --noieee)
              echo "Warning: ignore option '$ac_option' (default is already without '-ieee')" ;;
          -devel | --devel)
              IEEE=true ; DEVEL=true ;;
          -gsl | --gsl)
              GSL=true ;;
          -ts | --ts)
-Line 1441 
 for ac_option in "$@" ; do
+Line 1433 
 for ac_option in "$@" ; do
          -mpi=* | --mpi=*)
              MPIPATH=$ac_optarg
              MPI=true ;;
          -omp | --omp)
              OMP=true ;;
          -omp=* | --omp=*)
              OMPFLAG=$ac_optarg
              OMP=true ;;
          -ds | --ds)
              DUMPSTATE=t ;;
          -extra_flag | --extra_flag)
              ac_prev=FEXTRAFLAGS ;;
          -extra_flag=* | --extra_flag=*)
              FEXTRAFLAGS=$ac_optarg ;;
          -taf_extra | --taf_extra)
              ac_prev=TAF_EXTRA ;;
          -taf_extra=* | --taf_extra=*)
-Line 1465 
 for ac_option in "$@" ; do
+Line 1457 
 for ac_option in "$@" ; do
              ac_prev=TAMC_EXTRA ;;
          -tamc_extra=* | --tamc_extra=*)
              TAMC_EXTRA=$ac_optarg ;;
          -ignoretime | -ignore_time | --ignoretime | --ignore_time)
              IGNORE_TIME="-DIGNORE_TIME" ;;
-Line 1476 
 for ac_option in "$@" ; do
+Line 1468 
 for ac_option in "$@" ; do
              echo "Error: unrecognized option: "$ac_option
              usage
              ;;
          *)
              echo "Error: unrecognized argument: "$ac_option
              usage
              ;;
      esac
  done
+ printf "  getting local config information:  "
+ if test -f $gm_local ; then
+     echo "using $gm_local"
+     . $gm_local
+ else
+     echo "none found"
+ fi
  if test -f ./.genmakerc ; then
      echo
      echo "WARNING: genmake2 has detected a copy of the old-style \"./.genmakerc\""
 Line 1714 
 fi
  if test ! "x$TS" = x ; then
        echo "  Turning on timing per timestep"
        if test ! "x$FOOLAD" = x ; then
              DEFINES="$DEFINES -DTIME_PER_TIMESTEP_SFP"
        else
              DEFINES="$DEFINES -DTIME_PER_TIMESTEP"
        fi
 Line 1750 
 if test ! "x$PAPI" = x ; then
            echo "  Sticking with PAPI flop summary per timestep!"
        else
            echo "  Turning on performance analysis with PAPI"
            echo "  Please make sure PAPIINC, PAPILIB are defined"
            DEFINES="$DEFINES -DUSE_PAPI"
            INCLUDES="$INCLUDES $PAPIINC"
            LIBS="$LIBS $PAPILIB"
 Line 1762 
 if test ! "x$PCL" = x ; then
            echo "  Sticking with PCL flop summary per timestep!"
        else
            echo "  Turning on performance analysis with PCL"
            echo "  Please make sure PCLINC, PCLLIB are defined"
            DEFINES="$DEFINES -DUSE_PCL"
            INCLUDES="$INCLUDES $PCLINC"
            LIBS="$LIBS $PCLLIB"
 Line 1772 
 if test ! "x$HPMT" = x ; then
        if test ! "x$PAPI" = x ; then
            echo "  PAPI and the HPM Toolkit cannot co-exist!"
            echo "  Sticking with PAPI!"
-       else if test ! "x$PCL" = x ; then
+       else
+         if test ! "x$PCL" = x ; then
            echo "  PCL and the HPM Toolkit cannot co-exist!"
            echo "  Sticking with PCL!"
-       else
+         else
            echo "  Turning on performance analysis with the HPM Toolkit"
            echo "  Please make sure HPMTINC, HPMTLIB are defined"
            DEFINES="$DEFINES -DUSE_LIBHPM"
            INCLUDES="$INCLUDES $HPMTINC"
            LIBS="$LIBS $HPMTLIB"
-       fi
+         fi
        fi
  fi
  if test ! "x$GSL" = x ; then
-Line 2106 
 else
+Line 2107 
 else
          exit 1
      else
          echo "    using PKG_LIST=\"$PKG_LIST\""
          #  Strip the comments and add all the names
          pkg_list=`cat $PKG_LIST | sed -e 's/#.*$//g' | $AWK '(NF>0){print $0}'`
          RETVAL=$?
          if test "x${RETVAL}" != x0 ; then
-Line 2156 
 for i in $PACKAGES ; do
+Line 2157 
 for i in $PACKAGES ; do
      j=`echo $i | sed 's/[-+]//'`
      if test ! -d "$ROOTDIR/pkg/$j" ; then
          echo "Error: dir '$ROOTDIR/pkg/$i' missing for package '$i'"
          exit 1
      fi
      echo $i >> ./.tmp_pack
  done
-Line 2201 
 else
+Line 2202 
 else
          echo "Error: problem encountered while building source files in pkg/mnc:"
          cat make_mnc.errors 1>&2
          if test "x$mnc_in" = x0 ; then
              exit 1
          else
              DISABLE="$DISABLE mnc"
          fi
-Line 2300 
 if  test "x${PKG_DEPEND}" != x ; then
+Line 2301 
 if  test "x${PKG_DEPEND}" != x ; then
          #  Do we need to add $dname according to the dependency rules?
          if test "x$pin" = xt -a "x$plus" = "x+" -a "x$din" = xf ; then
              #echo "   " $pname ": need to add :" $dname
              in_dis="f"
              for dis in $DISABLE ; do
                  if test "x$dis" = "x$dname" ; then
-Line 2325 
 if  test "x${PKG_DEPEND}" != x ; then
+Line 2326 
 if  test "x${PKG_DEPEND}" != x ; then
              echo "  the dependency rules for \"$dname\""
              exit 1
          fi
          i=`echo "$i + 1" | bc -l`
          #i=$(( $i + 1 ))
      done
      ck=$ck"t"
-Line 2366 
 for n in $names ; do
+Line 2367 
 for n in $names ; do
          done
          if test "x$has_pack" = xf ; then
              undef=`echo "ALLOW_$n" | sed -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
              DISABLED_PACKAGES="$DISABLED_PACKAGES -U$undef"
          fi
      fi
  done
-Line 2379 
 for i in $PACKAGES ; do
+Line 2380 
 for i in $PACKAGES ; do
  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
      case $i in
          aim_v23)
              ENABLED_PACKAGES="$ENABLED_PACKAGES -DALLOW_AIM"
              echo "Warning: ALLOW_AIM is set to enable aim_v23."
              ;;
      esac
-Line 2421 
 for i in $spaths ; do
+Line 2422 
 for i in $spaths ; do
      if test -f $try -a -r $try -a "x$CPP_OPTIONS" = x ; then
          echo "    found CPP_OPTIONS=\"$try\""
          CPP_OPTIONS="$try"
          # New safety test: make sure packages are not mentioned in CPP_OPTIONS.h
          for n in $names ; do
              test_for_package_in_cpp_options $CPP_OPTIONS $n
          done
      fi
      try="$i/CPP_EEOPTIONS.h"
      if test -f $try -a -r $try -a "x$CPP_EEOPTIONS" = x ; then
          echo "    found CPP_EEOPTIONS=\"$try\""
          # New safety test: make sure MPI is not determined by CPP_EEOPTIONS.h
  #**** not yet enabled ****
  #        test_for_mpi_in_cpp_eeoptions $try
  #**** not yet enabled ****
-Line 2575 
 for d in $alldirs ; do
+Line 2576 
 for d in $alldirs ; do
          if test ! -r ".links.tmp/$sf" ; then
              if test -f "$d/$sf" ; then
                  ignore_f=f
                  case $d/$sf in
                    ./$PACKAGES_DOT_H)
                          ignore_f=t
                          ;;
                    ./AD_CONFIG.h)
                          ignore_f=t
                          ;;
                    ./FC_NAMEMANGLE.h)
                          ignore_f=t
                          ;;
                    ./BUILD_INFO.h)
                          ignore_f=t
                          ;;
                    ./EMBEDDED_FILES.h)
                          ignore_f=t
                          ;;
                    *)
                          #  For the local directory *ONLY*,
                          #  ignore all soft-links
                          if test "x$HAVE_TEST_L" = xt -a "x$d" = x. -a -L $sf ; then
-Line 2601 
 for d in $alldirs ; do
+Line 2602 
 for d in $alldirs ; do
                              deplist="$deplist $sf"
                          fi
                          ;;
                  esac
                  if test "x$ignore_f" = xf ; then
                      extn=`echo $sf | $AWK -F. '{print $NF}'`
                      case $extn in
-Line 2648 
 for d in $alldirs ; do
+Line 2649 
 for d in $alldirs ; do
                          echo    " \\"  >> hsrclist.tmp
                          printf " $sf" >> hsrclist.tmp
                          ;;
                      flow)
                          echo    " \\"  >> ad_flow_files.tmp
                          printf " $sf" >> ad_flow_files.tmp
                          ;;
-Line 2659 
 for d in $alldirs ; do
+Line 2660 
 for d in $alldirs ; do
      done
      if test "x$deplist" != x ; then
        if test "$d" != "." ; then
          echo "" >> srclinks.tmp
          echo "#  These files are linked from $d" >> srclinks.tmp
          echo "$deplist :" >> srclinks.tmp
  # We need to make sure that the link isn't already there.
-Line 2680 
 echo "" >> ad_flow_files.tmp
+Line 2681 
 echo "" >> ad_flow_files.tmp
  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
  if test -f $MAKEFILE ; then
-Line 2813 
 echo >> $MAKEFILE
+Line 2814 
 echo >> $MAKEFILE
  echo 'F77_PP_SRC_FILES = $(F77_SRC_FILES:.F=.'$FS')'      >> $MAKEFILE
  echo 'F90_PP_SRC_FILES = $(F90_SRC_FILES:.F90=.'$FS90')' >> $MAKEFILE
  echo 'OBJFILES= $(F77_SRC_FILES:.F=.o) $(C_SRC_FILES:.c=.o) $(F90_SRC_FILES:.F90=.o)' >> $MAKEFILE
- echo 'FLOFILES =  $(AD_FLOW_FILES:.flow=.flowdir)' >> $MAKEFILE
+ echo 'FLOWFILES =  $(AD_FLOW_FILES:.flow=.flowdir)' >> $MAKEFILE
  echo >> $MAKEFILE
  echo '.SUFFIXES:' >> $MAKEFILE
  echo '.SUFFIXES: .o .'$FS' .p .F .c .f'$FS90' .'$FS90' .FF90 .F90 .flowdir .flow' >> $MAKEFILE
-Line 2859 
 Clean:
+Line 2860 
 Clean:
          @make -f \$(MAKEFILE) clean
          @make -f \$(MAKEFILE) cleanlinks
          -rm -f \$(SPECIAL_FILES) f90mkdepend.log $MAKEFILE.old
-         -rm -f taf_command taf_output taf_ad.log taf_ad_flow.log
+         -rm -f taf_command taf_output taf_ad.log taf_ad_flow.log taf_ftl.log
          -rm -f genmake_warnings genmake_errors make.log
  # remove also the executable, files that "genmake2" generates (except Makefile)
  #         and output from a run (plus log files from testreport)
  CLEAN:
          @make -f \$(MAKEFILE) Clean
-         -rm -f \$(EXECUTABLE) \$(EXE_AD) *.bak
+         -rm -f \$(EXECUTABLE) \$(EXE_AD) \$(EXE_FTL) *.bak
          -rm -f $LOGFILE genmake_state genmake_*optfile
          -rm -f SIZE.h.mpi genmake.tr_log make.tr_log
          -find \$(EXEDIR) -name "*.meta" -exec rm {} \;
-Line 3005 
 ad_input_code.$FS: \$(AD_FILES) \$(H_SRC
+Line 3006 
 ad_input_code.$FS: \$(AD_FILES) \$(H_SRC
          cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
          -rm -f ad_config.template
          @make -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
-         @make -f \$(MAKEFILE) \$(FLOFILES)
+         @make -f \$(MAKEFILE) \$(FLOWFILES)
-         cat \$(FLOFILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ad_input_code.$FS
+         cat \$(FLOWFILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ad_input_code.$FS
  ad_taf_output.$FS: ad_input_code.$FS
          \$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
-Line 3037 
 adtrick:
+Line 3038 
 adtrick:
  adobj: ad_taf_output.o \$(OBJFILES)
  # ... FTL ...
- ftlall: ftl_taf
+ ftlall: \$(EXE_FTL)
  ftltaf: ftl_taf_output.$FS
  ftltamc: ftl_tamc_output.$FS
-Line 3047 
 ftl_input_code.$FS: \$(AD_FILES) \$(H_SR
+Line 3048 
 ftl_input_code.$FS: \$(AD_FILES) \$(H_SR
          -rm -f ftl_config.template
          @make -f \$(MAKEFILE) \$(F77_PP_SRC_FILES)
          @make -f \$(MAKEFILE) \$(AD_FLOW_FILES)
-         cat \$(AD_FLOW_FILES) \$(AD_FILES) > ftl_input_code.$FS
+         cat \$(AD_FLOW_FILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ftl_input_code.$FS
  ftl_taf_output.$FS: ftl_input_code.$FS
          \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
-Line 3059 
 ftltafonly:
+Line 3060 
 ftltafonly:
          ls -l ftl_input_code_ftl.$FS
          cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
- ftl_taf: ftl_taf_output.o \$(OBJFILES)
+ \${EXE_FTL}: ftl_taf_output.o \$(OBJFILES)
-         \$(LINK) -o ${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS)
+         \$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ftl_taf_output.o \$(LIBS)
  ftl_tamc_output.$FS: ftl_input_code.$FS
          \$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.$FS
-Line 3191 
 f95_test.out: f95_test_mods.f90 f95_test
+Line 3192 
 f95_test.out: f95_test_mods.f90 f95_test
          f95 -fixed -w=unused -maxcontin=132 -c f95_test_mods.f90 > \$@ 2>&1
          f95 -fixed -w=unused -maxcontin=132 -c -fixed f95_test.f90 >> \$@ 2>&1
- # the file included below is created by the
+ CB2M_AD_FILES=\$(AD_FILES:.f=_cb2m.f$FS90)
- # postProcessor and its inclusion sets the
- # variable POSTPROCESSEDFILES
- # used below. Because the file is made during
- # make it won't be read until the second (recursive)
- # invocation in the rule below
- -include postProcess.make
- AD_OBJ_FILES_S1=\$(OPENAD_SUPPORT_F90_SRC_FILES:.F90=.o) \$(OPENAD_SUPPORT_C_SRC_FILES:.c=.o) \$(POSTPROCESSEDFILES:.f$FS90=.o)
+ AD_OBJ_FILES_S1=\$(OPENAD_SUPPORT_F90_SRC_FILES:.F90=.o) \$(OPENAD_SUPPORT_C_SRC_FILES:.c=.o)  OAD_intrinsics_oad.o \$(CB2M_AD_FILES:.f$FS90=_oad.o)
  AD_OBJ_FILES_S2=\$(AD_OBJ_FILES_S1) \$(NON_AD_F77_SRC_FILES:.F=_cb2m.o) \$(C_SRC_FILES:.c=.o) \$(F90_SRC_FILES:.F90=.o)
- postProcess.comp: \$(ALL_LINKED_FILES) \$(addsuffix _mod.h, \$(CB2M_F90_SRC_NAMES)) postProcess.tag \$(AD_OBJ_FILES_S1)
+ \$(EXE_AD): \$(ALL_LINKED_FILES) \$(addsuffix _mod.h, \$(CB2M_F90_SRC_NAMES)) postProcess.tag \$(AD_OBJ_FILES_S2)
- ifeq (\$(MAKELEVEL),0)
-         \$(MAKE) adAll
- else
-         touch \$@
- endif
- \$(EXE_AD): \$(ALL_LINKED_FILES) \$(addsuffix _mod.h, \$(CB2M_F90_SRC_NAMES)) postProcess.comp \$(AD_OBJ_FILES_S2)
- ifeq (\$(MAKELEVEL),1)
          \$(LINK) -o \$@ \$(FFLAGS) \$(FOPTIM) \$(AD_OBJ_FILES_S2) \$(LIBS)
- else
-         touch \$@
- endif
- # makefile debug rule
+ # create sources files modules from header files containing common blocks
- openad: ad_input_code.w2f.pre.xb.x2w.w2f.td.pp.f$FS90
- .PHONY: openad
- # create the module files
  %_mod.FF90 : %.h ../OAD_support/cb2mGetModules.csh ../OAD_support/cb2mGetModules.awk
          ../OAD_support/cb2mGetModules.csh $< ../OAD_support/cb2mGetModules.awk
- # create the header files
+ # create new header files with USE statements for the new modules made above
  %_mod.h : %.h ../OAD_support/cb2mGetHeaders.csh ../OAD_support/cb2mGetHeaders.awk
          ../OAD_support/cb2mGetHeaders.csh $< ../OAD_support/cb2mGetHeaders.awk \$(CB2M_F90_SRC_NAMES)
- # change everybody else to use the new module files:
+ # change the include directives of everybody to refer to  the new header files with the USE statements
  %_cb2m.FF90 : %.F ../OAD_support/cb2mUseModules.bash
          ../OAD_support/cb2mUseModules.bash $< ${MPI}
-Line 3244 
 ad_output.txt: \$(EXE_AD)
+Line 3224 
 ad_output.txt: \$(EXE_AD)
          @printf 'running ... '
          @./\$(EXE_AD) > \$@
- CB2M_AD_FILES=\$(AD_FILES:.f=_cb2m.f$FS90)
  ad_input_code.f$FS90:  \$(CB2M_AD_FILES)
          cat \$^ > \$@
- # strip all comments and blanks to reduce
- # the file size in order to reduce perl's memory requirements
- ad_input_code_sf.f$FS90 : ad_input_code.f$FS90
-         cat \$^ | sed -f ../OAD_support/strip.sed | sed -f ../OAD_support/stop2print.sed > \$@
- # mfef90 preprocessing
- # expand statement functions
- # expose mfef90 specific substring handling
- # add the w2f__types module
- ad_input_code_sf.w2f.f$FS90: ad_input_code_sf.f$FS90 mfef90 whirl2f whirl2f_be w2f__types.f90
-         ./mfef90 -r8 -z -F -N132 \$<
-         mv \$<.B \$(basename \$<).B
-         ./whirl2f -openad \$(basename \$<).B
-         cat w2f__types.f90 \$(basename \$<).w2f.f > \$@
  # canonicalizer
- ad_input_code_sf.w2f.pre.f$FS90: ad_input_code_sf.w2f.f$FS90 preProcess.py
+ ad_input_code_sf.pre.f90 : \$(CB2M_AD_FILES)
-         ./preProcess.py --timing --r8 -H -S \$< -o \$@
+         \${OPENADFORTTK_BASE}/tools/SourceProcessing/preProcess.py --timing --r8 -H -S  -o \$@ \$^
+ # replace stop statements (to avoid the implied unstructured control flow)  with print statements
+ ad_input_code_sf.pre.s2p.f90 : ad_input_code_sf.pre.f90
+         cat \$< | sed -f ../OAD_support/stop2print.sed > ad_input_code_sf.pre.s2p.f90
  # F -> WHIRL
- # note that the canonicalized version cuts off at col 72
+ ad_input_code_sf.pre.s2p.B: ad_input_code_sf.pre.s2p.f90
- # doing this also for string constants which is ok as long
+         \${OPEN64ROOT}/crayf90/sgi/mfef90 -r8 -z -F ad_input_code_sf.pre.s2p.f90
- # as we are in fixed mode and cut of exactly there.
- # Otherwise mfef90 patches in spaces to fill up to 72 (or 132)
- # characters respectively.
- ad_input_code_sf.w2f.pre.B: ad_input_code_sf.w2f.pre.f$FS90 mfef90
-         ./mfef90 -r8 -z -F \$<
-         mv \$<.B \$@
  # WHIRL -> XAIF
- ad_input_code_sf.w2f.pre.xaif : ad_input_code_sf.w2f.pre.B whirl2xaif
+ ad_input_code_sf.pre.s2p.xaif : ad_input_code_sf.pre.s2p.B
-         ./whirl2xaif -s -n --debug 1 -o \$@ \$<
+         \${OPENADFORTTK}/bin/whirl2xaif -s -n --debug 1 -o \$@ \$<
  # XAIF -> XAIF'
- ad_input_code_sf.w2f.pre.xb.xaif : ad_input_code_sf.w2f.pre.xaif xaif.xsd xaif_base.xsd xaif_inlinable_intrinsics.xsd xaif_derivative_propagator.xsd xaif_output.xsd oadDriver
+ ad_input_code_sf.pre.s2p.xb.xaif : ad_input_code_sf.pre.s2p.xaif xaif.xsd xaif_base.xsd xaif_inlinable_intrinsics.xsd xaif_derivative_propagator.xsd xaif_output.xsd
-         ./oadDriver -f -t forward_step -i \$< -c \${XAIFSCHEMAROOT}/schema/examples/inlinable_intrinsics.xaif -o \$@ -I -r
+         \${XAIFBOOSTERROOT}/xaifBooster/algorithms/BasicBlockPreaccumulationReverse/driver/oadDriver -f -t forward_step -i \$< -c \${XAIFSCHEMAROOT}/schema/examples/inlinable_intrinsics.xaif -o \$@ -I -r
  # XAIF' -> WHIRL'
- ad_input_code_sf.w2f.pre.xb.x2w.B : ad_input_code_sf.w2f.pre.xb.xaif xaif2whirl
+ ad_input_code_sf.pre.s2p.xb.x2w.B : ad_input_code_sf.pre.s2p.xb.xaif
-         ./xaif2whirl --debug 1 ad_input_code_sf.w2f.pre.B \$<
+         \${OPENADFORTTK}/bin/xaif2whirl --debug 1 ad_input_code_sf.pre.s2p.B \$<
  # WHIRL' -> F'
- ad_input_code_sf.w2f.pre.xb.x2w.w2f.f$FS90: ad_input_code_sf.w2f.pre.xb.x2w.B whirl2f whirl2f_be
+ ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS90: ad_input_code_sf.pre.s2p.xb.x2w.B
-         ./whirl2f -FLIST:ftn_file=\$@ -openad \$<
+         \${OPEN64ROOT}/whirl2f/whirl2f -FLIST:ftn_file=\$@ -openad \$<
  # insert template directives
- ad_input_code_sf.w2f.pre.xb.x2w.w2f.td.f$FS90: ad_input_code_sf.w2f.pre.xb.x2w.w2f.f$FS90 ../OAD_support/insertTemplateDir.bash
+ ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90: ad_input_code_sf.pre.s2p.xb.x2w.w2f.f$FS90 ../OAD_support/insertTemplateDir.bash
          ../OAD_support/insertTemplateDir.bash \$< \$@
  PPEXTRAS=\$(wildcard ../OAD_support/ad_template.*.F) ../OAD_support/ad_inline.F
  # postprocess F'
- postProcess.tag: ad_input_code_sf.w2f.pre.xb.x2w.w2f.td.f$FS90 postProcess.py \$(PPEXTRAS:.F=.f)
+ postProcess.tag: ad_input_code_sf.pre.s2p.xb.x2w.w2f.td.f$FS90 \$(PPEXTRAS:.F=.f) | w2f__types.f90
-         # the target is a placeholder to signal execution of the rule
+         \${OPENADFORTTK_BASE}/tools/SourceProcessing/postProcess.py --progress --timing --infoUnitFile w2f__types.f90 --outputFormat=fixed --separateOutput --pathSuffix "" --filenameSuffix "_oad" -m r -i ../OAD_support/ad_inline.f \$<
+         # the target is a placeholder to trigger a single execution of the rule
          touch \$@
-         # this step also creates the file postProcess.make but we cannot
+ # put this so make knows about the postprocessing output
-         # name it as the target or else make will try to remake it for
+ OAD_intrinsics_oad.f \$(CB2M_AD_FILES:.f$FS90=_oad.f): postProcess.tag
-         # the include directive above for any rule, e.g. make clean
-         ./postProcess.py --progress --timing --infoUnitFile w2f__types.f90 --outputFormat=fixed -m r -i ../OAD_support/ad_inline.f --width 4 \$<
- # setup some links
+ # link the XAIF schema files
  %.xsd:
          \$(LN) \${XAIFSCHEMAROOT}/schema/\$@ .
- mfef90:
-         \$(LN) \${OPEN64ROOT}/crayf90/sgi/mfef90 .
  # link the support files:
  \$(OPENAD_SUPPORT_F90_SRC_FILES) \$(OPENAD_SUPPORT_C_SRC_FILES):
          \$(LN) ../OAD_support/\$@ .
- whirl2xaif xaif2whirl:
+ AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.tag \$(PPEXTRAS:.F=.f)
-         \$(LN) \${OPENADFORTTK}/bin/\$@ .
- preProcess.py postProcess.py:
-         \$(LN) \${OPENADFORTTK_BASE}/tools/SourceProcessing/\$@ .
- whirl2f whirl2f_be:
-         \$(LN) \${OPEN64ROOT}/whirl2f/\$@ .
- oadDriver:
-         \$(LN) \${XAIFBOOSTERROOT}/xaifBooster/algorithms/BasicBlockPreaccumulationReverse/driver/oadDriver \$@
- AD_CLEAN += *_mod.h *_mod.F90 *.FF90 *.mod-whirl temp.sed oad_cp.* postProcess.make postProcess.tag postProcess.comp \$(PPEXTRAS:.F=.f)
  # ============ end OpenAD specific section ==============

 Legend:



Removed from v.1.232
 


changed lines


 
Added in v.1.237
 Legend:



Removed from v.1.232
 


changed lines


 
Added in v.1.237
-Removed from v.1.232
+Added in v.1.237

	ViewVC Help
Powered by ViewVC 1.1.22