/[MITgcm]/MITgcm/tools/genmake2

Diff of /MITgcm/tools/genmake2

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

-revision 1.264 by jmc,
Sat Jan 25 18:25:49 2014 UTC
+revision 1.277 by jmc,
Tue Jan 12 20:43:00 2016 UTC
 Line 22 
 Usage: "$0" [OPTIONS]
      -oad | --oad
            Generate a Makefile for an OpenAD built
+     -nocat4ad | -dog4ad | -ncad | -dad
+           do not concatenate (cat) source code sent to TAF
+           resulting in compilation of multiple files
      -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
-Line 1083 
 EOF
+Line 1087 
 EOF
  }
  check_lapack_libs()  {
-     if test ! "x$SKIP_LAPACK_CHECK" = x ; then
+     if test "x$CHECK_FOR_LAPACK" = xf ; then return ; fi
-         return
-     fi
      echo >> $LOGFILE
      echo "running: check_lapack_libs()" >> $LOGFILE
      cat <<EOF > genmake_tla.F
-Line 1281 
 GSL=
+Line 1283 
 GSL=
  DEVEL=
  HAVE_TEST_L=
- # comment this line out to enable lapack test
+ # set this to "t" to enable lapack test
- SKIP_LAPACK_CHECK=t
+ CHECK_FOR_LAPACK=f
  # DEFINES checked by test compilation or command-line
  HAVE_SYSTEM=
-Line 1331 
 FS90=
+Line 1333 
 FS90=
  AUTODIFF_PKG_USED=f
  OPENAD=
  AD_OPTFILE=
+ CAT_SRC_FOR_TAF=1
  TAF=
  AD_TAF_FLAGS=
  FTL_TAF_FLAGS=
-Line 1413 
 for ac_option in "$@" ; do
+Line 1416 
 for ac_option in "$@" ; do
              OPTFILE=$ac_optarg ;;
          -oad | --oad)
-             OPENAD="true" ;;
+             OPENAD="true" ; ALWAYS_USE_F90=1 ;;
+         -nocat4ad | -dog4ad | -ncad | -dad)
+             CAT_SRC_FOR_TAF=0 ;;
          -adoptfile | --adoptfile | -adof | --adof)
              ac_prev=AD_OPTFILE ;;
          -adoptfile=* | --adoptfile=* | -adof=* | --adof=*)
-Line 1585 
 done
+Line 1590 
 done
  #TMP=./genmk_$$
  #- try to put temporary files in system-local /tmp dir
- TMP=/tmp/genmk_$$
+ TMP=/tmp/genmk_${USER}_$$
  touch $TMP ; retVal=$?
  if [ $retVal -eq 0 ] ; then
    if test ! -r $TMP ; then TMP=./genmk_$$ ; fi
-Line 1959 
 else
+Line 1964 
 else
  fi
  rm -f genmake_tcomp*
- printf "  Do we have the etime() command using $FC...  "
+ printf "  Do we have the etime() command using $FC... "
- cat > genmake_tcomp.$FS <<EOF
+ cat > genmake_tcomp_1.$FS <<EOF
        program hello
-       REAL*4 ACTUAL, TARRAY(2)
+       REAL*4 actual, tarray(2)
        EXTERNAL ETIME
        REAL*4 ETIME
-       actual = etime( tarray )
+       actual = ETIME( tarray )
        print *, tarray
        end
  EOF
- $FC $FFLAGS -o genmake_tcomp genmake_tcomp.$FS > genmake_tcomp.log 2>&1
+ $FC $FFLAGS -o genmake_tcomp_1 genmake_tcomp_1.$FS > genmake_tcomp.log 2>&1
  RETVAL=$?
  if test "x$RETVAL" = x0 ; then
-     HAVE_ETIME=t
+     HAVE_ETIME='Fct'
-     DEFINES="$DEFINES -DHAVE_ETIME"
+     DEFINES="$DEFINES -DHAVE_ETIME_FCT"
-     echo "yes"
+     echo " yes (${HAVE_ETIME})"
  else
+   cat > genmake_tcomp_2.$FS <<EOF
+       program hello
+       REAL*4 actual, tarray(2)
+       actual = -999.
+       call ETIME( tarray, actual )
+       if ( actual.ge.0. ) then
+         print *, 0, tarray, actual
+       else
+         print *, 1, tarray, actual
+       endif
+       end
+ EOF
+   $FC $FFLAGS -o genmake_tcomp_2 genmake_tcomp_2.$FS >> genmake_tcomp.log 2>&1
+   RETVAL=$?
+   if test "x$RETVAL" = x0 ; then
+     echo -n 'c,'
+     ./genmake_tcomp_2 > genmake_tcomp_2.out 2>&1
+     RETVAL=$?
+   fi
+   if test "x$RETVAL" = x0 ; then
+     echo -n 'r:'
+     RETVAL=`cat genmake_tcomp_2.out | $AWK '{print $1}'`
+   fi
+   if test "x$RETVAL" = x0 ; then
+     HAVE_ETIME='SbR'
+     DEFINES="$DEFINES -DHAVE_ETIME_SBR"
+     echo " yes (${HAVE_ETIME})"
+   else
      HAVE_ETIME=
-     echo "no"
+     echo " no"
+   fi
  fi
+ #mkdir chk_etime ; cp -p -f genmake_tcomp* chk_etime
  rm -f genmake_tcomp*
  printf "  Can we call simple C routines (here, \"cloc()\") using $FC...  "
-Line 2633 
 if test "x$OPENAD" != x ; then
+Line 2668 
 if test "x$OPENAD" != x ; then
      OAD_CB2M_FILES="/dev/null"
      OADTOOLS="$TOOLSDIR/OAD_support"
      echo "  looking for dontCompile file:  "
-     for i in "." $MODS ; do
+     for i in "." $MODS $OADTOOLS ; do
          if test -r $i"/dontCompile" ; then
              OAD_DONT_COMPILE=$i"/dontCompile"
              echo "     found $OAD_DONT_COMPILE"
-Line 2641 
 if test "x$OPENAD" != x ; then
+Line 2676 
 if test "x$OPENAD" != x ; then
          fi
      done
      echo "  looking for dontTransform file:  "
-     for i in "." $MODS ; do
+     for i in "." $MODS $OADTOOLS ; do
          if test -r $i"/dontTransform" ; then
              OAD_DONT_TRANSFORM=$i"/dontTransform"
              echo "     found $OAD_DONT_TRANSFORM"
-Line 2649 
 if test "x$OPENAD" != x ; then
+Line 2684 
 if test "x$OPENAD" != x ; then
          fi
      done
      echo "  looking for keepOriginal file:  "
-     for i in "." $MODS ; do
+     for i in "." $MODS $OADTOOLS ; do
          if test -r $i"/keepOriginal" ; then
              OAD_KEEP_ORIGINAL=$i"/keepOriginal"
              echo "     found $OAD_KEEP_ORIGINAL"
-Line 2657 
 if test "x$OPENAD" != x ; then
+Line 2692 
 if test "x$OPENAD" != x ; then
          fi
      done
      echo "  looking for cb2mFiles:  "
-     for i in "." $MODS ; do
+     for i in "." $MODS $OADTOOLS ; do
          if test -r $i"/cb2mFiles" ; then
              OAD_CB2M_FILES=$i"/cb2mFiles"
              echo "     found $OAD_CB2M_FILES"
-Line 2896 
 CPPINCLUDES = ${CPPINCLUDES}
+Line 2931 
 CPPINCLUDES = ${CPPINCLUDES}
  KFLAGS1 = ${KFLAGS1}
  KFLAGS2 = ${KFLAGS2}
  # Optim./debug for FC
- FFLAGS = ${FFLAGS} ${FEXTRAFLAGS}
+ FFLAGS = ${FFLAGS}
- FOPTIM = ${FOPTIM}
+ FOPTIM = ${FOPTIM} ${FEXTRAFLAGS}
  # Optim./debug for FC
  F90FLAGS = ${F90FLAGS}
  F90OPTIM = ${F90OPTIM}
-Line 2973 
 links: \$(F77_SRC_FILES) \$(C_SRC_FILES)
+Line 3008 
 links: \$(F77_SRC_FILES) \$(C_SRC_FILES)
  small_f: \$(F77_PP_SRC_FILES) \$(F90_PP_SRC_FILES)
- output.txt: \$(EXECUTABLE)
-         @printf 'running ... '
-         @\$(EXECUTABLE) > \$@
  # remove most of the files that "make" generates
  clean:
          -rm -rf *.p *.$FS90 *.mod ${RMFILES} work.{pc,pcl} *.template
-Line 3128 
 done
+Line 3159 
 done
  echo >> $MAKEFILE
  rm -f $TMP.adSrcFiles
+ if test $CAT_SRC_FOR_TAF = 0 ; then
+ cat >>$MAKEFILE <<EOF
+ # ... Utilities ...
+ remove_comments:
+         sed -i.bak -f \$(TOOLSDIR)/remove_comments_sed \$(AD_FILES)
+         @-rm -f \$(AD_FILES:.$FS=.$FS.bak)
+ adj_sed:
+         sed -i.bak -f \$(TOOLSDIR)/adjoint_sed \$(AD_FILES:.$FS=_ad.$FS)
+         @-rm -f \$(AD_FILES:.$FS=_ad.$FS.bak)
+ ftl_sed:
+         sed -i.bak -f \$(TOOLSDIR)/adjoint_sed \$(AD_FILES:.$FS=_tl.$FS)
+         @-rm -f \$(AD_FILES:.$FS=_tl.$FS.bak)
+ adobjfiles: \$(AD_FILES:.$FS=_ad.o)
+ ftlobjfiles: \$(AD_FILES:.$FS=_tl.o)
+ EOF
+ fi
  cat >>$MAKEFILE <<EOF
  # ... AD ...
-Line 3150 
 ad_input_code.$FS: \$(AD_FILES) \$(AD_FL
+Line 3199 
 ad_input_code.$FS: \$(AD_FILES) \$(AD_FL
          @\$(MAKE) -f \$(MAKEFILE) \$(FLOWFILES)
          cat \$(FLOWFILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ad_input_code.$FS
- ad_taf_output.$FS: ad_input_code.$FS
+ adtafonly:
-         @-rm -f ad_input_code_ad.$FS ; echo ''
          \$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
          ls -l ad_input_code_ad.$FS
          cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
- adtafonly:
+ EOF
+ if test $CAT_SRC_FOR_TAF = 1 ; then
+ cat >>$MAKEFILE <<EOF
+ # ... send 1 file to TAF ...
+ ad_taf_output.$FS: ad_input_code.$FS
+         @-rm -f ad_input_code_ad.$FS ; echo ''
          \$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) ad_input_code.$FS
          ls -l ad_input_code_ad.$FS
          cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_taf_output.$FS
-Line 3164 
 adtafonly:
+Line 3218 
 adtafonly:
  \$(EXE_AD): \$(SPECIAL_FILES) \$(H_SRC_FILES) ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
          \$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
- ad_tamc_output.$FS: ad_input_code.$FS
+ adobj: ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o)
-         \$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.$FS
-         cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_tamc_output.$FS
- ad_tamc: ad_tamc_output.o \$(OBJFILES)
+ EOF
-         \$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_tamc_output.o \$(LIBS)
+ else
+ cat >>$MAKEFILE <<EOF
+ # ... send multiple files to TAF ...
+ ad_taf_output.$FS: \$(AD_FLOW_FILES) \$(AD_FILES)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Adjoint version" -bAD_CONFIG_H -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
+         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) \$(FLOWFILES)
+         @-rm -f \$(AD_FILES:.$FS=_ad.$FS) \$(AD_FILES:.$FS=_ad.o); echo ''
+         \$(MAKE) -f \$(MAKEFILE) remove_comments
+         \$(TAF) \$(AD_TAF_FLAGS) \$(TAF_EXTRA) \$(FLOWFILES) \$(AD_FILES)
+         \$(MAKE) -f \$(MAKEFILE) adj_sed
+         cat \$(AD_FILES:.$FS=_ad.$FS) > ad_taf_output.$FS
+ \$(EXE_AD): \$(SPECIAL_FILES) \$(H_SRC_FILES) ad_taf_output.$FS \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
+         \$(MAKE) -f \$(MAKEFILE) adobjfiles
+         \$(LINK) -o \${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(AD_FILES:.$FS=_ad.o) \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
+ adobj: ad_taf_output.$FS \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o)
+         \$(MAKE) -f \$(MAKEFILE) adobjfiles
+ EOF
+ fi
+ cat >>$MAKEFILE <<EOF
  adonlyfwd:
          patch < \$(TOOLSDIR)/ad_taf_output.f.onlyfwd.diff
  adtrick:
          patch < \$(TOOLSDIR)/ad_taf_output.f.adtrick.diff
- adobj: ad_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o)
+ ad_tamc_output.$FS: ad_input_code.$FS
+         \$(TAMC) \$(AD_TAMC_FLAGS) \$(TAMC_EXTRA) ad_input_code.$FS
+         cat ad_input_code_ad.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ad_tamc_output.$FS
+ ad_tamc: ad_tamc_output.o \$(OBJFILES)
+         \$(LINK) -o ${EXE_AD} \$(FFLAGS) \$(FOPTIM) \$(OBJFILES) ad_tamc_output.o \$(LIBS)
  # ... FTL ...
  ftlall: ftl_exe_target
-Line 3199 
 ftl_input_code.$FS: \$(AD_FILES)
+Line 3281 
 ftl_input_code.$FS: \$(AD_FILES)
          @\$(MAKE) -f \$(MAKEFILE) \$(AD_FLOW_FILES)
          cat \$(AD_FLOW_FILES) \$(AD_FILES) | sed -f \$(TOOLSDIR)/remove_comments_sed > ftl_input_code.$FS
- ftl_taf_output.$FS: ftl_input_code.$FS
+ ftltafonly:
-         @-rm -f ftl_input_code_tl.$FS ; echo ''
          \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
          ls -l ftl_input_code_tl.$FS
          cat ftl_input_code_tl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
- ftltafonly:
+ EOF
+ if test $CAT_SRC_FOR_TAF = 1 ; then
+ cat >>$MAKEFILE <<EOF
+ # ... send 1 file to TAF ...
+ ftl_taf_output.$FS: ftl_input_code.$FS
+         @-rm -f ftl_input_code_tl.$FS ; echo ''
          \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) ftl_input_code.$FS
          ls -l ftl_input_code_tl.$FS
          cat ftl_input_code_tl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_taf_output.$FS
-Line 3213 
 ftltafonly:
+Line 3300 
 ftltafonly:
  \$(EXE_FTL): \$(SPECIAL_FILES) \$(H_SRC_FILES) ftl_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
          \$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) ftl_taf_output.o \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
+ EOF
+ else
+ cat >>$MAKEFILE <<EOF
+ # ... send multiple files to TAF ...
+ ftl_taf_output.$FS: \$(AD_FLOW_FILES) \$(AD_FILES)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "TangLin version" -bAD_CONFIG_H -UALLOW_ADJOINT_RUN -DALLOW_TANGENTLINEAR_RUN > ad_config.template
+         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) \$(AD_FLOW_FILES)
+         @-rm -f \$(AD_FILES:.$FS=_tl.$FS) \$(AD_FILES:.$FS=_tl.o); echo ''
+         \$(MAKE) -f \$(MAKEFILE) remove_comments
+         \$(TAF) \$(FTL_TAF_FLAGS) \$(TAF_EXTRA) \$(AD_FLOW_FILES) \$(AD_FILES)
+         \$(MAKE) -f \$(MAKEFILE) ftl_sed
+         cat \$(AD_FILES:.$FS=_tl.$FS) > ftl_taf_output.$FS
+ \$(EXE_FTL): \$(SPECIAL_FILES) \$(H_SRC_FILES) ftl_taf_output.$FS \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(EMBEDDED_FILES)
+         \$(MAKE) -f \$(MAKEFILE) ftlobjfiles
+         \$(LINK) -o \${EXE_FTL} \$(FFLAGS) \$(FOPTIM) \$(AD_FILES:.$FS=_tl.o) \$(NON_AD_F77_SRC_FILES:.F=.o) \$(F90_SRC_FILES:.F90=.o) \$(C_SRC_FILES:.c=.o) \$(LIBS)
+ EOF
+ fi
+ cat >>$MAKEFILE <<EOF
  ftl_tamc_output.$FS: ftl_input_code.$FS
          \$(TAMC) \$(FTL_TAMC_FLAGS) \$(TAMC_EXTRA) ftl_input_code.$FS
          cat ftl_input_code_ftl.$FS | sed -f \$(TOOLSDIR)/adjoint_sed > ftl_tamc_output.$FS
-Line 3255 
 if test "x$OPENAD" != x ; then
+Line 3367 
 if test "x$OPENAD" != x ; then
  # ============ begin OpenAD specific section ==============
  cat >>$MAKEFILE <<EOF
+ # ... OpenAD ...
  # all the source files linked from the various locations:
  ALL_LINKED_FILES= \
-Line 3308 
 rm -f $TMP.adSrcFiles
+Line 3421 
 rm -f $TMP.adSrcFiles
  cat >>$MAKEFILE <<EOF
- adAll: \$(EXE_AD)
+ adAll: ad_exe_target
  .PHONY: adAll
+ ad_exe_target:
+         @echo Update AD_CONFIG.h and make \$(EXE_AD)
+         @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Adjoint version" -bAD_CONFIG_H -DALLOW_ADJOINT_RUN -UALLOW_TANGENTLINEAR_RUN > ad_config.template
+         @cmp ad_config.template AD_CONFIG.h || cat ad_config.template > AD_CONFIG.h
+         @-rm -f ad_config.template
+         \$(MAKE) -f \$(MAKEFILE) \$(EXE_AD)
  CB2M_F90_PP_SRC_FILES=\$(addsuffix _mod.f$FS90, \$(CB2M_F90_SRC_NAMES))
  .PRECIOUS: \$(CB2M_F90_PP_SRC_FILES) \$(NON_AD_F77_SRC_FILES:.F=_cb2m.f$FS90)
-Line 3327 
 OAD_active.F90 \
+Line 3447 
 OAD_active.F90 \
  OAD_cp.F90 \
  OAD_rev.F90 \
  OAD_tape.F90 \
+ OAD_regular_cp.F90 \
  revolve.F90
  OPENAD_SUPPORT_C_SRC_FILES = \
-Line 3368 
 AD_OBJ_FILES_S2=\$(AD_OBJ_FILES_S1) \$(N
+Line 3489 
 AD_OBJ_FILES_S2=\$(AD_OBJ_FILES_S1) \$(N
  small_f: \$(CB2M_F90_PP_SRC_FILES)
  .PHONY: small_f
- ad_output.txt: \$(EXE_AD)
-         @printf 'linking data files ... '
-         \$(LN) -f ../input_ad/data* ../input_ad/eedata .
-         \$(LN) -f ../../global_ocean.90x40x15/input/*.bin .
-         @printf 'running ... '
-         @./\$(EXE_AD) > \$@
  ad_input_code.f$FS90:  \$(CB2M_AD_FILES)
          cat \$^ > \$@

 Legend:



Removed from v.1.264
 


changed lines


 
Added in v.1.277
 Legend:



Removed from v.1.264
 


changed lines


 
Added in v.1.277
-Removed from v.1.264
+Added in v.1.277

	ViewVC Help
Powered by ViewVC 1.1.22