From c68fc59bf53099c84d84e5a0ba37f2b3b84ea158 Mon Sep 17 00:00:00 2001 From: gerber Date: Thu, 9 Oct 2008 15:19:02 +0000 Subject: [PATCH] Release 0.6.0 using parallelized code --- Makefile.in | 14 ++++++-------- configure | 26 ++++++++++++++------------ configure.in | 2 +- man/gpiv.1 | 3 ++- pixmaps/Makefile.in | 3 +++ src/Makefile.in | 2 +- src/piveval_interrogate.c | 9 +++++++-- 7 files changed, 34 insertions(+), 25 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0921876..7317ab9 100644 --- a/Makefile.in +++ b/Makefile.in @@ -35,10 +35,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ - $(top_srcdir)/pixmaps/Makefile.in ABOUT-NLS AUTHORS COPYING \ - ChangeLog INSTALL NEWS acconfig.h config.sub depcomp \ - install-sh missing mkinstalldirs + $(srcdir)/Makefile.in $(top_srcdir)/configure ABOUT-NLS \ + AUTHORS COPYING ChangeLog INSTALL NEWS acconfig.h config.guess \ + config.rpath config.sub depcomp install-sh missing \ + mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -46,7 +46,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_CLEAN_FILES = pixmaps/Makefile +CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -262,8 +262,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) -pixmaps/Makefile: $(top_builddir)/config.status $(top_srcdir)/pixmaps/Makefile.in - cd $(top_builddir) && $(SHELL) ./config.status $@ uninstall-info-am: # This directory's subdirectories are mostly independent; you can cd @@ -401,7 +399,7 @@ distclean-tags: distdir: $(DISTFILES) $(am__remove_distdir) mkdir $(distdir) - $(mkdir_p) $(distdir)/pixmaps $(distdir)/po + $(mkdir_p) $(distdir)/po @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/configure b/configure index a481a86..a2fbc8d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for gpiv 0.5.2. +# Generated by GNU Autoconf 2.61 for gpiv 0.6.0. # # Report bugs to . # @@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='gpiv' PACKAGE_TARNAME='gpiv' -PACKAGE_VERSION='0.5.2' -PACKAGE_STRING='gpiv 0.5.2' +PACKAGE_VERSION='0.6.0' +PACKAGE_STRING='gpiv 0.6.0' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gpiv' # Factoring default headers for most tests. @@ -1279,7 +1279,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gpiv 0.5.2 to adapt to many kinds of systems. +\`configure' configures gpiv 0.6.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gpiv 0.5.2:";; + short | recursive ) echo "Configuration of gpiv 0.6.0:";; esac cat <<\_ACEOF @@ -1455,7 +1455,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gpiv configure 0.5.2 +gpiv configure 0.6.0 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1469,7 +1469,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gpiv $as_me 0.5.2, which was +It was created by gpiv $as_me 0.6.0, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2139,7 +2139,7 @@ fi # Define the identity of the package. PACKAGE=gpiv - VERSION=0.5.2 + VERSION=0.6.0 cat >>confdefs.h <<_ACEOF @@ -9596,8 +9596,10 @@ fi if test x$MPIRUN = xfalse ; then - { { echo "$as_me:$LINENO: error: \"missing mpirun\"" >&5 -echo "$as_me: error: \"missing mpirun\"" >&2;} + { { echo "$as_me:$LINENO: error: \"missing mpirun \ +Needed by gpiv when --enable-mpi\"" >&5 +echo "$as_me: error: \"missing mpirun \ +Needed by gpiv when --enable-mpi\"" >&2;} { (exit 1); exit 1; }; } fi @@ -10205,7 +10207,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gpiv $as_me 0.5.2, which was +This file was extended by gpiv $as_me 0.6.0, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -10252,7 +10254,7 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -gpiv config.status 0.5.2 +gpiv config.status 0.6.0 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.in b/configure.in index 515bb9a..9f4f329 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl =========== Initialization -AC_INIT(gpiv, 0.5.2, http://bugzilla.gnome.org/enter_bug.cgi?product=gpiv) +AC_INIT(gpiv, 0.6.0, http://bugzilla.gnome.org/enter_bug.cgi?product=gpiv) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_MAINTAINER_MODE diff --git a/man/gpiv.1 b/man/gpiv.1 index e741833..83baf1d 100644 --- a/man/gpiv.1 +++ b/man/gpiv.1 @@ -177,7 +177,8 @@ post-processing data with \fB.gpi\fR extension. .TP \fB--mpi_nodes \fIINT\fR -\fIINT\fR defines the number of nodes when used on a cluster. +To define the number of nodes when used on a cluster. Used by +\fBmpirun -np \fIINT\fR. .TP \fB-p\fR | \fB--print\fR diff --git a/pixmaps/Makefile.in b/pixmaps/Makefile.in index da995de..7d4b1e2 100644 --- a/pixmaps/Makefile.in +++ b/pixmaps/Makefile.in @@ -83,6 +83,7 @@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ ENABLE_CAM = @ENABLE_CAM@ ENABLE_DAC = @ENABLE_DAC@ +ENABLE_MPI = @ENABLE_MPI@ ENABLE_TRIG = @ENABLE_TRIG@ EXEEXT = @EXEEXT@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ @@ -136,6 +137,7 @@ MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ +MPIRUN = @MPIRUN@ MSGFMT = @MSGFMT@ MSGFMT_OPTS = @MSGFMT_OPTS@ MSGMERGE = @MSGMERGE@ @@ -154,6 +156,7 @@ POFILES = @POFILES@ POSUB = @POSUB@ PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ +RR = @RR@ RTA_TOPDIR = @RTA_TOPDIR@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ diff --git a/src/Makefile.in b/src/Makefile.in index 1c2beda..4c89df5 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -36,7 +36,7 @@ PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = gpiv$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/src/piveval_interrogate.c b/src/piveval_interrogate.c index 2d4f9dc..31be3bd 100644 --- a/src/piveval_interrogate.c +++ b/src/piveval_interrogate.c @@ -25,6 +25,9 @@ ----------------------------------------------------------------------*/ /* $Log: piveval_interrogate.c,v $ +/* Revision 1.4 2008-10-09 15:19:03 gerber +/* Release 0.6.0 using parallelized code +/* /* Revision 1.3 2008-10-09 14:43:37 gerber /* paralellized with OMP and MPI /* @@ -81,12 +84,14 @@ update_pivdata_imgdeform_zoff (const GpivImage *image, gboolean verbose ); +#ifdef ENABLE_MPI static GpivPivData * exec_piv_mpi (GpivImage *image, GpivPivPar *piv_par, GpivValidPar *valid_par, GpivConsole *gpiv ); +#endif /* ENABLE_MPI */ /* * Program-wide public piv interrogation functions @@ -901,7 +906,7 @@ update_pivdata_imgdeform_zoff (const GpivImage *image, } - +#ifdef ENABLE_MPI static GpivPivData * exec_piv_mpi (GpivImage *image, GpivPivPar *piv_par, @@ -1008,4 +1013,4 @@ exec_piv_mpi (GpivImage *image, g_free (pivdata_name); return pd; } - +#endif /* ENABLE_MPI */ -- 2.11.4.GIT