[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-433-g0c41233
mysql vizuser
noreply at mpich.org
Fri Aug 2 14:11:23 CDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".
The branch, master has been updated
via 0c41233e795db2fe8e3bd59263187a15cfa93240 (commit)
from e259dcd97ede800b086c96d76f5213fe973ecd2a (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/0c41233e795db2fe8e3bd59263187a15cfa93240
commit 0c41233e795db2fe8e3bd59263187a15cfa93240
Author: Rob Latham <robl at mcs.anl.gov>
Date: Fri Aug 2 09:04:16 2013 -0500
zap arch-specific stuff
most of this stuff is either broken, for ancient platofrms, or both.
Let's re-commit ourselves to using autoconf as it was intended, testing
for features, not platforms.
diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac
index 298ab99..ba39b6f 100644
--- a/src/mpi/romio/configure.ac
+++ b/src/mpi/romio/configure.ac
@@ -349,81 +349,6 @@ fi
#
C_DEBUG_FLAG="-g"
F77_DEBUG_FLAG="-g"
-case $ARCH in
- solaris|solaris86)
- CC=${CC:-cc}
- F77=${FC:-f77}
- if test "$CC" != "gcc" ; then
- C_DEBUG_FLAG="-g -v"
- fi
- ;;
-
- rs6000)
- F77=${FC}
- # Try to use mpcc if no CC specified
- AC_PROGRAMS_CHECK(CC, mpcc, cc)
- if test $NOF77 = 0 && test -z "$F77"; then
- AC_PROGRAMS_CHECK(F77, mpxlf, f77)
- fi
- ;;
-
- tflop|tflops)
- CC=${CC:-pgcc}
- F77=${FC:-pgf77}
- CFLAGS="$CFLAGS -cougar -D__PUMA"
- if test "$CC" = "pgcc" ; then
- C_OPT_FLAG="-Knoieee -Mvect -O3"
- fi
- ;;
-
- freebsd|LINUX|netbsd|openbsd|LINUX_ALPHA)
- CC=${CC:-gcc}
- # Let the prog_f77 file g77/f77/others
- F77=${FC}
- ;;
-
- SX4)
- CC=${CC:-mpicc}
- F77=${FC:-mpif90}
- if test $DEBUG != "yes" ; then
- USER_FFLAGS="$FFLAGS -Chopt"
- F77_OPT_FLAG="-Chopt"
- fi
- ;;
-
- hpux|sppux)
- C_DEBUG_FLAG="-g +w1"
- ;;
-
- alpha|ALPHA)
- CC=${CC:-cc}
- F77=${FC:-f77}
- dnl CFLAGS="$CFLAGS -g -std1 -warnprotos -verbose"
- C_DEBUG_FLAG="-g -verbose"
- ;;
-
- CRAY)
- CC=${CC:-cc}
- F77=${FC:-f90}
- NOF77=1
- CFLAGS="$CFLAGS -D_UNICOS"
- ;;
-
- sgi|IRIX64|IRIX32|IRIXN32)
- arch_IRIX=1
- CC=${CC:-cc}
- F77=${FC:-f77}
- C_DEBUG_FLAG="-g -fullwarn"
- ;;
-
- sgi5)
- ;;
-
- *)
- # Fall-through case. Take FC
- F77=${FC:-f77}
- ;;
-esac
dnl AC_PROG_{CXX,F77,FC} must come early in configure.ac in order to control
dnl compiler search order and avoid some esoteric autoconf macro expansion
@@ -450,236 +375,24 @@ fi
# ---------------------------------------------------------------------------
# Here go the rest of the tests
# ---------------------------------------------------------------------------
-if test -n "$arch_solaris" || test -n "$arch_solaris86" ; then
- if test -z "$MPI_IMPL" ; then
- MPI_IMPL=mpich
- mpi_mpich=1
- fi
- if test $MPI_IMPL = "mpich" ; then
- TEST_CC=mpicc
- TEST_F77=mpif77
- else
- TEST_CC="$CC"
- TEST_F77="$F77"
- fi
-fi
-
-if test -n "$arch_rs6000"; then
- if test -z "$MPI_IMPL" ; then
- MPI_IMPL=mpich
- mpi_mpich=1
- fi
- AC_DEFINE(AIX,1,[Define for AIX])
-# assume long long exists.
- ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long:-8}
- MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND"
- MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)"
- MPI_OFFSET_KIND_VAL=8
-fi
-#
-
-if test -n "$arch_freebsd" || test -n "$arch_LINUX" || test -n "$arch_LINUX_ALPHA" || test -n "$arch_netbsd" || test -n "$arch_openbsd" ; then
- if test -n "$arch_freebsd" || test -n "$arch_netbsd" || test -n "$arch_openbsd"; then
- ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long:-0}
- # printf doesn't work properly and no integer*8 as far as I can tell
- fi
- # Find the CPP before the header check
- AC_PROG_CPP
- if test -z "$MPI_IMPL" ; then
- MPI_IMPL=mpich
- mpi_mpich=1
- fi
-fi
-#
-if test -n "$arch_SX4" ; then
- have_aio=no
- AC_DEFINE(SX4,1,[Define for NEC SX4])
- if test -z "$MPI_IMPL" ; then
- MPI_IMPL=mpich
- mpi_mpich=1
- fi
- # supply a reasonable default fs
- if test -z "$FILE_SYSTEM" ; then
- FILE_SYSTEM="sfs nfs"
- fi
- MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND"
- MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)"
- MPI_OFFSET_KIND_VAL=8
-fi
-#
-if test -n "$arch_hpux" || test -n "$arch_sppux" ; then
- have_aio=no
- RANLIB=":"
- 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_IMPL=hp
- else
- echo "assuming that you want to use ROMIO with MPICH"
- MPI_IMPL=mpich
- fi
- fi
- 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_IMPL = "hp" ; then
- mpi_hp=1
- CC=${CC:-mpicc -Ae}
- F77=${FC:-mpif77 +U77}
- fi
- 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_IMPL = "hp" ; then
- F77=${FC:-mpif90 +U77}
- else
- F77=${FC:-f90 +U77}
- fi
- else
- AC_DEFINE(SPPUX,1,[Define for SPPUX (Convex)])
- fi
-
- MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND"
- MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)"
- MPI_OFFSET_KIND_VAL=8
- if test "$CC" != "gcc" ; then
- ROMIO_TCFLAGS="-Ae"
- fi
- if test "$F77" != "g77" ; then
- ROMIO_TFFLAGS="+U77"
- fi
-fi
-#
-if test -n "$arch_alpha" || test -n "$arch_ALPHA" ; then
- if test -z "$MPI_IMPL" ; then
- MPI_IMPL=mpich
- mpi_mpich=1
- fi
-
- MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND"
- MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)"
- MPI_OFFSET_KIND_VAL=8
- LIBS="$LIBS -laio"
-fi
-#
-if test -n "$arch_CRAY" ; then
- NOF77=1
- FTESTDEFINE="integer ilen"
- F77GETARG="call pxfgetarg(i, str, ilen, ierr)"
- have_aio=no
- RANLIB=":"
- AC_DEFINE(CRAY,1,[Define if 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
- AC_DEFINE(MPISGI,1,[Define if SGI MPI])
- AC_DEFINE(HAVE_MPI_COMBINERS,1,[Define if MPI supports datatype combiners])
- AC_DEFINE(NO_MPI_SGI_type_is_contig,1,[Define if no types show contig])
- fi
-# MPISGI needed because of error in Cray's and SGI's
-# MPI_Type_get_contents (does not increment reference count).
-# Others needed because MPISGI needed.
-
- MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND"
- MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)"
- MPI_OFFSET_KIND_VAL=8
-fi
-#
-if test -n "$arch_sgi" ; then
- arch_IRIX=1
- ARCH=IRIX
-fi
-if test -n "$arch_IRIX64" || test -n "$arch_IRIX32" || test -n "$arch_IRIXN32" ; then
- arch_IRIX=1
+AC_CHECK_TYPE(long long)
+AC_CHECK_SIZEOF(long long)
+if test -z "$MPI_IMPL" ; then
+ MPI_IMPL=mpich
+ mpi_mpich=1
fi
-if test -n "$arch_sgi5" ; then
- arch_IRIX5=1
- ARCH=IRIX
+if test $MPI_IMPL = "mpich" ; then
+ TEST_CC=mpicc
+ TEST_F77=mpif77
+else
+ TEST_CC="$CC"
+ TEST_F77="$F77"
fi
-#
+# there used to be a ton of arch-specific stuff in here. If some random
+# platform really truly needs it, restore it, but that defeats the whole
+
PAC_GET_SPECIAL_SYSTEM_INFO
-#
-# special case 'sgi5' for use on MESHINE which is much like an SGI running
-# irix 5 with r4400 chips, but does not have 'hinv', so above code doesn't
-# work
-if test -n "$arch_sgi5"; then
- osversion=5
- cputype=4400
- IRIXARCH="$ARCH_$osversion"
- IRIXARCH="$IRIXARCH_$cputype"
-# now set arch_IRIX to 1
- arch_IRIX=1
- echo "IRIX-specific architecture is $IRIXARCH"
- AC_DEFINE(IRIX,1,[Define if IRIX])
-fi
-#
-if test -n "$arch_IRIX"; then
- if test $osversion = 4 ; then
- RANLIB="ar ts"
- if test -n "$mpi_sgi"; then
- AC_MSG_ERROR([SGI\'s MPI does not work with IRIX 4.x])
- fi
- elif test $osversion = 5 ; then
- if test -n "$mpi_sgi"; then
- AC_MSG_ERROR([SGI\'s MPI does not work with IRIX 5.x])
- fi
- elif test $osversion = 6 ; then
- if test -z "$MPI_IMPL"; then
- if test "$FROM_MPICH" = "yes" ; then
- MPI_IMPL=mpich
- mpi_mpich=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_IMPL=sgi
- mpi_sgi=1
- fi
- fi
- RANLIB=":"
- AC_DEFINE(AIO_SIGNOTIFY_NONE,1,[Define if no signotify])
- if test $cputype -ge 5000 ; then
- MIPS=4
- else
- MIPS=3
- fi
- fi
- if test -n "$mpi_sgi" && test -z "$MPI_LIB" ; then
- MPI_LIB="-lmpi"
- fi
-# check if pread64 is defined
- PAC_HAVE_PREAD64
-
- # supply a reasonable default fs
- if test -z "$FILE_SYSTEM" ; then
- FILE_SYSTEM="nfs"
- AC_MSG_CHECKING(for xfs)
- AC_TRY_COMPILE([
-#include <aio.h>],
-[aiocb64_t *t1;],xfs_works=1;FILE_SYSTEM="xfs $FILE_SYSTEM";)
- if test "$xfs_works" = 1 ; then
- AC_MSG_RESULT(yes)
- else
- AC_MSG_RESULT(no)
- FILE_SYSTEM="ufs $FILE_SYSTEM"
- fi
- fi
- AC_DEFINE(IRIX,1,[Define if IRIX])
- MPI_OFFSET_KIND1=" INTEGER MPI_OFFSET_KIND"
- MPI_OFFSET_KIND2=" PARAMETER (MPI_OFFSET_KIND=8)"
- MPI_OFFSET_KIND_VAL=8
-fi
AC_HAVE_FUNCS(memalign)
-----------------------------------------------------------------------
Summary of changes:
src/mpi/romio/configure.ac | 313 ++------------------------------------------
1 files changed, 13 insertions(+), 300 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list