[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b1-11-g4ae462b

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 4ae462b2c6d3b76da905170e888f3956a544f88b (commit) via 79c091587e11d4a4b02b3de8ac89766f19ad91f7 (commit) via 88fbe180fefbc4c158e3745ca997c687f383508b (commit) via b36843996735002858970c7b5f8b50bcf0b7598f (commit) via a07ac5516b909970a8fb1a4d6436f1c8bc1e645c (commit) from 59083f6d2fb37279339e09e8ddb1924bf5e08b27 (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/4ae462b2c6d3b76da905170e888f3956a5... commit 4ae462b2c6d3b76da905170e888f3956a544f88b Author: Rob Latham <[email protected]> Date: Tue Mar 3 16:01:40 2015 -0600 fix "is present" case for MPI_Count check back in december 2013 I apparently did not test a standalone ROMIO against a const-ified (MPI-3.0 compliant) MPICH Signed-off-by: Sangmin Seo <[email protected]> diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index d408c6a..857ddec 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1520,7 +1520,7 @@ if test $WITHIN_KNOWN_MPI_IMPL = no ; then PAC_TEST_MPI_GREQUEST PAC_TEST_MPIU_FUNCS AC_DEFINE(PRINT_ERR_MSG,1,[Define for printing error messages]) - AC_CHECK_TYPE(MPI_Count,[],[AC_DEFINE_UNQUOTED([MPI_Count],[MPI_Aint],[Define to "MPI_Aint" if MPI does not provide MPI_Count]) ]) + AC_CHECK_TYPE([MPI_Count],[],[AC_DEFINE_UNQUOTED([MPI_Count],[MPI_Aint],[Define to "MPI_Aint" if MPI does not provide MPI_Count]) ], [[#include <mpi.h>]]) PAC_TEST_NEEDS_CONST AC_CHECK_DECLS([MPI_COMBINER_HINDEXED_BLOCK], [], [], [[#include <mpi.h>]]) AC_CHECK_FUNCS(MPI_Type_size_x MPI_Status_set_elements_x) http://git.mpich.org/mpich.git/commitdiff/79c091587e11d4a4b02b3de8ac89766f19... commit 79c091587e11d4a4b02b3de8ac89766f19ad91f7 Author: Rob Latham <[email protected]> Date: Tue Mar 3 15:59:46 2015 -0600 romio standalone: implement missing check The standalone case calls PAC_TEST_NEEDS_CONST, but I never implemented it. here is that implementation. Signed-off-by: Sangmin Seo <[email protected]> diff --git a/confdb/aclocal_romio.m4 b/confdb/aclocal_romio.m4 index 39dd76d..af80d3c 100644 --- a/confdb/aclocal_romio.m4 +++ b/confdb/aclocal_romio.m4 @@ -856,3 +856,17 @@ EOF fi rm -f conftest$EXEEXT mpitest.c ])dnl + +define(PAC_TEST_NEEDS_CONST,[ + AC_MSG_CHECKING([const declarations needed in MPI routines]) + AC_COMPILE_IFELSE([AC_LANG_SOURCE( + [ #include <mpi.h> + int MPI_File_delete(char *filename, MPI_Info info) { return (0); } + ] )], + [ + AC_MSG_RESULT(no) + ],[ + AC_MSG_RESULT(yes) + AC_DEFINE(HAVE_MPIIO_CONST, const, [Define if MPI-IO routines need a const qualifier]) + ]) + ]) http://git.mpich.org/mpich.git/commitdiff/88fbe180fefbc4c158e3745ca997c687f3... commit 88fbe180fefbc4c158e3745ca997c687f383508b Author: Rob Latham <[email protected]> Date: Mon Mar 2 15:00:30 2015 -0600 check for aio-lite request/presence if we use this aio-lite implementation of aio routines, the MPICH test suites all pass. Signed-off-by: Sangmin Seo <[email protected]> diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs.h b/src/mpi/romio/adio/ad_gpfs/ad_gpfs.h index 81fb076..d64dcae 100644 --- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs.h +++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs.h @@ -24,7 +24,9 @@ #ifdef HAVE_SIGNAL_H #include <signal.h> #endif -#ifdef HAVE_AIO_H +#ifdef HAVE_AIO_LITE_H +#include <aio-lite.h> +#elif defined HAVE_AIO_H #include <aio.h> #endif diff --git a/src/mpi/romio/adio/ad_lustre/ad_lustre.h b/src/mpi/romio/adio/ad_lustre/ad_lustre.h index 93034cd..edd2bd3 100644 --- a/src/mpi/romio/adio/ad_lustre/ad_lustre.h +++ b/src/mpi/romio/adio/ad_lustre/ad_lustre.h @@ -35,12 +35,16 @@ #include <signal.h> #endif -#ifdef HAVE_AIO_H -#include <aio.h> -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> -#endif -#endif /* End of HAVE_SYS_AIO_H */ +#ifdef HAVE_AIO_LITE_H +#include <aio-lite.h> +#else + #ifdef HAVE_AIO_H + #include <aio.h> + #endif + #ifdef HAVE_SYS_AIO_H + #include <sys/aio.h> + #endif +#endif /* End of HAVE_AIO_LITE_H */ void ADIOI_LUSTRE_Open(ADIO_File fd, int *error_code); void ADIOI_LUSTRE_Close(ADIO_File fd, int *error_code); diff --git a/src/mpi/romio/adio/ad_nfs/ad_nfs.h b/src/mpi/romio/adio/ad_nfs/ad_nfs.h index 83d394a..ba8ebb5 100644 --- a/src/mpi/romio/adio/ad_nfs/ad_nfs.h +++ b/src/mpi/romio/adio/ad_nfs/ad_nfs.h @@ -18,11 +18,15 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef HAVE_AIO_H -#include <aio.h> -#endif -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> +#ifdef HAVE_AIO_LITE_H +#include <aio-lite.h> +#else + #ifdef HAVE_AIO_H + #include <aio.h> + #endif + #ifdef HAVE_SYS_AIO_H + #include <sys/aio.h> + #endif #endif /* Workaround for incomplete set of definitions if __REDIRECT is not diff --git a/src/mpi/romio/adio/ad_panfs/ad_panfs.h b/src/mpi/romio/adio/ad_panfs/ad_panfs.h index 5f13f64..0f2e9f5 100644 --- a/src/mpi/romio/adio/ad_panfs/ad_panfs.h +++ b/src/mpi/romio/adio/ad_panfs/ad_panfs.h @@ -15,14 +15,20 @@ #include "adio.h" #ifndef NO_AIO -#ifdef AIO_SUN -#include <sys/asynch.h> -#else -#include <aio.h> -#ifdef NEEDS_ADIOCB_T -typedef struct adiocb adiocb_t; -#endif -#endif +# ifdef AIO_SUN +# include <sys/asynch.h> +# else + #ifdef HAVE_AIO_LITE_H + #include <aio-lite.h> + #else + #ifdef HAVE_AIO_H + #include <aio.h> + #endif + #ifdef HAVE_SYS_AIO_H + #include <sys/aio.h> + #endif + #endif +# endif #endif void ADIOI_PANFS_Open(ADIO_File fd, int *error_code); diff --git a/src/mpi/romio/adio/ad_ufs/ad_ufs.h b/src/mpi/romio/adio/ad_ufs/ad_ufs.h index 5ad2743..b26a2f9 100644 --- a/src/mpi/romio/adio/ad_ufs/ad_ufs.h +++ b/src/mpi/romio/adio/ad_ufs/ad_ufs.h @@ -18,11 +18,16 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef HAVE_AIO_H -#include <aio.h> -#endif -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> + +#ifdef HAVE_AIO_LITE_H +#include <aio-lite.h> +#else + #ifdef HAVE_AIO_H + #include <aio.h> + #endif + #ifdef HAVE_SYS_AIO_H + #include <sys/aio.h> + #endif #endif /* Workaround for incomplete set of definitions if __REDIRECT is not diff --git a/src/mpi/romio/adio/common/ad_done.c b/src/mpi/romio/adio/common/ad_done.c index fe48978..50764b7 100644 --- a/src/mpi/romio/adio/common/ad_done.c +++ b/src/mpi/romio/adio/common/ad_done.c @@ -16,11 +16,16 @@ #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> #endif -#ifdef HAVE_AIO_H -#include <aio.h> -#endif -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> + +#ifdef HAVE_AIO_LITE_H +#include <aio-lite.h> +#else + #ifdef HAVE_AIO_H + #include <aio.h> + #endif + #ifdef HAVE_SYS_AIO_H + #include <sys/aio.h> + #endif #endif /* Workaround for incomplete set of definitions if __REDIRECT is not diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index e01db6f..d408c6a 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1137,6 +1137,22 @@ if test "$ac_cv_header_aio_h" = "yes" -o "$ac_cv_header_sys_aio_h" = "yes" -o "x #endif] ] ) fi +# the aio-lite package provides an aio facility in case system aio library is +# buggy or does not perform well. for example, one fortran test does not pass +# its non-blocking collective I/O test +# See http://trac.mpich.org/projects/mpich/ticket/2201 for one such failure. + +AC_ARG_WITH([aio-lite], + [AS_HELP_STRING([--with-aio-lite], + [use alternate external aio implementation])], + [with_aiolite=yes], + []) +AS_IF([test "x$with_aiolite" == xyes], + AC_CHECK_LIB([aio-lite], [lio_listio], + [], [], [-lpthread] + ) + AC_CHECK_HEADERS([aio-lite.h]) + ) # End of aio-related tests # http://git.mpich.org/mpich.git/commitdiff/b36843996735002858970c7b5f8b50bcf0... commit b36843996735002858970c7b5f8b50bcf0b7598f Author: Rob Latham <[email protected]> Date: Mon Mar 2 13:53:49 2015 -0600 use autoconf routines for AIO struct checks Autoconf provides nice routines for "does this struct have this member", so use that instead of our home-grown nonstandrd checks Signed-off-by: Sangmin Seo <[email protected]> diff --git a/src/mpi/romio/adio/ad_nfs/ad_nfs_iwrite.c b/src/mpi/romio/adio/ad_nfs/ad_nfs_iwrite.c index f27b099..a5f988c 100644 --- a/src/mpi/romio/adio/ad_nfs/ad_nfs_iwrite.c +++ b/src/mpi/romio/adio/ad_nfs/ad_nfs_iwrite.c @@ -69,19 +69,19 @@ int ADIOI_NFS_aio(ADIO_File fd, void *buf, int len, ADIO_Offset offset, aiocbp->aio_buf = buf; aiocbp->aio_nbytes = len; -#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_WHENCE +#ifdef HAVE_STRUCT_AIOCB_AIO_WHENCE aiocbp->aio_whence = SEEK_SET; #endif -#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_FILDES +#ifdef HAVE_STRUCT_AIOCB_AIO_FILDES aiocbp->aio_fildes = fd_sys; #endif -#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_SIGEVENT +#ifdef HAVE_STRUCT_AIOCB_AIO_SIGEVENT # ifdef AIO_SIGNOTIFY_NONE aiocbp->aio_sigevent.sigev_notify = SIGEV_NONE; # endif aiocbp->aio_sigevent.sigev_signo = 0; #endif -#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_REQPRIO +#ifdef HAVE_STRUCT_AIOCB_AIO_REQPRIO # ifdef AIO_PRIO_DFL aiocbp->aio_reqprio = AIO_PRIO_DFL; /* not needed in DEC Unix 4.0 */ # else diff --git a/src/mpi/romio/adio/common/ad_iwrite.c b/src/mpi/romio/adio/common/ad_iwrite.c index 8177718..0a3d97e 100644 --- a/src/mpi/romio/adio/common/ad_iwrite.c +++ b/src/mpi/romio/adio/common/ad_iwrite.c @@ -113,19 +113,19 @@ int ADIOI_GEN_aio(ADIO_File fd, void *buf, int len, ADIO_Offset offset, aiocbp->aio_buf = buf; aiocbp->aio_nbytes = len; -#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_WHENCE +#ifdef HAVE_STRUCT_AIOCB_AIO_WHENCE aiocbp->aio_whence = SEEK_SET; #endif -#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_FILDES +#ifdef HAVE_STRUCT_AIOCB_AIO_FILDES aiocbp->aio_fildes = fd_sys; #endif -#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_SIGEVENT +#ifdef HAVE_STRUCT_AIOCB_AIO_SIGEVENT # ifdef AIO_SIGNOTIFY_NONE aiocbp->aio_sigevent.sigev_notify = SIGEV_NONE; # endif aiocbp->aio_sigevent.sigev_signo = 0; #endif -#ifdef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_REQPRIO +#ifdef HAVE_STRUCT_AIOCB_AIO_REQPRIO # ifdef AIO_PRIO_DFL aiocbp->aio_reqprio = AIO_PRIO_DFL; /* not needed in DEC Unix 4.0 */ # else @@ -134,7 +134,7 @@ int ADIOI_GEN_aio(ADIO_File fd, void *buf, int len, ADIO_Offset offset, #endif #ifndef ROMIO_HAVE_AIO_CALLS_NEED_FILEDES -#ifndef ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_FILDES +#ifndef HAVE_STRUCT_AIOCB_AIO_FILDES #error 'No fildes set for aio structure' #endif if (wr) err = aio_write(aiocbp); diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 3b4374c..e01db6f 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -133,8 +133,6 @@ MPI_OFFSET_KIND2="!" TEST_CC="" TEST_F77="" # -have_aio=no -# known_mpi_impls="mpich_mpi mpich_mpi sgi_mpi hp_mpi cray_mpi lam_mpi open_mpi_mpi" dnl An m4 macro for use with m4_foreach_w and friends. You should modify this @@ -1123,123 +1121,20 @@ if test "$ac_cv_header_aio_h" = "yes" -o "$ac_cv_header_sys_aio_h" = "yes" -o "x AC_DEFINE(ROMIO_HAVE_AIO_SUSPEND_TWO_ARGS, 1, Define if aio_suspend needs two arguments) fi - AC_MSG_CHECKING([for aio_fildes member of aiocb structure]) - AC_TRY_COMPILE([ -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_AIO_H -#include <aio.h> -#endif -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> -#endif - ],[ - struct aiocb a; - a.aio_fildes = 0; - ], - AC_MSG_RESULT(yes) - AC_DEFINE(ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_FILDES, 1, [Define if aiocb has aio_fildes member]), - AC_MSG_RESULT(no) - ) - AC_MSG_CHECKING(for aio_whence member of aiocb structure) - AC_TRY_COMPILE([ -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_AIO_H -#include <aio.h> -#endif -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> -#endif -#include <sys/types.h> -#include <unistd.h> - ],[ - struct aiocb a; - a.aio_whence = SEEK_SET; - ], - AC_MSG_RESULT(yes) - AC_DEFINE(ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_WHENCE, 1, [Define if aiocb has aio_whence member]), - AC_MSG_RESULT(no) - ) - AC_MSG_CHECKING(for aio_handle member of aiocb structure) - AC_TRY_COMPILE([ -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_AIO_H -#include <aio.h> -#endif -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> -#endif - ],[ - struct aiocb a; - aio_handle_t h; - - a.aio_handle = h; - ], - AC_MSG_RESULT(yes) - AC_DEFINE(ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_HANDLE, 1, [Define if aiocb has aio_handle member]), - AC_MSG_RESULT(no) - ) - AC_MSG_CHECKING(for aio_reqprio member of aiocb structure) - AC_TRY_COMPILE([ -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_AIO_H -#include <aio.h> -#endif -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> -#endif - ],[ - struct aiocb a; - - a.aio_reqprio = 0; - ], - AC_MSG_RESULT(yes) - AC_DEFINE(ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_REQPRIO, 1, [Define if aiocb has aio_reqprio member]), - AC_MSG_RESULT(no) - ) - AC_MSG_CHECKING(for aio_sigevent member of aiocb structure) - AC_TRY_COMPILE([ -#ifdef HAVE_SIGNAL_H -#include <signal.h> -#endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif -#ifdef HAVE_AIO_H -#include <aio.h> -#endif -#ifdef HAVE_SYS_AIO_H -#include <sys/aio.h> -#endif - ],[ - struct aiocb a; - - a.aio_sigevent.sigev_signo = 0; - ], - AC_MSG_RESULT(yes) - AC_DEFINE(ROMIO_HAVE_STRUCT_AIOCB_WITH_AIO_SIGEVENT, 1, [Define if aiocb has aio_sigevent member]), - AC_MSG_RESULT(no) - ) - + AC_CHECK_MEMBERS( + [struct aiocb.aio_fildes, + struct aiocb.aio_whence, + struct aiocb.aio_handle, + struct aiocb.aio_reqprio, + struct aiocb.aio_sigevent], + [], + [], + [[#ifdef HAVE_AIO_H + #include <aio.h> + #endif + #ifdef HAVE_SYS_AIO_H + #include <sys/aio.h> + #endif] ] ) fi # End of aio-related tests http://git.mpich.org/mpich.git/commitdiff/a07ac5516b909970a8fb1a4d6436f1c8bc... commit a07ac5516b909970a8fb1a4d6436f1c8bc1e645c Author: Rob Latham <[email protected]> Date: Mon Mar 2 13:37:33 2015 -0600 update ROMIO header checks for modern autoconf there is no need for ROMIO to try to compile header files. modern (and not-so-modern: since 2.56) autoconf will do exactly this with AC_CHECK_HEADERS Signed-off-by: Sangmin Seo <[email protected]> diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index f975e1c..3b4374c 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1001,34 +1001,13 @@ if test "x$disable_aio" = "xno" ; then fi if test "x$disable_aio" = "xno" -a -n "$aio_write_found" ; then - AC_CHECK_HEADERS(signal.h) - # Just because aio.h is found by CPP doesn't mean that we can use it - # We try to compile it, not just read it. - AC_MSG_CHECKING([if aio.h exists and can be compiled]) - AC_TRY_COMPILE([ -#include <sys/types.h> -#include <aio.h>], -[],have_aio_h=yes,have_aio_h=no) - AC_MSG_RESULT($have_aio_h) - if test "$have_aio_h" = yes ; then - AC_DEFINE(HAVE_AIO_H,1,[Define if aio.h exists and can be compiled]) - fi - - AC_MSG_CHECKING([if sys/aio.h exists and can be compiled]) - AC_TRY_COMPILE([ -#include <sys/types.h> -#include <sys/aio.h>], -[],have_sys_aio_h=yes,have_sys_aio_h=no) - AC_MSG_RESULT($have_sys_aio_h) - if test "$have_sys_aio_h" = yes ; then - AC_DEFINE(HAVE_SYS_AIO_H,1,[Define if sys/aio.h exists and can be compiled]) - fi - if test "$have_aio_h" = "no" -a "$have_sys_aio_h" = "no" ; then + AC_CHECK_HEADERS([signal.h aio.h sys/aio.h] ) + if test "$ac_cv_header_aio_h" = "no" -a "$ac_cv_header_sys_aio_h" = "no" ; then disable_aio=yes fi fi -if test "$have_aio_h" = "yes" -o "$have_sys_aio_h" = "yes" -o "x$disable_aio" = "xno"; then +if test "$ac_cv_header_aio_h" = "yes" -o "$ac_cv_header_sys_aio_h" = "yes" -o "x$disable_aio" = "xno"; then # Check that aio is available (many systems appear to have aio # either installed improperly or turned off). ----------------------------------------------------------------------- Summary of changes: confdb/aclocal_romio.m4 | 14 +++ src/mpi/romio/adio/ad_gpfs/ad_gpfs.h | 4 +- src/mpi/romio/adio/ad_lustre/ad_lustre.h | 16 ++- src/mpi/romio/adio/ad_nfs/ad_nfs.h | 14 ++- src/mpi/romio/adio/ad_nfs/ad_nfs_iwrite.c | 8 +- src/mpi/romio/adio/ad_panfs/ad_panfs.h | 22 +++-- src/mpi/romio/adio/ad_ufs/ad_ufs.h | 15 ++- src/mpi/romio/adio/common/ad_done.c | 15 ++- src/mpi/romio/adio/common/ad_iwrite.c | 10 +- src/mpi/romio/configure.ac | 182 ++++++----------------------- 10 files changed, 115 insertions(+), 185 deletions(-) hooks/post-receive -- MPICH primary repository