debian/0000775000000000000000000000000012253676726007210 5ustar debian/rules0000775000000000000000000000674711726360142010270 0ustar #!/usr/bin/make -f DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CONFIGURE_OPTIONS= --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr \ --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --enable-omp config-serial.status: dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif # Add here commands to configure the package. -mkdir debian/build-serial cd debian/build-serial && \ ../../configure $(CONFIGURE_OPTIONS) config-mpi.status: dh_testdir ifneq "$(wildcard /usr/share/misc/config.sub)" "" cp -f /usr/share/misc/config.sub config.sub endif ifneq "$(wildcard /usr/share/misc/config.guess)" "" cp -f /usr/share/misc/config.guess config.guess endif # Add here commands to configure the package. -mkdir debian/build-mpi cd debian/build-mpi && \ ../../configure $(CONFIGURE_OPTIONS) \ --enable-mpi build: build-arch build-indep build-arch: build-stamp build-indep: build-stamp build-stamp: build-stamp-serial build-stamp-mpi build-stamp-serial: config-serial.status dh_testdir # Add here commands to compile the package. $(MAKE) -C debian/build-serial/ #/usr/bin/docbook-to-man debian/gpivtools.sgml > gpivtools.1 touch $@ build-stamp-mpi: config-mpi.status dh_testdir # Add here commands to compile the package. $(MAKE) -C debian/build-mpi/ #/usr/bin/docbook-to-man debian/gpivtools.sgml > gpivtools.1 touch $@ clean: dh_testdir dh_testroot dh_clean build-stamp* install-stamp* # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean -test -r /usr/share/misc/config.sub && \ rm -f config.sub -test -r /usr/share/misc/config.guess && \ rm -f config.guess -rm -rf debian/build-serial -rm -rf debian/build-mpi -rm -rf debian/tmp debian/tmp-mpi -rm -rf debian/gpivtools debian/gpivtools-mpi dh_clean install: build-stamp-serial build-stamp-mpi install-serial: install-stamp-serial install-stamp-serial: build-stamp-serial dh_testdir dh_testroot # dh_clean -k # dh_installdirs # Add here commands to install the package into debian/gpivtools. install -d $(CURDIR)/debian/tmp $(MAKE) -C $(CURDIR)/debian/build-serial/ install \ prefix=$(CURDIR)/debian/tmp/usr dh_install --sourcedir=debian/tmp -pgpivtools touch $@ install-mpi: install-stamp-mpi install-stamp-mpi: build-stamp-mpi dh_testdir dh_testroot # dh_clean -k # dh_installdirs # Add here commands to install the package into debian/gpivtools. install -d $(CURDIR)/debian/tmp-mpi $(MAKE) -C $(CURDIR)/debian/build-mpi/ install \ prefix=$(CURDIR)/debian/tmp-mpi/usr dh_install --sourcedir=debian/tmp-mpi -pgpivtools-mpi touch $@ # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install-serial install-mpi $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common binary-common: dh_testdir dh_testroot dh_installdocs dh_installexamples dh_installmenu dh_installcron dh_installman dh_installinfo dh_installchangelogs ChangeLog dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install debian/watch0000664000000000000000000000011111726354124010217 0ustar version=3 http://sf.net/gpivtools/gpivtools-(.*)\.tar\.gz debian uupdate debian/gpivtools-mpi.lintian-overrides0000664000000000000000000000010511743303753015363 0ustar gpivtools-mpi: unusual-interpreter ./usr/bin/gpiv_series #!mpipython debian/changelog0000664000000000000000000000420512253676725011062 0ustar gpivtools (0.6.0-3build1) trusty; urgency=medium * No-change rebuild for libopenmpi1.3 -> libopenmpi1.6 transition. -- Logan Rosen Mon, 16 Dec 2013 17:25:17 -0500 gpivtools (0.6.0-3) unstable; urgency=low [Gerfried Fuchs] * Improved description (Closes: #539717) [Nicholas Breen] * Update Depends: mpipython (Closes: #646418) -- Gerber van der Graaf Wed, 17 April 2012 14:19:01 +0100 gpivtools (0.6.0-2) unstable; urgency=low [ Jari Aalto ] * Remove deprecated dpatch and upgrade to packaging format "3.0 quilt". * Update to Standards-Version to 3.9.3 and debhelper to 9. -- Gerber van der Graaf Thu, 08 Mar 2012 16:19:01 -0500 gpivtools (0.6.0-1.1) unstable; urgency=medium * Non-maintainer upload. * Fix "FTBFS with binutils-gold" add link to libm (thanks Mahyuddin Susanto) (Closes: #554737) * Changed urgency to medium -- root Sat, 03 Dec 2011 14:09:44 +0100 gpivtools (0.6.0-1) unstable; urgency=low * New upstream release * Added gpivtools-mpi -- Gerber van der Graaf Fri, 23 Jan 2009 10:17:00 +0100 gpivtools (0.5.2-3) unstable; urgency=low * Improved from 2nd comments provided by Vincent Bernat: * Included patches 01_manpages and 02_clean_misc -- Gerber van der Graaf Tue, 10 June 2008 13:21:00 +0100 gpivtools (0.5.2-2) unstable; urgency=low * Improved from comments provided by Vincent Bernat -- Gerber van der Graaf Fri, 6 June 2008 15:48:00 +0100 gpivtools (0.5.2-1) unstable; urgency=low * New upstream release -- Gerber van der Graaf Wed, 9 April 2008 12:06:08 +0100 gpivtools (0.3.3-2) unstable; urgency=low * Updated to Standards-Version: 3.7.2 -- Gerber van der Graaf Wed, 7 Jun 2006 18:09:21 +0100 gpivtools (0.3.3-1) unstable; urgency=low * Initial Release. Closes: #354152 -- Gerber van der Graaf Thu, 20 April 2006 19:05:05 +0100 debian/compat0000664000000000000000000000000211726356062010376 0ustar 9 debian/gpivtools-mpi.install0000664000000000000000000000000511726354124013371 0ustar usr/ debian/copyright0000664000000000000000000000220511743277030011126 0ustar This package was debianized by Gerber van der Graaf on Wed, 5 Nov 2008 12:00:00 +0100. It was downloaded from http://gpivtools.sourceforge.net/ Copyright Holder: Gerber van der Graaf (gerber_graaf@users.sourceforge.net) Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Gerber van der Graaf License: Gpivtools 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 2, or (at your option) any later version. This program 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 this program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL-2 file. debian/source/0000775000000000000000000000000011726356062010500 5ustar debian/source/format0000664000000000000000000000001411726356062011706 0ustar 3.0 (quilt) debian/gpivtools.install0000664000000000000000000000000511726354124012606 0ustar usr/ debian/README.Debian0000664000000000000000000000150111726354124011233 0ustar The Data Acquisition (DAC) feature, i.e. the triggering of light sources (mostly Nd-YAGG lasers) with a camara and the recording of the images has been disabled in the debian package for several reasons: - The upstream package gpivtrig containing the triggering module has not been debianized (yet). - The gpivtrig package uses the rtai package which has to be build in combination with a patched (linux) kernel and installed manually. In order to include this feature do the following: - install a (Linux) source package and rtai-source, unpack them, patch the kernel and build the kernel, together with the rtai and gpivtrig (from upstream source) modules. - download the source of this package (for example with apt-get source package-name). Remove the line --disable-dac in debian/rules, build and install this package. debian/control0000664000000000000000000000701111743301320010564 0ustar Source: gpivtools Section: science Priority: optional Standards-Version: 3.9.3.1 Maintainer: Gerber van der Graaf Homepage: http://gpivtools.sourceforge.net/ Build-Depends: debhelper (>= 9), autotools-dev, libgpiv3-dev, perl, libfftw3-dev, libgsl0-dev, libhdf5-dev (>= 1.8.8), libglib2.0-dev, libpng-dev, libgomp1, mpi-default-dev Package: gpivtools Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libgpiv3, python Replaces: gpivtools-mpi Conflicts: gpivtools-mpi Recommends: plotmtv, imagemagick Description: command line programs for Particle Image Velocimetry A collection of programs for images that are generated during a Particle Image Velocimetry (PIV) experiment. This is a technique to obtain the velocity field of a fluid flow quantitatively and is performed by tracking tracer particles that have been seeded to a fluid. The technique is also applied for observing deformations at surfaces of (solid) bodies. The package contains: * an image processing program for typical filtering and manipulation routines that may be convenient for PIV. * an image interrogation program resulting into estimators of particle image displacements. * validation programs to test on outliers, peak-locking effect and velocity gradients. * post-processing programs for data manipulation (flipping, rotation etc), spatial and time scaling, calculation of spatial averages and derivative quantities from the PIV data, like vorticity and strain. * miscellaneous programs and scripts to perform image format conversion, batch-processing, pipeline processing (image evaluation, validation and post-processing at once), calculation of time averages from a series of PIV data sets, data-visualization and data-manipulation. . All programs start with gpiv_. . This package contains all files used by gpivtools and gpivtools-mpi, like the man pages. Package: gpivtools-mpi Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, libgpiv-mpi3, mpi-default-bin, openmpipython | mpich2python | mpipython, python-scientific Replaces: gpivtools Conflicts: gpivtools Recommends: plotmtv, imagemagick Description: command line programs for Particle Image Velocimetry - MPI version A collection of programs for images that are generated during a Particle Image Velocimetry (PIV) experiment. This is a technique to obtain the velocity field of a fluid flow quantitatively and is performed by tracking tracer particles that have been seeded to a fluid. The technique is also applied for observing deformations at surfaces of (solid) bodies. The package contains: * an image processing program for typical filtering and manipulation routines that may be convenient for PIV. * an image interrogation program resulting into estimators of particle image displacements. * validation programs to test on outliers, peak-locking effect and velocity gradients. * post-processing programs for data manipulation (flipping, rotation etc), spatial and time scaling, calculation of spatial averages and derivative quantities from the PIV data, like vorticity and strain. * miscellaneous programs and scripts to perform image format conversion, batch-processing, pipeline processing (image evaluation, validation and post-processing at once), calculation of time averages from a series of PIV data sets, data-visualization and data-manipulation. . This package contains the MPI-parallelized programs for use on a (Beowulf) cluster. All programs start with gpiv_. debian/docs0000664000000000000000000000000711726354124010045 0ustar README debian/dirs0000664000000000000000000000001011726354124010050 0ustar usr/bin debian/patches/0000775000000000000000000000000011726366650010633 5ustar debian/patches/fix_ftbfs_binutils-gold.diff0000664000000000000000000000170611726356062016273 0ustar From: Gerber van der Graaf Subject: Fix linking by modifying LDADD diff -urNad gpivtools-0.6.0~/src/misc/Makefile.am gpivtools-0.6.0/src/misc/Makefile.am --- gpivtools-0.6.0~/src/misc/Makefile.am 2008-10-09 21:49:30.000000000 +0700 +++ gpivtools-0.6.0/src/misc/Makefile.am 2011-01-29 07:36:56.060743848 +0700 @@ -73,4 +73,4 @@ fi-keyline.pl INCLUDES = @GLIB_CFLAGS@ -I $(RTA_TOPDIR)/include -I . -I $(K_TOPDIR)/include -LDADD = @GLIB_LIBS@ +LDADD = @GLIB_LIBS@ -lm diff -urNad gpivtools-0.6.0~/src/misc/Makefile.in gpivtools-0.6.0/src/misc/Makefile.in --- gpivtools-0.6.0~/src/misc/Makefile.in 2008-10-09 22:29:23.000000000 +0700 +++ gpivtools-0.6.0/src/misc/Makefile.in 2011-01-29 07:37:55.240743789 +0700 @@ -241,7 +241,7 @@ fi-keyline.pl INCLUDES = @GLIB_CFLAGS@ -I $(RTA_TOPDIR)/include -I . -I $(K_TOPDIR)/include -LDADD = @GLIB_LIBS@ +LDADD = @GLIB_LIBS@ -lm all: all-am .SUFFIXES: debian/patches/series0000664000000000000000000000007311726364531012044 0ustar mpi-build.diff fix_ftbfs_binutils-gold.diff man-pages.diff debian/patches/mpi-build.diff0000664000000000000000000015135411726356062013354 0ustar From: Subject: Adapt Makefile for out-of-src build Exclusively link to libgpiv3 or to libgpiv3-mpi, so both libraries may be installed simultaneously while building the gpivtools(-mpi) packages, removes double nprocs declaration when enabled hybried parallel code, extended --help when mpi enabled diff -urNad gpivtools-0.6.0~/Makefile.in gpivtools-0.6.0/Makefile.in --- gpivtools-0.6.0~/Makefile.in 2009-03-09 09:33:31.000000000 +0100 +++ gpivtools-0.6.0/Makefile.in 2009-03-09 09:39:12.000000000 +0100 @@ -36,8 +36,8 @@ subdir = . DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in $(srcdir)/config.h.in \ - $(top_srcdir)/configure COPYING ChangeLog INSTALL config.guess \ - config.sub depcomp install-sh missing mkinstalldirs + $(top_srcdir)/configure COPYING ChangeLog INSTALL depcomp \ + install-sh missing mkinstalldirs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/config/acx_mpi.m4 \ $(top_srcdir)/configure.in diff -urNad gpivtools-0.6.0~/bootstrap gpivtools-0.6.0/bootstrap --- gpivtools-0.6.0~/bootstrap 1970-01-01 01:00:00.000000000 +0100 +++ gpivtools-0.6.0/bootstrap 2009-03-09 09:39:40.000000000 +0100 @@ -0,0 +1,27 @@ +#! /bin/sh +# bootstrap -- Use this script to create generated files from the CVS dist +# Copyright (C) 2000 Gary V. Vaughan +# +# This program 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 2, or (at your option) +# any later version. +# +# This program 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 this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +## @start 1 +#! /bin/sh + +set -x +aclocal -I config +autoheader +automake --foreign --add-missing --copy +autoconf +## @end 1 \ No newline at end of file diff -urNad gpivtools-0.6.0~/config.h.in gpivtools-0.6.0/config.h.in --- gpivtools-0.6.0~/config.h.in 2009-03-09 09:33:31.000000000 +0100 +++ gpivtools-0.6.0/config.h.in 2009-03-09 09:39:12.000000000 +0100 @@ -42,6 +42,9 @@ /* Define to 1 if you have the `gpiv' library (-lgpiv). */ #undef HAVE_LIBGPIV +/* Define to 1 if you have the `gpiv_mpi' library (-lgpiv_mpi). */ +#undef HAVE_LIBGPIV_MPI + /* Define to 1 if you have the `gsl' library (-lgsl). */ #undef HAVE_LIBGSL diff -urNad gpivtools-0.6.0~/configure gpivtools-0.6.0/configure --- gpivtools-0.6.0~/configure 2009-03-09 09:33:31.000000000 +0100 +++ gpivtools-0.6.0/configure 2009-03-09 09:39:12.000000000 +0100 @@ -712,6 +712,10 @@ PLOTMTV HAVE_PLOTMTV_TRUE HAVE_PLOTMTV_FALSE +ENABLE_MPI +MPICC +MPILIBS +MPIPYTHON ENABLE_CAM ENABLE_TRIG CONTROL @@ -719,10 +723,6 @@ HAVE_CONTROL_FALSE RTA_TOPDIR K_TOPDIR -ENABLE_MPI -MPICC -MPILIBS -MPIPYTHON HAVE_MPIPYTHON_TRUE HAVE_MPIPYTHON_FALSE BUILD_MPI_TRUE @@ -1321,13 +1321,13 @@ --enable-dependency-tracking do not reject slow dependency extractors --enable-maintainer-mode enable make rules and dependencies not useful (and sometimes confusing) to the casual installer + --enable-mpi enable Message Protocol Interface (MPI) --enable-cam enable (IEEE-1394) camera --enable-trig enable (realtime) triggering --disable-rta=RTATOPDIR place where the RTAI code \ resides (default /usr/lib/realtime) --enable-k=KTOPDIR place where the installed kernel \ headers resides (default /usr/src/kernel-headers-2.4.27-adeos) - --enable-mpi enable Message Protocol Interface (MPI) --enable-omp enable Open Multi-Processing (OMP) Some influential environment variables: @@ -6953,6 +6953,684 @@ + +# Check whether --enable-mpi was given. +if test "${enable_mpi+set}" = set; then + enableval=$enable_mpi; ENABLE_MPI="-DENABLE_MPI" + +fi + + + + +if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then + + + + + + for ac_prog in mpicc hcc mpcc mpcc_r mpxlc cmpicc +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_MPICC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$MPICC"; then + ac_cv_prog_MPICC="$MPICC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MPICC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +MPICC=$ac_cv_prog_MPICC +if test -n "$MPICC"; then + { echo "$as_me:$LINENO: result: $MPICC" >&5 +echo "${ECHO_T}$MPICC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$MPICC" && break +done +test -n "$MPICC" || MPICC="$CC" + + acx_mpi_save_CC="$CC" + CC="$MPICC" + + + +if test x = x"$MPILIBS"; then + { echo "$as_me:$LINENO: checking for MPI_Init" >&5 +echo $ECHO_N "checking for MPI_Init... $ECHO_C" >&6; } +if test "${ac_cv_func_MPI_Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define MPI_Init to an innocuous variant, in case declares MPI_Init. + For example, HP-UX 11i declares gettimeofday. */ +#define MPI_Init innocuous_MPI_Init + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char MPI_Init (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef MPI_Init + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char MPI_Init (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_MPI_Init || defined __stub___MPI_Init +choke me +#endif + +int +main () +{ +return MPI_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_MPI_Init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_MPI_Init=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_func_MPI_Init" >&6; } +if test $ac_cv_func_MPI_Init = yes; then + MPILIBS=" " +fi + +fi +if test x = x"$MPILIBS"; then + { echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6; } +if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpi $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char MPI_Init (); +int +main () +{ +return MPI_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_mpi_MPI_Init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_mpi_MPI_Init=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6; } +if test $ac_cv_lib_mpi_MPI_Init = yes; then + MPILIBS="-lmpi" +fi + +fi +if test x = x"$MPILIBS"; then + { echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 +echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6; } +if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpich $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char MPI_Init (); +int +main () +{ +return MPI_Init (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_mpich_MPI_Init=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_mpich_MPI_Init=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6; } +if test $ac_cv_lib_mpich_MPI_Init = yes; then + MPILIBS="-lmpich" +fi + +fi + +if test x != x"$MPILIBS"; then + { echo "$as_me:$LINENO: checking for mpi.h" >&5 +echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + MPILIBS="" + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +CC="$acx_mpi_save_CC" + + + +# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: +if test x = x"$MPILIBS"; then + { { echo "$as_me:$LINENO: error: \"libmpi IS NOT installed\"" >&5 +echo "$as_me: error: \"libmpi IS NOT installed\"" >&2;} + { (exit 1); exit 1; }; } + : +else + { echo "$as_me:$LINENO: WARNING: \"libmpi HAS BEEN installed\"" >&5 +echo "$as_me: WARNING: \"libmpi HAS BEEN installed\"" >&2;} + : +fi + + + CC="$MPICC" + LIBS="$MPILIBS $LIBS" + + +{ echo "$as_me:$LINENO: checking for main in -lmpi" >&5 +echo $ECHO_N "checking for main in -lmpi... $ECHO_C" >&6; } +if test "${ac_cv_lib_mpi_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmpi $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_mpi_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_mpi_main=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_main" >&5 +echo "${ECHO_T}$ac_cv_lib_mpi_main" >&6; } +if test $ac_cv_lib_mpi_main = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBMPI 1 +_ACEOF + + LIBS="-lmpi $LIBS" + +else + { { echo "$as_me:$LINENO: error: \"libmpi not installed\"" >&5 +echo "$as_me: error: \"libmpi not installed\"" >&2;} + { (exit 1); exit 1; }; } +fi + + if test "${ac_cv_header_mpi_h+set}" = set; then + { echo "$as_me:$LINENO: checking for mpi.h" >&5 +echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6; } +if test "${ac_cv_header_mpi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_mpi_h" >&5 +echo "${ECHO_T}$ac_cv_header_mpi_h" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking mpi.h usability" >&5 +echo $ECHO_N "checking mpi.h usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking mpi.h presence" >&5 +echo $ECHO_N "checking mpi.h presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: mpi.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: mpi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: mpi.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: mpi.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: mpi.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: mpi.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: mpi.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mpi.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: mpi.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: mpi.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: mpi.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: mpi.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mpi.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mpi.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mpi.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: mpi.h: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for mpi.h" >&5 +echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6; } +if test "${ac_cv_header_mpi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_mpi_h=$ac_header_preproc +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_mpi_h" >&5 +echo "${ECHO_T}$ac_cv_header_mpi_h" >&6; } + +fi +if test $ac_cv_header_mpi_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: \"missing mpi.h\"" >&5 +echo "$as_me: error: \"missing mpi.h\"" >&2;} + { (exit 1); exit 1; }; } +fi + + + + +{ echo "$as_me:$LINENO: checking for gpiv_piv_mpi_bcast_pivpar in -lgpiv_mpi" >&5 +echo $ECHO_N "checking for gpiv_piv_mpi_bcast_pivpar in -lgpiv_mpi... $ECHO_C" >&6; } +if test "${ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgpiv_mpi $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char gpiv_piv_mpi_bcast_pivpar (); +int +main () +{ +return gpiv_piv_mpi_bcast_pivpar (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar" >&5 +echo "${ECHO_T}$ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar" >&6; } +if test $ac_cv_lib_gpiv_mpi_gpiv_piv_mpi_bcast_pivpar = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBGPIV_MPI 1 +_ACEOF + + LIBS="-lgpiv_mpi $LIBS" + +else + { { echo "$as_me:$LINENO: error: \"gpiv_piv_mpi_bcast_pivpar is not working in libgpiv_mpi. \ +Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure\"" >&5 +echo "$as_me: error: \"gpiv_piv_mpi_bcast_pivpar is not working in libgpiv_mpi. \ +Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure\"" >&2;} + { (exit 1); exit 1; }; } +fi + + + # Extract the first word of "mpipython", so it can be a program name with args. +set dummy mpipython; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_MPIPYTHON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$MPIPYTHON"; then + ac_cv_prog_MPIPYTHON="$MPIPYTHON" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_MPIPYTHON="true" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_MPIPYTHON" && ac_cv_prog_MPIPYTHON="false" +fi +fi +MPIPYTHON=$ac_cv_prog_MPIPYTHON +if test -n "$MPIPYTHON"; then + { echo "$as_me:$LINENO: result: $MPIPYTHON" >&5 +echo "${ECHO_T}$MPIPYTHON" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + +else + { echo "$as_me:$LINENO: checking for gpiv_warning in -lgpiv" >&5 echo $ECHO_N "checking for gpiv_warning in -lgpiv... $ECHO_C" >&6; } if test "${ac_cv_lib_gpiv_gpiv_warning+set}" = set; then @@ -7027,6 +7705,7 @@ { (exit 1); exit 1; }; } fi +fi @@ -7854,682 +8533,6 @@ -# Check whether --enable-mpi was given. -if test "${enable_mpi+set}" = set; then - enableval=$enable_mpi; ENABLE_MPI="-DENABLE_MPI" - -fi - - - -if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then - - - - - - for ac_prog in mpicc hcc mpcc mpcc_r mpxlc cmpicc -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_MPICC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$MPICC"; then - ac_cv_prog_MPICC="$MPICC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MPICC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - -fi -fi -MPICC=$ac_cv_prog_MPICC -if test -n "$MPICC"; then - { echo "$as_me:$LINENO: result: $MPICC" >&5 -echo "${ECHO_T}$MPICC" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - - test -n "$MPICC" && break -done -test -n "$MPICC" || MPICC="$CC" - - acx_mpi_save_CC="$CC" - CC="$MPICC" - - - -if test x = x"$MPILIBS"; then - { echo "$as_me:$LINENO: checking for MPI_Init" >&5 -echo $ECHO_N "checking for MPI_Init... $ECHO_C" >&6; } -if test "${ac_cv_func_MPI_Init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define MPI_Init to an innocuous variant, in case declares MPI_Init. - For example, HP-UX 11i declares gettimeofday. */ -#define MPI_Init innocuous_MPI_Init - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char MPI_Init (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef MPI_Init - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char MPI_Init (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_MPI_Init || defined __stub___MPI_Init -choke me -#endif - -int -main () -{ -return MPI_Init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_func_MPI_Init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_func_MPI_Init=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -fi -{ echo "$as_me:$LINENO: result: $ac_cv_func_MPI_Init" >&5 -echo "${ECHO_T}$ac_cv_func_MPI_Init" >&6; } -if test $ac_cv_func_MPI_Init = yes; then - MPILIBS=" " -fi - -fi -if test x = x"$MPILIBS"; then - { echo "$as_me:$LINENO: checking for MPI_Init in -lmpi" >&5 -echo $ECHO_N "checking for MPI_Init in -lmpi... $ECHO_C" >&6; } -if test "${ac_cv_lib_mpi_MPI_Init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpi $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char MPI_Init (); -int -main () -{ -return MPI_Init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_mpi_MPI_Init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mpi_MPI_Init=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_MPI_Init" >&5 -echo "${ECHO_T}$ac_cv_lib_mpi_MPI_Init" >&6; } -if test $ac_cv_lib_mpi_MPI_Init = yes; then - MPILIBS="-lmpi" -fi - -fi -if test x = x"$MPILIBS"; then - { echo "$as_me:$LINENO: checking for MPI_Init in -lmpich" >&5 -echo $ECHO_N "checking for MPI_Init in -lmpich... $ECHO_C" >&6; } -if test "${ac_cv_lib_mpich_MPI_Init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpich $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char MPI_Init (); -int -main () -{ -return MPI_Init (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_mpich_MPI_Init=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mpich_MPI_Init=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpich_MPI_Init" >&5 -echo "${ECHO_T}$ac_cv_lib_mpich_MPI_Init" >&6; } -if test $ac_cv_lib_mpich_MPI_Init = yes; then - MPILIBS="-lmpich" -fi - -fi - -if test x != x"$MPILIBS"; then - { echo "$as_me:$LINENO: checking for mpi.h" >&5 -echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - { echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6; } -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - MPILIBS="" - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -CC="$acx_mpi_save_CC" - - - -# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x = x"$MPILIBS"; then - { { echo "$as_me:$LINENO: error: \"libmpi IS NOT installed\"" >&5 -echo "$as_me: error: \"libmpi IS NOT installed\"" >&2;} - { (exit 1); exit 1; }; } - : -else - { echo "$as_me:$LINENO: WARNING: \"libmpi HAS BEEN installed\"" >&5 -echo "$as_me: WARNING: \"libmpi HAS BEEN installed\"" >&2;} - : -fi - - - CC="$MPICC" - LIBS="$MPILIBS $LIBS" - - -{ echo "$as_me:$LINENO: checking for main in -lmpi" >&5 -echo $ECHO_N "checking for main in -lmpi... $ECHO_C" >&6; } -if test "${ac_cv_lib_mpi_main+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmpi $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_mpi_main=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_mpi_main=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_mpi_main" >&5 -echo "${ECHO_T}$ac_cv_lib_mpi_main" >&6; } -if test $ac_cv_lib_mpi_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBMPI 1 -_ACEOF - - LIBS="-lmpi $LIBS" - -else - { { echo "$as_me:$LINENO: error: \"libmpi not installed\"" >&5 -echo "$as_me: error: \"libmpi not installed\"" >&2;} - { (exit 1); exit 1; }; } -fi - - if test "${ac_cv_header_mpi_h+set}" = set; then - { echo "$as_me:$LINENO: checking for mpi.h" >&5 -echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mpi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mpi_h" >&5 -echo "${ECHO_T}$ac_cv_header_mpi_h" >&6; } -else - # Is the header compilable? -{ echo "$as_me:$LINENO: checking mpi.h usability" >&5 -echo $ECHO_N "checking mpi.h usability... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_compiler=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6; } - -# Is the header present? -{ echo "$as_me:$LINENO: checking mpi.h presence" >&5 -echo $ECHO_N "checking mpi.h presence... $ECHO_C" >&6; } -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi - -rm -f conftest.err conftest.$ac_ext -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: mpi.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: mpi.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: mpi.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: mpi.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: mpi.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: mpi.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: mpi.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: mpi.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: mpi.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: mpi.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: mpi.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: mpi.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: mpi.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: mpi.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: mpi.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: mpi.h: in the future, the compiler will take precedence" >&2;} - - ;; -esac -{ echo "$as_me:$LINENO: checking for mpi.h" >&5 -echo $ECHO_N "checking for mpi.h... $ECHO_C" >&6; } -if test "${ac_cv_header_mpi_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_mpi_h=$ac_header_preproc -fi -{ echo "$as_me:$LINENO: result: $ac_cv_header_mpi_h" >&5 -echo "${ECHO_T}$ac_cv_header_mpi_h" >&6; } - -fi -if test $ac_cv_header_mpi_h = yes; then - : -else - { { echo "$as_me:$LINENO: error: \"missing mpi.h\"" >&5 -echo "$as_me: error: \"missing mpi.h\"" >&2;} - { (exit 1); exit 1; }; } -fi - - - - -{ echo "$as_me:$LINENO: checking for gpiv_piv_mpi_bcast_pivpar in -lgpiv" >&5 -echo $ECHO_N "checking for gpiv_piv_mpi_bcast_pivpar in -lgpiv... $ECHO_C" >&6; } -if test "${ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgpiv $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char gpiv_piv_mpi_bcast_pivpar (); -int -main () -{ -return gpiv_piv_mpi_bcast_pivpar (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then - ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar=no -fi - -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ echo "$as_me:$LINENO: result: $ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar" >&5 -echo "${ECHO_T}$ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar" >&6; } -if test $ac_cv_lib_gpiv_gpiv_piv_mpi_bcast_pivpar = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBGPIV 1 -_ACEOF - - LIBS="-lgpiv $LIBS" - -else - { { echo "$as_me:$LINENO: error: \"gpiv_piv_mpi_bcast_pivpar is not working in libgpiv. \ -Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure\"" >&5 -echo "$as_me: error: \"gpiv_piv_mpi_bcast_pivpar is not working in libgpiv. \ -Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure\"" >&2;} - { (exit 1); exit 1; }; } -fi - - - # Extract the first word of "mpipython", so it can be a program name with args. -set dummy mpipython; ac_word=$2 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } -if test "${ac_cv_prog_MPIPYTHON+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$MPIPYTHON"; then - ac_cv_prog_MPIPYTHON="$MPIPYTHON" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_MPIPYTHON="true" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done -IFS=$as_save_IFS - - test -z "$ac_cv_prog_MPIPYTHON" && ac_cv_prog_MPIPYTHON="false" -fi -fi -MPIPYTHON=$ac_cv_prog_MPIPYTHON -if test -n "$MPIPYTHON"; then - { echo "$as_me:$LINENO: result: $MPIPYTHON" >&5 -echo "${ECHO_T}$MPIPYTHON" >&6; } -else - { echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6; } -fi - - -fi - - if $MPIPYTHON; then @@ -9996,6 +9999,10 @@ cat >conf$$subs.sed <<_ACEOF HAVE_PLOTMTV_TRUE!$HAVE_PLOTMTV_TRUE$ac_delim HAVE_PLOTMTV_FALSE!$HAVE_PLOTMTV_FALSE$ac_delim +ENABLE_MPI!$ENABLE_MPI$ac_delim +MPICC!$MPICC$ac_delim +MPILIBS!$MPILIBS$ac_delim +MPIPYTHON!$MPIPYTHON$ac_delim ENABLE_CAM!$ENABLE_CAM$ac_delim ENABLE_TRIG!$ENABLE_TRIG$ac_delim CONTROL!$CONTROL$ac_delim @@ -10003,10 +10010,6 @@ HAVE_CONTROL_FALSE!$HAVE_CONTROL_FALSE$ac_delim RTA_TOPDIR!$RTA_TOPDIR$ac_delim K_TOPDIR!$K_TOPDIR$ac_delim -ENABLE_MPI!$ENABLE_MPI$ac_delim -MPICC!$MPICC$ac_delim -MPILIBS!$MPILIBS$ac_delim -MPIPYTHON!$MPIPYTHON$ac_delim HAVE_MPIPYTHON_TRUE!$HAVE_MPIPYTHON_TRUE$ac_delim HAVE_MPIPYTHON_FALSE!$HAVE_MPIPYTHON_FALSE$ac_delim BUILD_MPI_TRUE!$BUILD_MPI_TRUE$ac_delim diff -urNad gpivtools-0.6.0~/configure.in gpivtools-0.6.0/configure.in --- gpivtools-0.6.0~/configure.in 2009-03-09 09:33:31.000000000 +0100 +++ gpivtools-0.6.0/configure.in 2009-03-09 09:39:12.000000000 +0100 @@ -62,12 +62,40 @@ dnl AC_CHECK_HEADER(gpiv.h, , dnl AC_MSG_ERROR("missing gpiv.h")) -AC_CHECK_LIB(gpiv, gpiv_warning, , - AC_MSG_ERROR("libgpiv has not been installed")) -dnl AC_CHECK_LIB(gpiv, gpiv_scan_resourcefiles, , -dnl AC_MSG_ERROR("libgpiv has not been installed")) -dnl AC_CHECK_LIB(gpiv, gpiv_alloc_img, , -dnl AC_MSG_ERROR("libgpiv has not been installed")) + + +dnl +dnl Enabling Message Passing Interface (MPI) for parallel computing +dnl +AC_ARG_ENABLE(mpi, + [ --enable-mpi enable Message Protocol Interface (MPI)], + [ENABLE_MPI="-DENABLE_MPI"] + ) +AC_SUBST(ENABLE_MPI) + + +if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then + ACX_MPI(AC_MSG_WARN("libmpi HAS BEEN installed"), + AC_MSG_ERROR("libmpi IS NOT installed")) + + CC="$MPICC" + LIBS="$MPILIBS $LIBS" + + AC_CHECK_LIB(mpi, main, , + AC_MSG_ERROR("libmpi not installed")) + AC_CHECK_HEADER(mpi.h, , + AC_MSG_ERROR("missing mpi.h")) + + AC_CHECK_LIB(gpiv_mpi, gpiv_piv_mpi_bcast_pivpar, , + AC_MSG_ERROR("gpiv_piv_mpi_bcast_pivpar is not working in libgpiv_mpi. \ +Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure")) + + AC_CHECK_PROG(MPIPYTHON, mpipython, true, false) + +else + AC_CHECK_LIB(gpiv, gpiv_warning, , + AC_MSG_ERROR("libgpiv has not been installed")) +fi AC_CHECK_HEADERS([ stdlib.h string.h unistd.h \ @@ -148,37 +176,6 @@ AC_SUBST(K_TOPDIR) -dnl -dnl Enabling Message Passing Interface (MPI) for parallel computing -dnl -AC_ARG_ENABLE(mpi, - [ --enable-mpi enable Message Protocol Interface (MPI)], - [ENABLE_MPI="-DENABLE_MPI"] - ) -AC_SUBST(ENABLE_MPI) -dnl USE_LAM 1 -dnl AC_SUBST(USE_LAM) - -if test "${ENABLE_MPI}" == '-DENABLE_MPI'; then - ACX_MPI(AC_MSG_WARN("libmpi HAS BEEN installed"), - AC_MSG_ERROR("libmpi IS NOT installed")) - - CC="$MPICC" - LIBS="$MPILIBS $LIBS" - - AC_CHECK_LIB(mpi, main, , - AC_MSG_ERROR("libmpi not installed")) - AC_CHECK_HEADER(mpi.h, , - AC_MSG_ERROR("missing mpi.h")) - - AC_CHECK_LIB(gpiv, gpiv_piv_mpi_bcast_pivpar, , - AC_MSG_ERROR("gpiv_piv_mpi_bcast_pivpar is not working in libgpiv. \ -Enable MPI in libgpiv or disable it here by leaving out --enable-mpi during ./configure")) - - AC_CHECK_PROG(MPIPYTHON, mpipython, true, false) -fi - - AM_CONDITIONAL(HAVE_MPIPYTHON, $MPIPYTHON) AM_CONDITIONAL(BUILD_MPI, test "${ENABLE_MPI}" == '-DENABLE_MPI') diff -urNad gpivtools-0.6.0~/src/evaluate/rr.c gpivtools-0.6.0/src/evaluate/rr.c --- gpivtools-0.6.0~/src/evaluate/rr.c 2009-03-09 09:33:31.000000000 +0100 +++ gpivtools-0.6.0/src/evaluate/rr.c 2009-03-09 09:39:12.000000000 +0100 @@ -5,7 +5,8 @@ rr - rr calculates the mean particle displacement for (Digital) Particle Image Velocimetry (DPIV) by means of FFT. - Copyright (C) 2002, 2003, 2004 Gerber van der Graaf + Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Gerber van der Graaf Subject: Repair man pages Repair man pages on spelling errors and hyphen-used-as-minus-sign --- a/man/gpiv_combing.1 +++ b/man/gpiv_combing.1 @@ -101,7 +101,7 @@ will exit if this is the case. Besides this warning, the program will always check if the images are of equal sizes. If an input image does not contain the X-corr parameter in its header, the parameter will be -read from the parameter resources. Not using this option allows to +read from the parameter resources. Not using this option allows one to keep the settings in the parameter resources in any state. @@ -115,22 +115,22 @@ .TP Suppose two single-exposed images will have to be combined for cross-correlation with names image_a.gif and image_b.gif: so the file_basename will be "image", _a and _b are default suffixes and the image type has to be defined. The program is used following: -gpiv_combing -t gif image +gpiv_combing \-t gif image .TP -As PNG is default image format, -t key is not needed. Two images with names turtle_slow.png and turtle_fast.png are combined with: -gpiv_combing -a _slow -b _fast turtle +As PNG is default image format, \-t key is not needed. Two images with names turtle_slow.png and turtle_fast.png are combined with: +gpiv_combing \-a _slow \-b _fast turtle .TP For two numbered images img03.png and img04.png only the starting number will have to defined: .br -gpiv_combing -u 3 img0 +gpiv_combing \-u 3 img0 .TP Two numbered images img03.png and img09.png will have to be combined by skipping 5 images in-between. If \fB-d\fR | \fB--dt\fR \fIS\fR is used, the correct separation time between the combined frames is calculated from \fIS\fR: -gpiv_combing -u 3 -s 5 img0 +gpiv_combing \-u 3 \-s 5 img0 .br .TP --- a/man/gpiv_hilo.1 +++ b/man/gpiv_hilo.1 @@ -15,7 +15,7 @@ .SH DESCRIPTION -\fBgpiv_hilo\fP applies high-low filtering or contrast extention on an +\fBgpiv_hilo\fP applies high-low filtering or contrast extension on an image. The parameters read from the configuration resources (containing the --- a/man/gpiv_manipiv.1 +++ b/man/gpiv_manipiv.1 @@ -37,13 +37,13 @@ .TP \fB-fi \fIx0 y0 x1 y1\fP filters out data from a piv data stream from location (\fIx0\fP,\fIy0\fP) to -(\fIx1\fP,\fIy1\fP). Filtering only implies setting the peak number to -1. +(\fIx1\fP,\fIy1\fP). Filtering only implies setting the peak number to \-1. .TP \fB-no_fi\fR | \fB--pass\fR \fIx0 y0 x1 y1\fP filters out all data, except those from (\fIx0\fP,\fIy0\fP) to (\fIx1\fP,\fIy1\fP). This option is the opposite of \fB-fi\fP. Filtering -only implies setting the peak number to -1. +only implies setting the peak number to \-1. .TP \fB-fy\fP --- a/man/gpiv_nstrain.1 +++ b/man/gpiv_nstrain.1 @@ -21,7 +21,7 @@ choose from several differential schemes: central differentiation, least squares, and Richardson extrapolation. The output can be generated as ASCII data containing four columns or as GNUPlot Data -format that allows to view/print the data as contour plots. +format that allows one to view/print the data as contour plots. The configuration parameters (containing the \fBPOST\fR key) may be overruled by the command line options, as explained below. --- a/man/gpiv_piv2gnuplt.1 +++ b/man/gpiv_piv2gnuplt.1 @@ -27,7 +27,7 @@ .SH Options .TP \fB-al\fR \fIL\fR -Draws an annotation vector with lenght L. +Draws an annotation vector with length L. .TP \fB-al\fR \fIUNIT\fR --- a/man/gpiv_piv2vec.1 +++ b/man/gpiv_piv2vec.1 @@ -58,7 +58,7 @@ .TP \fB-nd\fR -Combined with \fB-g\fR; adds option -nodate (only ps output doesn't contain +Combined with \fB\-g\fR; adds option \-nodate (only ps output doesn't contain date!). .TP --- a/man/gpiv_process-chain.1 +++ b/man/gpiv_process-chain.1 @@ -87,10 +87,10 @@ .SH EXAMPLES -invoking: 'gpiv_process-chain -proc_valid -proc_scale testfile.png' will actually perform: +invoking: 'gpiv_process-chain \-proc_valid \-proc_scale testfile.png' will actually perform: gpiv_rr < image.png | gpiv_errvec > testfile.piv -invoking: 'gpiv_process-chain -proc_imgrec -proc_valid -proc_scale +invoking: 'gpiv_process-chain \-proc_imgrec \-proc_valid \-proc_scale testfile.png' will do: gpiv_recimg | gpiv_rr | gpiv_errvec | gpiv_scale > testfile.piv --- a/man/gpiv_rr.1 +++ b/man/gpiv_rr.1 @@ -90,7 +90,7 @@ .TP \fB--cf \fIN\fR -Specify the first column \fIN\fR in the image to interrogate. If --ad_int +Specify the first column \fIN\fR in the image to interrogate. If \-\-ad_int has been used, the first column has to be equal or larger than (int_size_2 - int_size_1)/2. @@ -139,7 +139,7 @@ zero offset (2); Searches (iteratively) the correlation peak by zero offsetting the -interrogation area's, until the peak maximum lies between (-1,-1) and +interrogation area's, until the peak maximum lies between (\-1,\-1) and (1,1). The images are interrogated by the 'classic' forward differential scheme. During the last iteration step, sub-pixel displacement will be calculated as defined with \fB-ifit\fR. @@ -157,7 +157,7 @@ positive direction with half the (float) magnitudes of the estimators and the second image in negative direction. In this way, both deformed images will show the particle positions at the moment in-between the -recordings. After the iteration has been converged and -p option has +recordings. After the iteration has been converged and \-p option has been used, the deformed images are stored (defined by GPIV_DEFORMED_IMG_NAME = gpiv_defimg) in TMPDIR (/tmp for UNIX-like systems), which may be used as a check. @@ -167,7 +167,7 @@ Initial size of the interrogation area's \fIN\fR. \fIN\fR must be equal or larger than \fBia_size_f\fR. -The sizes must be choosen in such a way that the particle +The sizes must be chosen in such a way that the particle displacements remain within 1/4th of the interrogation area's in order to keep the in-plane errors at minimum. @@ -185,7 +185,7 @@ sizes of the interrogation area's will be reduced with the appropriate factor during the last (iterative) interrogation in order to set them equal to \fBia_size_f\fR. During the last interrogation, the estimator -will be between (-1,-1) and (1,1). Then, sub-pixel displacement will +will be between (\-1,\-1) and (1,1). Then, sub-pixel displacement will be calculated as defined by \fB--ifit\fR. .TP @@ -259,7 +259,7 @@ \fB--spof\fR Applies symmetric phase only filtering. This option may drasticly improve the SNR with higher and thinner covariance peak. Especially -usefull when there is flare or high reflections (from boundaries, for +useful when there is flare or high reflections (from boundaries, for example) in one of the two image frames from a PIV image pair. (Werner, Meas. Sci. Technol., 16, 601-618). --- a/man/gpiv_s-avg.1 +++ b/man/gpiv_s-avg.1 @@ -18,7 +18,7 @@ \fBgpiv_s-avg\fP reports the spatial global mean velocities and variances in x and y-direction of a PIV data stream. Only input data -of which the peak number is not equal to -1 are taken into +of which the peak number is not equal to \-1 are taken into account. The parameters read from the configuration resources (containing the --- a/man/gpiv_series.1 +++ b/man/gpiv_series.1 @@ -65,7 +65,7 @@ .TP \fB-i\fR | \fB-\-incr\fR \fIN\fR -Increment number with \fIN\fR. Default: 1. This might be usefull, +Increment number with \fIN\fR. Default: 1. This might be useful, for example, if subsequent numbered images are combined for cross-correlation with the \fBgpiv_img2gpiv\fR tool. --- a/man/gpiv_sstrain.1 +++ b/man/gpiv_sstrain.1 @@ -21,7 +21,7 @@ choose from several differential schemes: central differentiation, least squares and Richardson extrapolation. The output can be generated as ASCII data containing four columns or as GNUPlot Data -format that allows to view/print the data as contour plots. +format that allows one to view/print the data as contour plots. The configuration parameters (containing the \fBPOST\fR key) may be overruled by the command line options, as explained below. --- a/man/gpiv_vorstra.1 +++ b/man/gpiv_vorstra.1 @@ -23,9 +23,9 @@ vorticity, shear strain and normal strain from PIV data. You can choose from several differential schemes: central differentiation, least squares, Richardson extrapolation and circulation -method. Circulation method only allows to calculate vorticity, but no +method. Circulation method only allows one to calculate vorticity, but no strain. The output can be generated as ASCII data containing four -columns or as GNUPlot Data format that allows to view/print the data +columns or as GNUPlot Data format that allows one to view/print the data as contour plots. The configuration parameters (containing the \fBPOST\fR key) may be --- a/man/gpiv_vorty.1 +++ b/man/gpiv_vorty.1 @@ -23,9 +23,9 @@ data. You can choose from several differential schemes: central differentiation, least squares, Richardson extrapolation and circulation method. Circulation method only allows -to calculate vorticity, but no strain. The output can be generated +one to calculate vorticity, but no strain. The output can be generated as ASCII data containing four columns or as GNUPlot Data format that -allows to view/print the data as contour plots. +allows one to view/print the data as contour plots. The configuration parameters (containing the \fBPOST\fR key) may be overruled by the command line options, as explained below. --- a/src/misc/piv2gnuplt.c +++ b/src/misc/piv2gnuplt.c @@ -33,7 +33,7 @@ [-v] filename \n\ \n\ keys: \n\ --al L: draws an annotation vector with lenght L \n\ +-al L: draws an annotation vector with length L \n\ -au UNIT: define unit of annotation vector (defaul m/s) \n\ -h | --help: this on-line help \n\ -p | --print: print parameters to stdout \n\