diff options
author | Albert Cheng <acheng@hdfgroup.org> | 2010-06-11 21:26:55 (GMT) |
---|---|---|
committer | Albert Cheng <acheng@hdfgroup.org> | 2010-06-11 21:26:55 (GMT) |
commit | cfcbb212c85a7a098928ad8de20772be082aaa67 (patch) | |
tree | 0a9c8ff7d5a72557e912d4bdd9f822154696066e /configure | |
parent | 63ec41868180edbbc558a79e20355a85f14dc7e3 (diff) | |
download | hdf5-cfcbb212c85a7a098928ad8de20772be082aaa67.zip hdf5-cfcbb212c85a7a098928ad8de20772be082aaa67.tar.gz hdf5-cfcbb212c85a7a098928ad8de20772be082aaa67.tar.bz2 |
[svn-r18991] Bug Fix: (ID 1921)
PHDF5 changed to use "mpiexec", instead of mpirun, as the default MPI
applications startup command as defined in the MPI-2 definition, section
4.1. Note that only mpich related (using mpicc command) definitions are
changed to mpiexec. Other favors like hcc, AIX, champion, are not changed
since I don't have a way to verify them yet.
Tested:
jam and amani, using both current and new mpich.
Did not h5committested since this affects PHDF5 configure only.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 30 |
1 files changed, 15 insertions, 15 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 18841 2010-05-18 15:26:01Z mamcgree . +# From configure.in Id: configure.in 18979 2010-06-04 19:22:09Z lrknox . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for HDF5 1.8.5-snap0. # @@ -7408,8 +7408,8 @@ fi case "$CC_BASENAME" in mpicc) PARALLEL=mpicc - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpirun" >&5 -$as_echo_n "checking for mpirun... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpiexec" >&5 +$as_echo_n "checking for mpiexec... " >&6; } cmd="`echo $CC | cut -f1 -d' '`" if (echo $cmd | grep / >/dev/null); then @@ -7422,13 +7422,13 @@ $as_echo_n "checking for mpirun... " >&6; } done fi - if test -x $path/mpirun; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $path/mpirun" >&5 -$as_echo "$path/mpirun" >&6; } + if test -x $path/mpiexec; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $path/mpiexec" >&5 +$as_echo "$path/mpiexec" >&6; } RUNSERIAL="${RUNSERIAL:-none}" if test -z "$RUNPARALLEL"; then - RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=3}" + RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=3}" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 @@ -7507,8 +7507,8 @@ ac_compiler_gnu=$ac_cv_fc_compiler_gnu case "$FC" in *mpif90*) PARALLEL=mpif90 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpirun" >&5 -$as_echo_n "checking for mpirun... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mpiexec" >&5 +$as_echo_n "checking for mpiexec... " >&6; } cmd=`echo $FC |cut -f1 -d' '` if (echo $cmd |grep / >/dev/null); then @@ -7521,13 +7521,13 @@ $as_echo_n "checking for mpirun... " >&6; } done fi - if test -x $path/mpirun; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $path/mpirun" >&5 -$as_echo "$path/mpirun" >&6; } + if test -x $path/mpiexec; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $path/mpiexec" >&5 +$as_echo "$path/mpiexec" >&6; } RUNSERIAL="${RUNSERIAL:-none}" if test -z "$RUNPARALLEL"; then - RUNPARALLEL="$path/mpirun -np \$\${NPROCS:=2}" + RUNPARALLEL="$path/mpiexec -n \$\${NPROCS:=2}" fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 @@ -21518,7 +21518,7 @@ case "$host_cpu-$host_vendor-$host_os" in AM_CPPFLAGS="-D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE $AM_CPPFLAGS" fi - H5_CPPFLAGS="-D_POSIX_SOURCE $H5_CPPFLAGS" + H5_CPPFLAGS="-D_POSIX_SOURCE $H5_CPPFLAGS" AM_CPPFLAGS="-D_BSD_SOURCE $AM_CPPFLAGS" ;; @@ -26419,7 +26419,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi if test "X$PARALLEL" = "Xyes" -a -z "$RUNPARALLEL"; then - RUNPARALLEL="mpirun -np \$\${NPROCS:=3}" + RUNPARALLEL="mpiexec -n \$\${NPROCS:=3}" fi ;; |