[mpich2-commits] r7700 - in mpich2/trunk/src/mpi/romio: . adio/ad_testfs adio/common
robl at mcs.anl.gov
robl at mcs.anl.gov
Wed Jan 12 12:33:00 CST 2011
Author: robl
Date: 2011-01-12 12:33:00 -0600 (Wed, 12 Jan 2011)
New Revision: 7700
Modified:
mpich2/trunk/src/mpi/romio/Makefile.in
mpich2/trunk/src/mpi/romio/adio/ad_testfs/Makefile.in
mpich2/trunk/src/mpi/romio/adio/common/Makefile.in
mpich2/trunk/src/mpi/romio/configure.in
Log:
to address r965: --with-mpi now points to the installed location of an mpi
library. if for some reason we need the MPI implementation, use
--with-mpi-impl (but it looks like that historical flag doesn't actually do
anything any longer
Modified: mpich2/trunk/src/mpi/romio/Makefile.in
===================================================================
--- mpich2/trunk/src/mpi/romio/Makefile.in 2011-01-12 18:22:30 UTC (rev 7699)
+++ mpich2/trunk/src/mpi/romio/Makefile.in 2011-01-12 18:33:00 UTC (rev 7700)
@@ -6,7 +6,6 @@
LIBNAME = @LIBNAME@
NOF77 = @NOF77@
NOPROFILE = @NOPROFILE@
-MPI = @MPI@
PREFIX = @prefix@
srcdir = @srcdir@
BUILD_MPI_INFO = @BUILD_MPI_INFO@
Modified: mpich2/trunk/src/mpi/romio/adio/ad_testfs/Makefile.in
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/ad_testfs/Makefile.in 2011-01-12 18:22:30 UTC (rev 7699)
+++ mpich2/trunk/src/mpi/romio/adio/ad_testfs/Makefile.in 2011-01-12 18:33:00 UTC (rev 7700)
@@ -2,7 +2,6 @@
AR = @AR@
RANLIB = @RANLIB@
LIBNAME = @LIBNAME@
-MPI = @MPI@
srcdir = @srcdir@
CC_SHL = @CC_SHL@
SHLIBNAME = @SHLIBNAME@
Modified: mpich2/trunk/src/mpi/romio/adio/common/Makefile.in
===================================================================
--- mpich2/trunk/src/mpi/romio/adio/common/Makefile.in 2011-01-12 18:22:30 UTC (rev 7699)
+++ mpich2/trunk/src/mpi/romio/adio/common/Makefile.in 2011-01-12 18:33:00 UTC (rev 7700)
@@ -2,7 +2,6 @@
AR = @AR@
RANLIB = @RANLIB@
LIBNAME = @LIBNAME@
-MPI = @MPI@
srcdir = @srcdir@
CC_SHL = @CC_SHL@
SHLIBNAME = @SHLIBNAME@
Modified: mpich2/trunk/src/mpi/romio/configure.in
===================================================================
--- mpich2/trunk/src/mpi/romio/configure.in 2011-01-12 18:22:30 UTC (rev 7699)
+++ mpich2/trunk/src/mpi/romio/configure.in 2011-01-12 18:33:00 UTC (rev 7700)
@@ -21,7 +21,7 @@
NOF90=0
ARCH=""
arch_IRIX=""
-MPI=""
+MPI_IMPL=""
MPI_INCLUDE_DIR=""
ROMIO_INCLUDE=""
TEST_LIBNAME=""
@@ -119,9 +119,12 @@
--with-file-system=name - Build with support for the named file systems],,)
AC_ARG_WITH(pvfs2,[
--with-pvfs2=path - Path to installation of PVFS (version 2)],,)
-AC_ARG_WITH(mpi,[
---with-mpi=name - Specify MPI implementation to build ROMIO for],,)
+AC_ARG_WITH(mpi-impl,[
+--with-mpi-impl=name - Specify MPI implementation to build ROMIO for],,)
dnl
+AC_ARG_WITH(mpi, [
+--with-mpi=path - Path to instalation of MPI (headers, libs, etc)],,)
+dnl
if test "$enable_f77" != "yes" ; then
NOF77=1
fi
@@ -252,10 +255,10 @@
WITHIN_KNOWN_MPI_IMPL=no
fi
# check for valid MPI implementation
-if test -n "$MPI" ; then
+if test -n "$MPI_IMPL" ; then
found=no
for mpi in $known_mpi_impls ; do
- if test "${MPI}_mpi" = "$mpi" ; then
+ if test "${MPI_IMPL}_mpi" = "$mpi" ; then
found=yes
break
fi
@@ -265,6 +268,12 @@
fi
fi
#
+
+if test -n "${with_mpi}" ; then
+ MPI_INCLUDE_DIR="${with_mpi}"/include
+ MPI_LIB_DIR="${with_mpi}"/lib
+fi
+
# check for valid MPI include directory if specified
if test $WITHIN_KNOWN_MPI_IMPL = no ; then
if test -n "$MPI_INCLUDE_DIR"; then
@@ -432,11 +441,11 @@
# Here go the rest of the tests
# ---------------------------------------------------------------------------
if test -n "$arch_solaris" || test -n "$arch_solaris86" ; then
- if test -z "$MPI" ; then
- MPI=mpich
+ if test -z "$MPI_IMPL" ; then
+ MPI_IMPL=mpich
mpi_mpich=1
fi
- if test $MPI = "mpich" ; then
+ if test $MPI_IMPL = "mpich" ; then
TEST_CC=mpicc
TEST_F77=mpif77
else
@@ -449,8 +458,8 @@
if test -n "$arch_rs6000"; then
- if test -z "$MPI" ; then
- MPI=mpich
+ if test -z "$MPI_IMPL" ; then
+ MPI_IMPL=mpich
mpi_mpich=1
fi
AC_DEFINE(AIX,1,[Define for AIX])
@@ -467,8 +476,8 @@
AR="xar cr$AR_LOCAL"
RANLIB="xranlib"
MPI_LIB="$MPI_LIB"
- if test -z "$MPI" ; then
- MPI=mpich
+ if test -z "$MPI_IMPL" ; then
+ MPI_IMPL=mpich
mpi_mpich=1
fi
if test -z "$FILE_SYSTEM" ; then
@@ -484,8 +493,8 @@
fi
# Find the CPP before the header check
AC_PROG_CPP
- if test -z "$MPI" ; then
- MPI=mpich
+ if test -z "$MPI_IMPL" ; then
+ MPI_IMPL=mpich
mpi_mpich=1
fi
fi
@@ -493,8 +502,8 @@
if test -n "$arch_SX4" ; then
have_aio=no
AC_DEFINE(SX4,1,[Define for NEC SX4])
- if test -z "$MPI" ; then
- MPI=mpich
+ if test -z "$MPI_IMPL" ; then
+ MPI_IMPL=mpich
mpi_mpich=1
fi
if test -z "$FILE_SYSTEM" ; then
@@ -510,34 +519,34 @@
if test -n "$arch_hpux" || test -n "$arch_sppux" ; then
have_aio=no
RANLIB=":"
- if test -z "$MPI"; then
+ if test -z "$MPI_IMPL"; then
if test -f "/opt/mpi/include/mpi.h" ; then
echo "assuming that you want to use ROMIO with HP MPI"
- MPI=hp
+ MPI_IMPL=hp
else
echo "assuming that you want to use ROMIO with MPICH"
- MPI=mpich
+ MPI_IMPL=mpich
fi
fi
- if test $MPI = "mpich" ; then
+ if test $MPI_IMPL = "mpich" ; then
mpi_mpich=1
MPI_LIB="$MPI_LIB -lV3"
CC=${CC:-cc -Ae}
F77=${FC:-f77 +U77}
fi
- if test $MPI = "hp" ; then
+ if test $MPI_IMPL = "hp" ; then
mpi_hp=1
CC=${CC:-mpicc -Ae}
F77=${FC:-mpif77 +U77}
fi
- if test $MPI = "lam" && test "$FC" != ""; then
+ if test $MPI_IMPL = "lam" && test "$FC" != ""; then
F77="$F77 +U77"
fi
FTESTDEFINE="external iargc, getarg"
if test -n "$arch_hpux" ; then
CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
AC_DEFINE(HPUX,1,[Define for HPUX])
- if test $MPI = "hp" ; then
+ if test $MPI_IMPL = "hp" ; then
F77=${FC:-mpif90 +U77}
else
F77=${FC:-f90 +U77}
@@ -558,8 +567,8 @@
fi
#
if test -n "$arch_alpha" || test -n "$arch_ALPHA" ; then
- if test -z "$MPI" ; then
- MPI=mpich
+ if test -z "$MPI_IMPL" ; then
+ MPI_IMPL=mpich
mpi_mpich=1
fi
@@ -576,8 +585,8 @@
have_aio=no
RANLIB=":"
AC_DEFINE(CRAY,1,[Define if Cray])
- if test -z "$MPI" || test -n "$mpi_sgi" ; then
- MPI=cray
+ if test -z "$MPI_IMPL" || test -n "$mpi_sgi" ; then
+ MPI_IMPL=cray
mpi_cray=1
mpi_sgi=""
# above is to disable configure tests specific to SGI MPI
@@ -633,21 +642,21 @@
AC_MSG_ERROR([SGI\'s MPI does not work with IRIX 5.x])
fi
elif test $osversion = 6 ; then
- if test -z "$MPI"; then
+ if test -z "$MPI_IMPL"; then
if test "$FROM_MPICH2" = "yes" ; then
# Building with MPICH2. Distinguish from MPICH-1
- MPI=mpich2
+ MPI_IMPL=mpich2
mpi_mpich2=1
elif test -f "/usr/include/mpi.h" ; then
# removed use of escaped single quotes in messages
# because they confuse Emacs, making it hard to
# read the files (with emacs :) )
AC_MSG_WARN([assuming that you want to use ROMIO with the SGI MPI])
- MPI=sgi
+ MPI_IMPL=sgi
mpi_sgi=1
else
AC_MSG_WARN([assuming that you want to use ROMIO with MPICH])
- MPI=mpich
+ MPI_IMPL=mpich
mpi_mpich=1
fi
fi
@@ -1953,9 +1962,9 @@
done
EXTRA_SRC_DIRS=""
GLUE_DIR=""
-if test "$FROM_MPICH2" = yes -o "${MPI}_mpi" = "mpich2_mpi"; then
+if test "$FROM_MPICH2" = yes -o "${MPI_IMPL}_mpi" = "mpich2_mpi"; then
GLUE_DIR="mpi-io/glue/mpich2"
-elif test "$FROM_MPICH" = yes -o "${MPI}_mpi" = "mpich_mpi"; then
+elif test "$FROM_MPICH" = yes -o "${MPI_IMPL}_mpi" = "mpich_mpi"; then
GLUE_DIR="mpi-io/glue/mpich1"
else
GLUE_DIR="mpi-io/glue/default"
@@ -2026,7 +2035,6 @@
AC_SUBST(USER_FFLAGS)
AC_SUBST(MIPS)
AC_SUBST(BITS)
-AC_SUBST(MPI)
AC_SUBST(AR)
AC_SUBST(AR_FLAGS)
AC_SUBST(RANLIB)
More information about the mpich2-commits
mailing list