merge with current etmc/master

Marcogarofalo · Jan 29, 2012 · b029e32 · b029e32
2 parents 637367e + bae5e1b
commit b029e32
Show file tree

Hide file tree

Showing 389 changed files with 4,721 additions and 4,794 deletions.
diff --git a/D_psi.c b/D_psi.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$
  *
  * Copyright (C) 2001 Martin Luescher
  * original code 
@@ -1527,4 +1526,3 @@ void boundary_D_7(spinor * const r, spinor * const s, su3 * restrict u) {
   return;
 }
 
-static char const rcsid[] = "$Id$";
diff --git a/D_psi.h b/D_psi.h
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$
  *
  * Copyright (C) 2007,2008 Carsten Urbach
  *

diff --git a/Dov_proj.c b/Dov_proj.c
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 /**********************************************************
  *

diff --git a/Dov_proj.h b/Dov_proj.h
@@ -1,4 +1,3 @@
-/* $Id$ */
 
 #ifndef _DOV_PROJ_H
 #define _DOV_PROJ_H

diff --git a/Dov_psi.c b/Dov_psi.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$
  *
  * Copyright (C) 2003 Ines Wetzorke
  *               2006 Urs Wenger
@@ -497,4 +496,3 @@ void CheckApproximation(spinor * const P, spinor * const S) {
 }
 
 
-static char const rcsid[] = "$Id$";
diff --git a/Dov_psi.h b/Dov_psi.h
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$
  *
  * Copyright (C) 2003 Ines Wetzorke
  *               2009 Carsten Urbach

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
@@ -0,0 +1,86 @@
+#######################################################################
+# Copyright (C) 2002,2003,2004,2005,2006,2007,2008 Carsten Urbach
+# Copyright (C) GIT-VERSION-GEN 2012 Bartosz Kostrzewa
+#
+# This file is part of tmLQCD.
+#
+# tmLQCD is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# tmLQCD is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with tmLQCD. If not, see <http://www.gnu.org/licenses/>.
+#######################################################################
+
+# This file has been adapted from GIT-VERSION-GEN from the git distribution.
+# The original is available from http://git-scm.com/
+
+# It is run by make during the build process and generates git_hash.h with the current
+# head commit as an identifier. (after checking that .git exists)
+
+#!/bin/sh
+
+# write the hash to git_hash.h
+write_git_hash() {
+  echo "#ifndef _GIT_HASH_H" > git_hash.h
+  echo "#define _GIT_HASH_H" >> git_hash.h
+  echo "const char git_hash[] = {\"${GIT_HASH}\"};" >> git_hash.h
+  echo "#endif /* _GIT_HASH_H */" >> git_hash.h
+}
+
+# extract default version from configure.in if it exists
+if test -r configure.in
+then
+  DEF_VER=$(grep "AC_INIT" configure.in | awk '{print $2}' | sed 's/,//')
+else
+  DEF_VER="no_version_information"
+fi
+
+# find git
+GIT_BIN=`command -v git`
+
+# First see if there is a version file (included in release tarballs),
+# compare whether it matches the current HEAD commit,
+# then try git rev-parse HEAD, then default.
+# We also check whether we should leave it alone and just exit.
+if test -f git_hash.h
+then
+  # remove all unneccessary fields and characters
+  GIT_HASH=$( grep "const" git_hash.h | awk '{print $5}' | sed 's/[\",\{,\},;]//g' )
+  # are we in a git repo and does git exist?
+  if test -d .git -o -f .git && test -x ${GIT_BIN}
+  then
+    GIT_REV=$(git rev-parse HEAD)
+    # does the version correspond to the HEAD commit?
+    if [ ${GIT_HASH} = ${GIT_REV} ]
+    then
+      # the versions match, let's exit to avoid changing the timestamp of git_hash.h
+      exit 0  
+    else
+      GIT_HASH=${GIT_REV}
+      write_git_hash
+    fi
+  # we are not in a git repository but git_hash.h exists. We must be building from
+  # a tarball! Let's assume git_hash.h is correct and exit before we do any damage
+  # (this branch will also be followed if .git exists but there is no git available
+  # to extract version information)
+  else
+    exit 0
+  fi
+# git_hash.h does not exist, let's try to generate it  
+elif test -d .git -o -f .git && test -x ${GIT_BIN}
+then
+  # .git exists and we are in a git repo
+  GIT_HASH=$(git rev-parse HEAD)
+  write_git_hash
+else
+  GIT_HASH=${DEF_VER}
+  write_git_hash
+fi
+
diff --git a/Hopping_Matrix.c b/Hopping_Matrix.c
@@ -1,6 +1,5 @@
 /**********************************************************************
  *
- * $Id$
  *
  * Copyright (C) 2001 Martin Luescher
  *               2002 Martin Hasenbusch
@@ -3190,4 +3189,3 @@ void Hopping_Matrix(int ieo, spinor * const l, spinor * const k){
 
 #endif /* thats _USE_HALFSPINOR */
 
-static char const rcsid[] = "$Id$";
diff --git a/Hopping_Matrix.h b/Hopping_Matrix.h
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
  ***********************************************************************/
-/* $Id$ */
 
 #ifndef _HOPPING_MATRIX_H
 #define _HOPPING_MATRIX_H

diff --git a/Hopping_Matrix_nocom.c b/Hopping_Matrix_nocom.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
  ***********************************************************************/
-/* $Id$ */
 
 /******************************************
  * Hopping_Matrix is the conventional Wilson 

diff --git a/Hopping_Matrix_nocom.h b/Hopping_Matrix_nocom.h
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
  ***********************************************************************/
-/* $Id$ */
 
 #ifndef _HOPPING_MATRIX_NOCOM_H
 #define _HOPPING_MATRIX_NOCOM_H

diff --git a/Makefile.global b/Makefile.global
@@ -1,12 +1,13 @@
-# $Id$
 # This Makefile is included from the other Makefiles
 # It contains some overall targets...
 
 # refresh Makefile and other stuff
 
+PROGRAMS_WITH_GIT_HASH := hmc_tm invert
+
 .SUFFIXES:
 
-Makefile: $(srcdir)/Makefile.in  $(abs_top_builddir)/config.status 
+Makefile: ${top_srcdir}/Makefile.global $(srcdir)/Makefile.in $(abs_top_builddir)/config.status 
 	cd $(abs_top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -30,10 +31,16 @@ $(addsuffix .o,$(EXTERNMODULES)): %.o:
 $(LINKLIBS): %.a: Makefile $(abs_top_builddir)/config.status $(top_srcdir)/configure
 	@( cd $(dir $@) && ${MAKE} $(notdir $@) )
 
-#dep rule
+#dep rules
+
+# PROGRAMS_WITH_GIT_HASH require git_hash.h which is dynamically built by a phony make target
+# to prevent too frequent building of git_hash (slowing down the build)
+# we filter the list of all objects and treat these separately
+$(addsuffix .d, $(filter-out ${PROGRAMS_WITH_GIT_HASH},${ALLOBJ})): %.d: ${srcdir}/%.c Makefile
+	@ $(CCDEP) ${DEPFLAGS} ${CPPFLAGS} ${INCLUDES} ${DEFS} $< > $@
 
-$(addsuffix .d,$(ALLOBJ)): %.d: ${srcdir}/%.c Makefile
-	 @ $(CCDEP) ${DEPFLAGS} ${CPPFLAGS} ${INCLUDES} ${DEFS} $< > $@ 
+$(addsuffix .d, $(filter ${PROGRAMS_WITH_GIT_HASH},${ALLOBJ})): %.d: ${srcdir}/%.c ${top_srcdir}/git_hash.h Makefile
+	@ $(CCDEP) ${DEPFLAGS} ${CPPFLAGS} ${INCLUDES} ${DEFS} $< > $@
 
 ${top_builddir}/fixed_volume.h: ${top_srcdir}/fixed_volume.h.in ${top_builddir}/config.status
 	cd ${abs_top_builddir} && CONFIG_FILES=fixed_volume.h CONFIG_HEADERS= $(SHELL) ${top_builddir}/config.status

diff --git a/Makefile.in b/Makefile.in
@@ -85,9 +85,7 @@ PROGRAMS = hmc_tm benchmark invert gen_sources  \
 ALLOBJ = ${MODULES} ${PROGRAMS} ${SMODULES}
 SUBDIRS = ${USESUBDIRS}
 
-
-
-
+# delete the default suffix rules
 .SUFFIXES:
 
 all: Makefile all-recursive dep hmc_tm invert
@@ -98,8 +96,12 @@ all: Makefile all-recursive dep hmc_tm invert
 #all: Makefile all-recursive dep hmc_tm invert
 #endif
 
+# run the GIT-VERSION-GEN script to generate version information in git_hash.h
+# making sure that we run in the correct directory
+${top_srcdir}/git_hash.h:
+	@cd @srcdir@ && sh GIT-VERSION-GEN
 
-
+# no targets to be built serially
 .NOTPARALLEL:
 
 -include $(addsuffix .d,$(ALLOBJ))
@@ -130,17 +132,14 @@ $(addsuffix .o,$(filter ${NOOPTMOD},${MODULES})): %.o: ${srcdir}/%.c %.d Makefil
 ${addsuffix .o, ${SMODULES}}: %.o: ${srcdir}/%.c %.d Makefile $(abs_top_builddir)/config.h
 	${COMPILE} ${SOPTARGS} -c $<
 
-${addsuffix .o, ${PROGRAMS}}: %.o: ${srcdir}/%.c %.d Makefile $(abs_top_builddir)/config.h
+${addsuffix .o, ${PROGRAMS}}: %.o: ${srcdir}/%.c %.d Makefile $(abs_top_builddir)/config.h ${top_srcdir}/git_hash.h
 	${COMPILE} ${OPTARGS} -c $<
 
-
-
 ${PROGRAMS}: %: %.o libhmc.a all-recursive
 	 ${LINK}  $@.o $(GPUOBJECTS) $(GPUOBJECTS_C) $(LIBS)
 
-
-dep: $(addsuffix .d,$(ALLOBJ))
-	@ echo "...dependency files build"
+dep: $(addsuffix .d,$(ALLOBJ)) 
+	@ echo "...dependency files built"
 
 install: Makefile
 	@mkdir -p $(bindir); \
@@ -169,7 +168,7 @@ distclean: distclean-recursive Makefile
 	rm -f hmc_tm hybrid *.o *.d *~ Makefile config.log config.status fixed_volume.h
 	rm -f config.h
 
-.PHONY: all clean compile-clean distclean dep install \
+.PHONY: all ${top_srcdir}/git_hash.h clean compile-clean distclean dep install \
 	flex_read_input $(PROGRAMS) all-recursive \
 	all-debug-recursive all-profile-recursive \
 	clean-recursive distclean-recursive \

diff --git a/Nondegenerate_Matrix.c b/Nondegenerate_Matrix.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$ 
  *
  * Copyright (C) 2006,2007,2008 Karl Jansen, Thomas Chiarappa, 
  *                              Carsten Urbach
@@ -917,7 +916,6 @@ void red_noise_nd(spinor * const lse, spinor * const lso,
   return;
 }
 
-static char const rcsid[] = "$Id$";
 
 
 

diff --git a/Nondegenerate_Matrix.h b/Nondegenerate_Matrix.h
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$ 
  *
  * Copyright (C) 2006,2007,2008 Karl Jansen, Thomas Chiarappa, 
  *                              Carsten Urbach

diff --git a/P_M_eta.c b/P_M_eta.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id: det_monomial.c 1764 2011-04-21 14:16:16Z deuzeman $
  *
  * Copyright (C) 2011 Elena Garcia-Ramos
  *

diff --git a/P_M_eta.h b/P_M_eta.h
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id: det_monomial.c 1764 2011-04-21 14:16:16Z deuzeman $
  *
  * Copyright (C) 2011 Elena Garcia-Ramos
  *

diff --git a/Ptilde_nd.c b/Ptilde_nd.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$ 
  *
  * Copyright (C) 2006 Thomas Chiarappa
  *

diff --git a/X_psi.c b/X_psi.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id: det_monomial.c 1764 2011-04-21 14:16:16Z deuzeman $
  *
  * Copyright (C) 2011 Elena Garcia-Ramos
  *

diff --git a/X_psi.h b/X_psi.h
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id: det_monomial.c 1764 2011-04-21 14:16:16Z deuzeman $
  *
  * Copyright (C) 2011 Elena Garcia-Ramos
  *

diff --git a/benchmark.c b/benchmark.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
  ***********************************************************************/
-/* $Id$ */
 /*******************************************************************************
 *
 * Benchmark program for the even-odd preconditioned Wilson-Dirac operator

diff --git a/bgl.h b/bgl.h
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$ 
  *
  * Copyright (C) 2006,2007 Carsten Urbach
  *

diff --git a/block.c b/block.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$
  * 
  * Copyright (C) 2008 Albert Deuzeman, Siebren Reker, Carsten Urbach
  *               2010 Claude Tadonki, Carsten Urbach

diff --git a/block.h b/block.h
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$ 
  *
  * Copyright (C) 2008 Albert Deuzeman, Siebren Reker, Carsten Urbach
  *               2010 Claude Tadonki, Carsten Urbach

diff --git a/boundary.c b/boundary.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$
  * Copyright (C) 2001 Martin Hasenbusch
  * Copyright (C) 2006,2007,2008 Carsten Urbach
  *

diff --git a/boundary.h b/boundary.h
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
  ***********************************************************************/
-/* $Id$ */
 
 #ifndef _BOUNDARY_H
 #define _BOUNDARY_H

diff --git a/buffers/Makefile.in b/buffers/Makefile.in
@@ -1,4 +1,3 @@
-# $Id: Makefile.in 1793 2011-10-12 21:55:13Z reker $
 
 srcdir = @srcdir@
 top_builddir =  @top_builddir@

diff --git a/chebyshev_polynomial.c b/chebyshev_polynomial.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$ 
  * 
  * Copyright (C) 2003,2005,2006,2007,2008 Mauro Papinutto, Ines Wetzorke,
  *                                        Karl Jansen, Carsten Urbach

diff --git a/chebyshev_polynomial.h b/chebyshev_polynomial.h
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$ 
  *
  * Copyright (C) 2006,2007,2008 Karl Jansen, Carsten Urbach 
  *

diff --git a/chebyshev_polynomial_nd.c b/chebyshev_polynomial_nd.c
@@ -1,5 +1,4 @@
 /***********************************************************************
- * $Id$ 
  *
  * Copyright (C) 2006,2007,2008 Thomas Chiarappa, Carsten Urbach
  *

diff --git a/chebyshev_polynomial_nd.h b/chebyshev_polynomial_nd.h
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
  ***********************************************************************/
-/* $Id$ */
 #ifndef _CHEBYSHEV_POLYNOMIAL_ND_H
 #define _CHEBYSHEV_POLYNOMIAL_ND_H
 

diff --git a/check_locallity.c b/check_locallity.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
  ***********************************************************************/
-/* $Id$ */
 /*******************************************************************************
 *
 * Hybrid-Monte-Carlo for twisted mass QCD

diff --git a/clenshaw_coef.c b/clenshaw_coef.c
@@ -16,7 +16,6 @@
  * You should have received a copy of the GNU General Public License
  * along with tmLQCD.  If not, see <http://www.gnu.org/licenses/>.
  ***********************************************************************/
-/* $Id$ */
 
 #include <stdlib.h>
 #include <stdio.h>