Changes to OTF:

- general: - incremented version number to 1.12.3 - updated copyright information (2012->2013) - fixed compiler warnings occurred when NDEBUG is defined (--with-platform=optimized) - otfprofile, LaTeX output: - swapped x & y axis of the Message Data Rate Matrix - adapted labels to Vampir Changes to VT: - general: - incremented version number to 5.14.3 - updated copyright information (2012->2013) - fixed compiler warnings occurred when NDEBUG is defined (--with-platform=optimized) - configure / build system: - do not search for the MPI lib. when an MPI compiler wrapper was found (prevents double linkage of the MPI lib. when building vtunify-mpi and vtfilter-mpi) - prepend cross-prefix to the compiler wrappers *only* if '--with-cross-prefix[=PREFIX]' is given - removed unnecessary sources from libvt-java - VT libs: - extended inoffical API for manual region tracing: allow specifying a group name - plugin counters: Merge a set of post-mortem counters and write them under a single async key. This speeds up the unification. - Java tracing: - removed multiple asking for the current thread id when recording method enter/leave events - replaced hash function (id % prime) by Jenking's recommended one ( id & (hash_table_size-1) ) - vtdyn: Do not instrument regions where inserting instrumentation would requires using a trap - vtsetup: Fixed availability state of the exec tracing feature This commit was SVN r28162.
2013-03-08 13:50:26 +00:00 · 2013-03-08 13:50:26 +00:00 · 8094a57dc7
--- a/ompi/contrib/vt/vt/COPYING
+++ b/ompi/contrib/vt/vt/COPYING
@ -1,4 +1,4 @@
-Copyright (c) 2005-2012, ZIH, TU Dresden, Federal Republic of Germany
+Copyright (c) 2005-2013, ZIH, TU Dresden, Federal Republic of Germany

 Copyright (c) 1998-2005, Forschungszentrum Juelich, Juelich Supercomputing
                         Centre, Federal Republic of Germany
--- a/ompi/contrib/vt/vt/ChangeLog
+++ b/ompi/contrib/vt/vt/ChangeLog
@ -1,3 +1,17 @@
+5.14.3openmpi
+	- updated version of internal OTF to 1.12.3openmpi
+	  (see extlib/otf/ChangeLog)
+	- fixed build error when using the Intel MPI compiler wrappers
+	- prepend cross-prefix to the compiler wrappers *only* if
+	  '--with-cross-prefix[=PREFIX]' is given
+	- fixed a potential minor bug in CUPTI activity stream handling
+	- workaround for CUDA 5.0 bug: do not call cuDeviceSynchronize(), if
+	  stream reuse is enabled and a CUDA stream is about to be destroyed
+	- vtdyn: do not instrument regions where using a trap is required
+	- plugin counters: Merge a set of post-mortem counters and write them
+	  under a single async key. This speeds up the unification.
+	- vtsetup: fixed availability state of the exec tracing feature
+
 5.14.2openmpi
 	- fixed build error occurred if VT is configured with exec tracing
 	  enabled, but with memory allocation tracing disabled
--- a/ompi/contrib/vt/vt/LICENSE
+++ b/ompi/contrib/vt/vt/LICENSE
@ -1,4 +1,4 @@
-Copyright (c) 2005-2012, ZIH, TU Dresden, Federal Republic of Germany
+Copyright (c) 2005-2013, ZIH, TU Dresden, Federal Republic of Germany

 Copyright (c) 1998-2005, Forschungszentrum Juelich, Juelich Supercomputing
                         Centre, Federal Republic of Germany
--- a/ompi/contrib/vt/vt/VERSION
+++ b/ompi/contrib/vt/vt/VERSION
@ -1 +1 @@
-5.14.2openmpi
+5.14.3openmpi
--- a/ompi/contrib/vt/vt/config/m4/acinclude.cross.m4
+++ b/ompi/contrib/vt/vt/config/m4/acinclude.cross.m4
@ -103,16 +103,16 @@ See \`config.log' for more details.])])
 	])

 	# Check prefix for cross-tool's executables
-	cross_prefix="cross-"
 	AC_ARG_WITH(cross-prefix,
 		AC_HELP_STRING([--with-cross-prefix=PREFIX],
 		[prefix for cross-tool's executables (e.g. PREFIXvtcc, PREFIXvtfort), default: cross-]),
 	[
-		AS_IF([test x"$withval" = "xno"], [cross_prefix=],
-		[AS_IF([test x"$withval" != "xyes"], [cross_prefix=$withval])])
+		AS_IF([test x"$cross_compiling" = "xyes" -a x"$comp_for_build_given" = "xyes"],
+		[
+			AS_IF([test x"$withval" = "xyes"], [CROSS_PREFIX="cross-"],
+			[AS_IF([test x"$withval" != "xno"], [CROSS_PREFIX="$withval"])])
+		])
 	])
-	AS_IF([test x"$cross_compiling" = "xyes" -a x"$comp_for_build_given" = "xyes"],
-	[CROSS_PREFIX=$cross_prefix], [CROSS_PREFIX=])

 	AC_SUBST(CROSS_PREFIX)
 ])
--- a/ompi/contrib/vt/vt/config/m4/acinclude.mpi.m4
+++ b/ompi/contrib/vt/vt/config/m4/acinclude.mpi.m4
@ -468,31 +468,14 @@ AC_DEFUN([ACVT_MPI],

 	AS_IF([test x"$check_mpi" = "xyes"],
 	[
-		AC_CHECK_PROGS(MPICC, mpicc hcc mpcc_r mpcc mpxlc_r mpxlc mpixlc_r mpixlc cmpicc mpiicc)
-		AS_IF([test x"$MPICC" != x],
-		[
-			AS_IF([test x"$inside_openmpi" = "xno"],
-			[
-				mpicc=`echo $MPICC | cut -d ' ' -f 1`
-				which_mpicc=`which $mpicc 2>/dev/null`
-				AS_IF([test x"$which_mpicc" = x], [AC_MSG_ERROR([$mpicc not found])])
+dnl		check for MPICC

-				mpi_bin_dir=`dirname $which_mpicc`
-				AS_IF([test "$mpi_bin_dir" != "/usr/bin" -a "$mpi_bin_dir" != "/SX/usr/bin"],
-				[
-					AS_IF([test x"$MPIDIR" = x],
-					[MPIDIR=`echo $mpi_bin_dir | sed -e 's/bin//'`])
-					AS_IF([test x"$MPIINCDIR" = x],
-					[MPIINCDIR=-I`echo $mpi_bin_dir | sed -e 's/bin/include/'`])
-					AS_IF([test x"$FMPIINCDIR" = x],
-					[FMPIINCDIR=$MPIINCDIR])
-					AS_IF([test x"$MPILIBDIR" = x],
-					[MPILIBDIR=-L`echo $mpi_bin_dir | sed -e 's/bin/lib/'`])
-				])
-			])
-		],
+		AC_CHECK_PROGS(MPICC, mpicc hcc mpcc_r mpcc mpxlc_r mpxlc mpixlc_r mpixlc cmpicc mpiicc, $CC)
+
+dnl		check for mpi.h, if MPICC was not found
+
+		AS_IF([test x"$MPICC" = x"$CC" -a x"$inside_openmpi" = "xno"],
 		[
-			MPICC="$CC"
 			sav_CPPFLAGS=$CPPFLAGS
 			CPPFLAGS="$CPPFLAGS $MPIINCDIR"
 			AC_CHECK_HEADER([mpi.h], [],
@ -503,175 +486,182 @@ AC_DEFUN([ACVT_MPI],
 			CPPFLAGS=$sav_CPPFLAGS
 		])

+dnl		check for MPICXX
+
 		AS_IF([test x"$mpi_error" = "xno"],
 		[
-			AC_CHECK_PROGS(MPICXX, mpicxx mpic++ mpiCC hcp mpxlC_r mpxlC mpCC_r mpCC cmpic++)
-			AS_IF([test x"$MPICXX" = x], [MPICXX="$CXX"])
-
+			AC_CHECK_PROGS(MPICXX, mpicxx mpic++ mpiCC hcp mpxlC_r mpxlC mpCC_r mpCC cmpic++, $CXX)
 			MPICXXFLAGS="$MPICXXFLAGS -DMPICH_SKIP_MPICXX -DOMPI_SKIP_MPICXX -DMPI_NO_CPPBIND"
 		])

 dnl		check for MPILIB

-		AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
+		AS_IF([test "$MPICC" = "$CC"],
 		[
-			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR -lmpi_r"
-			AC_MSG_CHECKING([whether linking with -lmpi_r works])
-			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); MPILIB=-lmpi_r],[AC_MSG_RESULT([no])])
-			LIBS=$sav_LIBS
-		])
-
-		AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR -lmpi"
-			AC_MSG_CHECKING([whether linking with -lmpi works])
-			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); MPILIB=-lmpi],[AC_MSG_RESULT([no])])
-			LIBS=$sav_LIBS
-
-			AS_IF([test x"$MPILIB" != x],
+			AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
 			[
 				sav_LIBS=$LIBS
-				LIBS="$LIBS $MPILIBDIR -llam"
-				AC_MSG_CHECKING([whether linking with -llam works])
+				LIBS="$LIBS $MPILIBDIR -lmpi_r"
+				AC_MSG_CHECKING([whether linking with -lmpi_r works])
 				AC_TRY_LINK([],[],
-				[AC_MSG_RESULT([yes]); MPILIB="-lmpi -llam"],[AC_MSG_RESULT([no])])
+				[AC_MSG_RESULT([yes]); MPILIB=-lmpi_r],[AC_MSG_RESULT([no])])
 				LIBS=$sav_LIBS
 			])
-		])

-		AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			AS_IF([test x"$MPILIBDIR" = x],
-			[pmilibdir="-L/usr/lib/pmi"], [pmilibdir="$MPILIBDIR/pmi"])
+			AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
+			[
+				sav_LIBS=$LIBS
+				LIBS="$LIBS $MPILIBDIR -lmpi"
+				AC_MSG_CHECKING([whether linking with -lmpi works])
+				AC_TRY_LINK([],[],
+				[AC_MSG_RESULT([yes]); MPILIB=-lmpi],[AC_MSG_RESULT([no])])
+				LIBS=$sav_LIBS

-			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR $pmilibdir -lmpi -lpmi"
-			AC_MSG_CHECKING([whether linking with -lmpi $pmilibdir -lpmi works])
-			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); MPILIBDIR="$MPILIBDIR $pmilibdir"; MPILIB="-lmpi -lpmi"],
-			[AC_MSG_RESULT([no])])
-			LIBS=$sav_LIBS
-		])
+				AS_IF([test x"$MPILIB" != x],
+				[
+					sav_LIBS=$LIBS
+					LIBS="$LIBS $MPILIBDIR -llam"
+					AC_MSG_CHECKING([whether linking with -llam works])
+					AC_TRY_LINK([],[],
+					[AC_MSG_RESULT([yes]); MPILIB="-lmpi -llam"],[AC_MSG_RESULT([no])])
+					LIBS=$sav_LIBS
+				])
+			])
+
+			AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
+			[
+				AS_IF([test x"$MPILIBDIR" = x],
+				[pmilibdir="-L/usr/lib/pmi"], [pmilibdir="$MPILIBDIR/pmi"])
+
+				sav_LIBS=$LIBS
+				LIBS="$LIBS $MPILIBDIR $pmilibdir -lmpi -lpmi"
+				AC_MSG_CHECKING([whether linking with -lmpi $pmilibdir -lpmi works])
+				AC_TRY_LINK([],[],
+				[AC_MSG_RESULT([yes]); MPILIBDIR="$MPILIBDIR $pmilibdir"; MPILIB="-lmpi -lpmi"],
+				[AC_MSG_RESULT([no])])
+				LIBS=$sav_LIBS
+			])
 			
-		AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR -lmpich"
-			AC_MSG_CHECKING([whether linking with -lmpich works])
-			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); MPILIB=-lmpich],[AC_MSG_RESULT([no])])
-			LIBS=$sav_LIBS
-			AS_IF([test x"$MPILIB" != x],
-			[MPICFLAGS="$MPICFLAGS -DMPICH_IGNORE_CXX_SEEK"])
-		])
-
-		AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR -lmpichg2"
-			AC_MSG_CHECKING([whether linking with -lmpichg2 works])
-			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); MPILIB=-lmpichg2],[AC_MSG_RESULT([no])])
-			LIBS=$sav_LIBS
-			AS_IF([test x"$MPILIB" != x],
-			[MPICFLAGS="$MPICFLAGS -DMPICH_IGNORE_CXX_SEEK"])
-		])
-
-		AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR -lhpmpi"
-			AC_MSG_CHECKING([whether linking with -lhpmpi works])
-			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); MPILIB=-lhpmpi],[AC_MSG_RESULT([no])])
-			LIBS=$sav_LIBS
-			AS_IF([test x"$MPILIB" != x],
+			AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
 			[
 				sav_LIBS=$LIBS
-				LIBS="$LIBS $MPILIBDIR -lmtmpi"
-				AC_MSG_CHECKING([whether linking with -lmtmpi works])
+				LIBS="$LIBS $MPILIBDIR -lmpich"
+				AC_MSG_CHECKING([whether linking with -lmpich works])
 				AC_TRY_LINK([],[],
-				[AC_MSG_RESULT([yes]); MPILIB=-lmtmpi],[AC_MSG_RESULT([no])])
+				[AC_MSG_RESULT([yes]); MPILIB=-lmpich],[AC_MSG_RESULT([no])])
 				LIBS=$sav_LIBS
+				AS_IF([test x"$MPILIB" != x],
+				[MPICFLAGS="$MPICFLAGS -DMPICH_IGNORE_CXX_SEEK"])
 			])
-		])

-		AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			AC_MSG_NOTICE([error: no libmpi_r, libmpi, liblam, libmpich, or libhpmpi found; check path for MPI package first...])
-			mpi_error="yes"
+			AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
+			[
+				sav_LIBS=$LIBS
+				LIBS="$LIBS $MPILIBDIR -lmpichg2"
+				AC_MSG_CHECKING([whether linking with -lmpichg2 works])
+				AC_TRY_LINK([],[],
+				[AC_MSG_RESULT([yes]); MPILIB=-lmpichg2],[AC_MSG_RESULT([no])])
+				LIBS=$sav_LIBS
+				AS_IF([test x"$MPILIB" != x],
+				[MPICFLAGS="$MPICFLAGS -DMPICH_IGNORE_CXX_SEEK"])
+			])
+
+			AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
+			[
+				sav_LIBS=$LIBS
+				LIBS="$LIBS $MPILIBDIR -lhpmpi"
+				AC_MSG_CHECKING([whether linking with -lhpmpi works])
+				AC_TRY_LINK([],[],
+				[AC_MSG_RESULT([yes]); MPILIB=-lhpmpi],[AC_MSG_RESULT([no])])
+				LIBS=$sav_LIBS
+				AS_IF([test x"$MPILIB" != x],
+				[
+					sav_LIBS=$LIBS
+					LIBS="$LIBS $MPILIBDIR -lmtmpi"
+					AC_MSG_CHECKING([whether linking with -lmtmpi works])
+					AC_TRY_LINK([],[],
+					[AC_MSG_RESULT([yes]); MPILIB=-lmtmpi],[AC_MSG_RESULT([no])])
+					LIBS=$sav_LIBS
+				])
+			])
+
+			AS_IF([test x"$MPILIB" = x -a x"$mpi_error" = "xno"],
+			[
+				AC_MSG_NOTICE([error: no libmpi_r, libmpi, liblam, libmpich, or libhpmpi found; check path for MPI package first...])
+				mpi_error="yes"
+			])
 		])

 dnl		check for PMPILIB

 		AS_IF([test x"$PMPILIB" = x -a x"$mpi_error" = "xno"],
 		[
+			sav_CC=$CC
+			CC=$MPICC
+
 			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR -lpmpich"
-			AC_MSG_CHECKING([whether linking with -lpmpich works])
+			LIBS="$LIBS $MPILIBDIR -lpmpich $MPILIB"
+			AC_MSG_CHECKING([whether linking with -lpmpich $MPILIB works])
 			AC_TRY_LINK([],[],
 			[AC_MSG_RESULT([yes]); PMPILIB=-lpmpich],[AC_MSG_RESULT([no])])
 			LIBS=$sav_LIBS
-		])

-		AS_IF([test x"$PMPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR -lpmpichg2"
-			AC_MSG_CHECKING([whether linking with -lpmpichg2 works])
-			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); PMPILIB=-lpmpichg2],[AC_MSG_RESULT([no])])
-			LIBS=$sav_LIBS
-		])
-
-		AS_IF([test x"$PMPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			sav_LIBS=$LIBS
-			LIBS="$LIBS $MPILIBDIR -lpmpi"
-			AC_MSG_CHECKING([whether linking with -lpmpi works])
-			AC_TRY_LINK([],[],
-			[AC_MSG_RESULT([yes]); PMPILIB=-lpmpi],[AC_MSG_RESULT([no])])
-			LIBS=$sav_LIBS
-			AS_IF([test x"$PMPILIB" != x],
+			AS_IF([test x"$PMPILIB" = x -a x"$mpi_error" = "xno"],
 			[
 				sav_LIBS=$LIBS
-				LIBS="$LIBS $MPILIBDIR -lmtpmpi"
-				AC_MSG_CHECKING([whether linking with -lmtpmpi works])
+				LIBS="$LIBS $MPILIBDIR -lpmpichg2 $MPILIB"
+				AC_MSG_CHECKING([whether linking with -lpmpichg2 $MPILIB works])
 				AC_TRY_LINK([],[],
-				[AC_MSG_RESULT([yes]); PMPILIB=-lmtpmpi],[AC_MSG_RESULT([no])])
+				[AC_MSG_RESULT([yes]); PMPILIB=-lpmpichg2],[AC_MSG_RESULT([no])])
 				LIBS=$sav_LIBS
 			])
-		])

-		AS_IF([test x"$PMPILIB" = x -a x"$mpi_error" = "xno"],
-		[
-			PMPILIB="$MPILIB"
-			AC_MSG_WARN([no libpmpich, or libpmpi found; assuming $MPILIB])
+dnl			Do not check for libpmpi. When using the Open MPI compiler wrapper, this check
+dnl			succeeds even if this library isn't present.
+dnl			AS_IF([test x"$PMPILIB" = x -a x"$mpi_error" = "xno"],
+dnl			[
+dnl				sav_LIBS=$LIBS
+dnl				LIBS="$LIBS $MPILIBDIR -lpmpi $MPILIB"
+dnl				AC_MSG_CHECKING([whether linking with -lpmpi $MPILIB works])
+dnl				AC_TRY_LINK([],[],
+dnl				[AC_MSG_RESULT([yes]); PMPILIB=-lpmpi],[AC_MSG_RESULT([no])])
+dnl				LIBS=$sav_LIBS
+dnl				AS_IF([test x"$PMPILIB" != x],
+dnl				[
+dnl					sav_LIBS=$LIBS
+dnl					LIBS="$LIBS $MPILIBDIR -lmtpmpi"
+dnl					AC_MSG_CHECKING([whether linking with -lmtpmpi works])
+dnl					AC_TRY_LINK([],[],
+dnl					[AC_MSG_RESULT([yes]); PMPILIB=-lmtpmpi],[AC_MSG_RESULT([no])])
+dnl					LIBS=$sav_LIBS
+dnl				])
+dnl			])
+
+			AS_IF([test x"$PMPILIB" = x -a x"$mpi_error" = "xno"],
+			[PMPILIB="$MPILIB"])
+
+			CC=$sav_CC
 		])

 dnl		check for FMPILIB

-		AS_IF([test x"$FC" != x],
+		AS_IF([test x"$FC" != x -a x"$FMPILIB" = x -a x"$mpi_error" = "xno"],
 		[
-			AS_IF([test x"$FMPILIB" = x -a x"$mpi_error" = "xno"],
-			[
-				sav_LIBS=$LIBS
-				LIBS="$LIBS $MPILIBDIR -lmpi_f77 $MPILIB"
-				AC_MSG_CHECKING([whether linking with -lmpi_f77 works])
-				AC_TRY_LINK([],[],
-				[AC_MSG_RESULT([yes]); FMPILIB=-lmpi_f77],[AC_MSG_RESULT([no])])
-				LIBS=$sav_LIBS
-			])
+			sav_CC=$CC
+			CC=$MPICC
+
+			sav_LIBS=$LIBS
+			LIBS="$LIBS $MPILIBDIR -lmpi_f77 $MPILIB"
+			AC_MSG_CHECKING([whether linking with -lmpi_f77 $MPILIB works])
+			AC_TRY_LINK([],[],
+			[AC_MSG_RESULT([yes]); FMPILIB=-lmpi_f77],[AC_MSG_RESULT([no])])
+			LIBS=$sav_LIBS

 			AS_IF([test x"$FMPILIB" = x -a x"$mpi_error" = "xno"],
 			[
 				sav_LIBS=$LIBS
 				LIBS="$LIBS $MPILIBDIR -lmpi_mpifh $MPILIB"
-				AC_MSG_CHECKING([whether linking with -lmpi_mpifh works])
+				AC_MSG_CHECKING([whether linking with -lmpi_mpifh $MPILIB works])
 				AC_TRY_LINK([],[],
 				[AC_MSG_RESULT([yes]); FMPILIB="-lmpi_mpifh"],[AC_MSG_RESULT([no])])
 				LIBS=$sav_LIBS
@ -680,8 +670,8 @@ dnl		check for FMPILIB
 			AS_IF([test x"$FMPILIB" = x -a x"$mpi_error" = "xno"],
 			[
 				sav_LIBS=$LIBS
-				LIBS="$LIBS $MPILIBDIR -lmpibinding_f77"
-				AC_MSG_CHECKING([whether linking with -lmpibinding_f77 works])
+				LIBS="$LIBS $MPILIBDIR -lmpibinding_f77 $MPILIB"
+				AC_MSG_CHECKING([whether linking with -lmpibinding_f77 $MPILIB works])
 				AC_TRY_LINK([],[],
 				[AC_MSG_RESULT([yes]); FMPILIB=-lmpibinding_f77],[AC_MSG_RESULT([no])])
 				LIBS=$sav_LIBS
@ -690,8 +680,8 @@ dnl		check for FMPILIB
 			AS_IF([test x"$FMPILIB" = x -a x"$mpi_error" = "xno"],
 			[
 				sav_LIBS=$LIBS
-				LIBS="$LIBS $MPILIBDIR -lfmpich"
-				AC_MSG_CHECKING([whether linking with -lfmpich works])
+				LIBS="$LIBS $MPILIBDIR -lfmpich $MPILIB"
+				AC_MSG_CHECKING([whether linking with -lfmpich $MPILIB works])
 				AC_TRY_LINK([],[],
 				[AC_MSG_RESULT([yes]); FMPILIB=-lfmpich],[AC_MSG_RESULT([no])])
 				LIBS=$sav_LIBS
@ -700,8 +690,8 @@ dnl		check for FMPILIB
 			AS_IF([test x"$FMPILIB" = x -a x"$mpi_error" = "xno"],
 			[
 				sav_LIBS=$LIBS
-				LIBS="$LIBS $MPILIBDIR -llamf77mpi"
-				AC_MSG_CHECKING([whether linking with -llamf77mpi works])
+				LIBS="$LIBS $MPILIBDIR -llamf77mpi $MPILIB"
+				AC_MSG_CHECKING([whether linking with -llamf77mpi $MPILIB works])
 				AC_TRY_LINK([],[],
 				[AC_MSG_RESULT([yes]); FMPILIB=-llamf77mpi],[AC_MSG_RESULT([no])])
 				LIBS=$sav_LIBS
@ -739,6 +729,8 @@ dnl		check for FMPILIB
 					])
 				])
 			])
+
+			CC=$sav_CC
 		])

 dnl		check for MPI-2
@ -942,26 +934,10 @@ AC_DEFUN([ACVT_FMPIWRAPLIB],

 	AS_IF([test x"$FC" != x],
 	[
-		AC_CHECK_PROGS(MPIFC, mpif77 hf77 mpxlf_r mpxlf mpf77 cmpifc mpifort mpif90 mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpf90 cmpif90c)
-		AS_IF([test x"$MPIFC" != x],
-		[
-			AS_IF([test x"$inside_openmpi" = "xno"],
-			[
-				mpifc=`echo $MPIFC | cut -d ' ' -f 1`
-				which_mpifc=`which $mpifc 2>/dev/null`
-				AS_IF([test x"$which_mpifc" = x], [AC_MSG_ERROR([$mpifc not found])])
+		AC_CHECK_PROGS(MPIFC, mpif77 hf77 mpxlf_r mpxlf mpf77 cmpifc mpifort mpif90 mpxlf95_r mpxlf90_r mpxlf95 mpxlf90 mpf90 cmpif90c, $FC)

-				mpi_bin_dir=`dirname $which_mpifc`
-				AS_IF([test "$mpi_bin_dir" != "/usr/bin" -a "$mpi_bin_dir" != "/SX/usr/bin" -a x"$FMPIINCDIR" != x-I"$mpi_inc_dir"],
-				[
-					mpi_inc_dir=-I`echo $mpi_bin_dir | sed -e 's/bin/include/'`
-					AS_IF([test x"$FMPIINCDIR" != x"$mpi_inc_dir"],
-					[FMPIINCDIR="$FMPIINCDIR -I`echo $mpi_bin_dir | sed -e 's/bin/include/'`"])
-				])
-			])
-		],
+		AS_IF([test x"$MPIFC" = x"$FC" -a x"$inside_openmpi" = "xno"],
 		[
-			MPIFC="$FC"
 			AC_MSG_CHECKING([for mpif.h])
 			rm -f conftest.f conftest.o
 			cat > conftest.f << EOF
--- a/ompi/contrib/vt/vt/config/m4/acinclude.vtsetup.m4
+++ b/ompi/contrib/vt/vt/config/m4/acinclude.vtsetup.m4
@ -13,7 +13,7 @@ AC_DEFUN([ACVT_SETUP],
 	VT_SETUP_ETIMESYNC=0
 	VT_SETUP_IOTRACE=0
 	VT_SETUP_JAVA=0
-	VT_SETUP_LIBCTRACE=0
+	VT_SETUP_EXECTRACE=0
 	VT_SETUP_MEMTRACE=0
 	VT_SETUP_METRICS=0
 	VT_SETUP_MPI=0
@ -73,7 +73,7 @@ AC_DEFUN([ACVT_SETUP],
 	AC_SUBST(VT_SETUP_ETIMESYNC)
 	AC_SUBST(VT_SETUP_IOTRACE)
 	AC_SUBST(VT_SETUP_JAVA)
-	AC_SUBST(VT_SETUP_LIBCTRACE)
+	AC_SUBST(VT_SETUP_EXECTRACE)
 	AC_SUBST(VT_SETUP_MEMTRACE)
 	AC_SUBST(VT_SETUP_METRICS)
 	AC_SUBST(VT_SETUP_MPI)
--- a/ompi/contrib/vt/vt/config/mpigen/mk_c_wrapper.sh.in
+++ b/ompi/contrib/vt/vt/config/mpigen/mk_c_wrapper.sh.in
@ -51,7 +51,7 @@ cat <<End-of-File >$tmp.c
 * VampirTrace
 * http://www.tu-dresden.de/zih/vampirtrace
 *
- * Copyright (c) 2005-2012, ZIH, TU Dresden, Federal Republic of Germany
+ * Copyright (c) 2005-2013, ZIH, TU Dresden, Federal Republic of Germany
 *
 * Copyright (c) 1998-2005, Forschungszentrum Juelich, Juelich Supercomputing
 *                          Centre, Federal Republic of Germany
--- a/ompi/contrib/vt/vt/config/mpigen/mk_fortran_wrapper.sh.in
+++ b/ompi/contrib/vt/vt/config/mpigen/mk_fortran_wrapper.sh.in
@ -63,7 +63,7 @@ cat <<End-of-File >$tmp.c
 * VampirTrace
 * http://www.tu-dresden.de/zih/vampirtrace
 *
- * Copyright (c) 2005-2012, ZIH, TU Dresden, Federal Republic of Germany
+ * Copyright (c) 2005-2013, ZIH, TU Dresden, Federal Republic of Germany
 *
 * Copyright (c) 1998-2005, Forschungszentrum Juelich, Juelich Supercomputing
 *                          Centre, Federal Republic of Germany
--- a/ompi/contrib/vt/vt/config/mpigen/mk_registry.sh.in
+++ b/ompi/contrib/vt/vt/config/mpigen/mk_registry.sh.in
@ -51,7 +51,7 @@ cat <<End-of-File >$tmp.h
 * VampirTrace
 * http://www.tu-dresden.de/zih/vampirtrace
 *
- * Copyright (c) 2005-2012, ZIH, TU Dresden, Federal Republic of Germany
+ * Copyright (c) 2005-2013, ZIH, TU Dresden, Federal Republic of Germany
 *
 * Copyright (c) 1998-2005, Forschungszentrum Juelich, Juelich Supercomputing
 *                          Centre, Federal Republic of Germany
@ -100,7 +100,7 @@ cat <<End-of-File >$tmp.c
 * VampirTrace
 * http://www.tu-dresden.de/zih/vampirtrace
 *
- * Copyright (c) 2005-2012, ZIH, TU Dresden, Federal Republic of Germany
+ * Copyright (c) 2005-2013, ZIH, TU Dresden, Federal Republic of Germany
 *
 * Copyright (c) 1998-2005, Forschungszentrum Juelich, Juelich Supercomputing
 *                          Centre, Federal Republic of Germany
--- a/ompi/contrib/vt/vt/config_bottom.h
+++ b/ompi/contrib/vt/vt/config_bottom.h
@ -43,6 +43,8 @@
 # define vt_fnmatch(_pattern, _string, __flags) strcmp(_string, _pattern)
 #endif /* HAVE_FNMATCH_H */

+#define assert(expr) vt_assert((expr))
+
 #if defined(HAVE_SYS_PARAM_H) && HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
--- a/ompi/contrib/vt/vt/doc/UserManual.html
+++ b/ompi/contrib/vt/vt/doc/UserManual.html
@ -67,7 +67,7 @@ BODY			{ font-family: sans-serif; }
 <P>

 <P>
-<B><BIG CLASS="XHUGE">VampirTrace 5.14.2&nbsp;User Manual</BIG></B>
+<B><BIG CLASS="XHUGE">VampirTrace 5.14.3&nbsp;User Manual</BIG></B>
 <BR>
 <BR>
 <BR>
@ -4430,7 +4430,7 @@ are shown below:
 </LI>
 <LI>Set <TT>-host=</TT> to the output of <TT>config.guess</TT> on the back-end.
 </LI>
-<LI>Set <TT>-with-cross-prefix=</TT> to a prefix which will be prepended to the executables of the compiler wrappers and OPARI (default: ``cross-'')
+<LI>Set <TT>-with-cross-prefix=</TT> to a prefix which will be prepended to the executables of the compiler wrappers (default: ``cross-'')
 </LI>
 <LI>Maybe you also need to set additional commands and flags for the back-end (e.g.&nbsp;<TT>RANLIB</TT>, <TT>AR</TT>, <TT>MPICC</TT>, <TT>CXXFLAGS</TT>).
 </LI>
--- a/ompi/contrib/vt/vt/doc/UserManual.pdf
+++ b/ompi/contrib/vt/vt/doc/UserManual.pdf
--- a/ompi/contrib/vt/vt/extlib/otf/COPYING
+++ b/ompi/contrib/vt/vt/extlib/otf/COPYING
@ -1,4 +1,4 @@
-Copyright (c) 2005-2012, ZIH, Technische Universitaet Dresden,
+Copyright (c) 2005-2013, ZIH, Technische Universitaet Dresden,
 Federal Republic of Germany

 All rights reserved.
--- a/ompi/contrib/vt/vt/extlib/otf/ChangeLog
+++ b/ompi/contrib/vt/vt/extlib/otf/ChangeLog
@ -1,3 +1,8 @@
+1.12.3openmpi
+	- otfprofile, LaTeX output:
+		- swapped x & y axis of the Message Data Rate Matrix
+		- adapted labels to Vampir
+
 1.12.2openmpi
 	- fixed conflicts with OpenType Fonts:
 		- install header files to INCLUDEDIR/open-trace-format
--- a/ompi/contrib/vt/vt/extlib/otf/LICENSE
+++ b/ompi/contrib/vt/vt/extlib/otf/LICENSE
@ -1,4 +1,4 @@
-Copyright (c) 2005-2012, ZIH, Technische Universitaet Dresden,
+Copyright (c) 2005-2013, ZIH, Technische Universitaet Dresden,
 Federal Republic of Germany

 All rights reserved.
--- a/ompi/contrib/vt/vt/extlib/otf/VERSION
+++ b/ompi/contrib/vt/vt/extlib/otf/VERSION
@ -7,7 +7,7 @@

 major=1
 minor=12
-sub=2
+sub=3

 # string is used for alpha, beta, or release tags. If it is non-empty, it will
 # be appended to the version number.
--- a/ompi/contrib/vt/vt/extlib/otf/docu/tools/otfprofile.pdf
+++ b/ompi/contrib/vt/vt/extlib/otf/docu/tools/otfprofile.pdf
--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler_stream.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler_stream.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler_stream.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_CopyHandler_stream.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Definitions.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Errno.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Errno.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 also: patches by Rainer Keller, thanks a lot!
 */
@ -632,7 +632,13 @@ int OTF_File_close( OTF_File* file ) {
 			}

 			status = deflate( OTF_FILE_Z(file), Z_FULL_FLUSH );
-			assert( status != Z_STREAM_ERROR );
+			if (status == Z_STREAM_ERROR) {
+
+				OTF_Error( "ERROR in function %s, file %s, line %i\n"
+						"deflate() failed.\n",
+						__FUNCTION__, __FILE__, __LINE__ );
+				return 0;
+			}

 			towrite = file->zbuffersize - OTF_FILE_Z(file)->avail_out;
 			byteswritten = 0;
--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_FileManager.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File_iofsl.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File_iofsl.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Joseph Schuchart, Thomas Ilsche
 strongly based on OTF_File.c by Authors:
 Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
@ -704,7 +704,14 @@ int OTF_File_iofsl_close( OTF_File* file ) {
 			}

 			status = deflate( OTF_FILE_Z(file), Z_FULL_FLUSH );
-			assert( status != Z_STREAM_ERROR );
+			if ( status == Z_STREAM_ERROR ) {
+
+				OTF_Error( "ERROR in function %s, file %s, line %i\n"
+					"deflate() failed.\n",
+					__FUNCTION__, __FILE__, __LINE__ );
+				return 0;
+			}
+
 			towrite = file->zbuffersize - OTF_FILE_Z(file)->avail_out;
 			byteswritten = 0;

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File_iofsl.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_File_iofsl.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Filenames.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Handler.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Handler.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_HandlerArray.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_KeyValue.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_KeyValue.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch, Johannes Spazier
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_KeyValue.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_KeyValue.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch, Johannes Spazier
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Keywords.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Keywords.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_MasterControl.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Parse.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 
 Copyright (c) 2004-2005, The Trustees of Indiana University and Indiana
--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_unix.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Platform_win.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch 
 also: patches by Rainer Keller, thanks a lot!
 */
--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RBuffer.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 also: patches by Rainer Keller, thanks a lot!
 */
--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_RStream.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Reader.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Version.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Version.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

@ -18,7 +18,7 @@

 #define OTF_VERSION_MAJOR	1
 #define OTF_VERSION_MINOR	12
-#define OTF_VERSION_SUB 	2
+#define OTF_VERSION_SUB 	3
 #define OTF_VERSION_STRING	"openmpi"

 /**
--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WBuffer.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_WStream.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_Writer.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.c
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_unix.h.in
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_unix.h.in
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_win.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/OTF_inttypes_win.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib/otf.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib/otf.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib_py/otf.i
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib_py/otf.i
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_AuxiliaryFunctions.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_AuxiliaryFunctions.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_Wrapper.h
+++ b/ompi/contrib/vt/vt/extlib/otf/otflib_py/pyOTF_Wrapper.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Handler.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/Treehash.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otf2vtf/otf2vtf.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Control.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Handler.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Stats.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Stats.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Stats.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/Stats.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfaux/otfaux.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/otfcompress.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/otfcompress.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/sys_time.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfcompress/sys_time.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/otfconfig.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfconfig/otfconfig.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/Handler.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfdump/otfdump.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Holger Brunst, Ronny Brendel, Thomas Kriebitzsch
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Michael Heyde
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/handler.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Michael Heyde
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Michael Heyde
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/hash.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Michael Heyde
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Michael Heyde
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Michael Heyde
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfinfo/otfinfo_error.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Michael Heyde
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Johannes Spazier
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/handler.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Johannes Spazier
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge.c
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfmerge/otfmerge.c
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Johannes Spazier
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/clustering.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/clustering.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Robert Dietrich, Matthias Jurenz
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/clustering.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/clustering.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Robert Dietrich, Matthias Jurenz
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/collect_data.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/collect_data.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Robert Dietrich, Matthias Jurenz
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/collect_data.h
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/collect_data.h
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Robert Dietrich, Matthias Jurenz
 */

--- a/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/collect_dispersion.cpp
+++ b/ompi/contrib/vt/vt/extlib/otf/tools/otfprofile/collect_dispersion.cpp
@ -1,5 +1,5 @@
 /*
- This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2012.
+ This is part of the OTF library. Copyright by ZIH, TU Dresden 2005-2013.
 Authors: Andreas Knuepfer, Robert Dietrich, Matthias Jurenz
 */

--- a/Показать больше
+++ b/Показать больше