#! /bin/sh /usr/share/dpatch/dpatch-run ## mpi-build.dpatch by ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Adapts Makefile for out-of-src build, exclusively links to libgpiv3 or ## DP: to libgpiv3-mpi, so both libraries may be installed simultaneously ## DP: while building the gpivtools(-mpi) packages, removes double nprocs ## DP: declaration when enabled hybried parallel code, extended --help when ## DP: mpi enabled @DPATCH@ 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