[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-94-g9381f50

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 9381f5011f73a3ff8961fa50bad34f15b9ba915b (commit) via 2c4b27e02b4012b5b827c62c8a7856a45536b956 (commit) via 7e583d1ca8843c1626bfb6b34121a671eb40bed2 (commit) via e9f73814bb051da5a47fcd089524a576be462fa9 (commit) via 4e6693f7d60f487d55609f7cd2491826552acb2b (commit) from 6dd14a73c80348de97219e499b41d0db8f3ee737 (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/9381f5011f73a3ff8961fa50bad34f15b9... commit 9381f5011f73a3ff8961fa50bad34f15b9ba915b Author: Rob Latham <[email protected]> Date: Wed Jan 13 11:55:17 2016 -0600 SGI's MPI does not need a special case SGI MPI does provide MPI_Status_set_elements_x now, so we can remove this direct (and incorrect) manipulation of the status structure. Signed-off-by: Halim Amer <[email protected]> diff --git a/src/mpi/romio/adio/common/status_setb.c b/src/mpi/romio/adio/common/status_setb.c index 390f821..0b37cf2 100644 --- a/src/mpi/romio/adio/common/status_setb.c +++ b/src/mpi/romio/adio/common/status_setb.c @@ -8,7 +8,7 @@ #include "adio.h" #include "mpi.h" -#if defined(MPICH2) || (defined(MPICH) && (MPICH_NAME >= 3)) +#if defined(HAVE_MPI_STATUS_SET_ELEMENTS_X) /* Not quite correct, but much closer for MPI2 */ /* TODO: still needs to handle partial datatypes and situations where the mpi * implementation fills status with something other than bytes (globus2 might @@ -23,15 +23,4 @@ int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, MPI_Status_set_elements_x(status, MPI_BYTE, nbytes); return MPI_SUCCESS; } -#elif defined(MPISGI) -int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, - MPI_Count nbytes) -{ - /* Bogusness to silence compiler warnings */ - if (datatype == MPI_DATATYPE_NULL); - - if (status != MPI_STATUS_IGNORE) - status->st_length = nbytes; - return MPI_SUCCESS; -} #endif http://git.mpich.org/mpich.git/commitdiff/2c4b27e02b4012b5b827c62c8a7856a455... commit 2c4b27e02b4012b5b827c62c8a7856a45536b956 Author: Rob Latham <[email protected]> Date: Thu Jan 14 14:56:14 2016 -0600 openmpi also supports elements_x Signed-off-by: Halim Amer <[email protected]> diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 7a8342f..17cb376 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1487,6 +1487,7 @@ if test $FROM_OMPI = yes ; then # Open MPI does have the status set bytes functionality AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if have MPIR_Status_set_bytes]) + AC_DEFINE(HAVE_MPI_STATUS_SET_ELEMENTS_X, 1, [Define if MPI library provides MPI_STATUS_SET_ELEMENTS_X]) # Used in the tests/ subdirectory for after ROMIO is built http://git.mpich.org/mpich.git/commitdiff/7e583d1ca8843c1626bfb6b34121a671eb... commit 7e583d1ca8843c1626bfb6b34121a671eb40bed2 Author: Rob Latham <[email protected]> Date: Wed Jan 13 11:56:50 2016 -0600 remove references to the LAM implementation It's not clear to me how one would even *acquire* LAM today. Signed-off-by: Halim Amer <[email protected]> diff --git a/src/mpi/romio/.codingcheck b/src/mpi/romio/.codingcheck index 9b52b35..bc77906 100644 --- a/src/mpi/romio/.codingcheck +++ b/src/mpi/romio/.codingcheck @@ -28,7 +28,6 @@ 'PVFS_.+' => romio, 'MPI_hpux'=> romio, 'FORTRANCAPS'=> romio, - 'MPILAM'=> romio, 'NEEDS_ADIOCB_T'=> romio, 'AGG_DEBUG'=> romio, 'SOLARIS'=> romio, diff --git a/src/mpi/romio/adio/common/status_setb.c b/src/mpi/romio/adio/common/status_setb.c index ec1e4ff..390f821 100644 --- a/src/mpi/romio/adio/common/status_setb.c +++ b/src/mpi/romio/adio/common/status_setb.c @@ -23,7 +23,7 @@ int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, MPI_Status_set_elements_x(status, MPI_BYTE, nbytes); return MPI_SUCCESS; } -#elif defined(MPILAM) || defined(MPISGI) +#elif defined(MPISGI) int MPIR_Status_set_bytes(MPI_Status *status, MPI_Datatype datatype, MPI_Count nbytes) { diff --git a/src/mpi/romio/configure.ac b/src/mpi/romio/configure.ac index 278ad75..7a8342f 100644 --- a/src/mpi/romio/configure.ac +++ b/src/mpi/romio/configure.ac @@ -1386,10 +1386,6 @@ if test -n "$mpi_sgi"; then AC_DEFINE(MPISGI,1,[Define if SGI MPI]) fi -if test -n "$mpi_lam"; then - AC_DEFINE(MPILAM,1,[Define if using LAM/MPI]) -fi - if test -n "$mpi_hp"; then AC_DEFINE(MPIHP,1,[Define if using HP MPI]) if test "$NOF77" = 0; then @@ -1430,8 +1426,6 @@ AC_SUBST(master_topbuild_dir) # The following definitions are needed within adio/common/status_setb.c if test "$FROM_MPICH" = yes ; then AC_DEFINE(ROMIO_INSIDE_MPICH,1,[Define if compiling within MPICH]) -elif test "$FROM_MPILAM" = yes ; then - AC_DEFINE(MPILAM,1,[Define if compiling within LAM/MPI]) fi if test "$FROM_MPICH" = no ; then @@ -1511,20 +1505,6 @@ if test $FROM_OMPI = yes ; then AC_DEFINE(MPIO_BUILD_PROFILING, 1, [hack to make ROMIO build without profiling]) DEFINE_HAVE_MPI_GREQUEST="#define HAVE_MPI_GREQUEST" AC_DEFINE(HAVE_DECL_MPI_COMBINER_HINDEXED_BLOCK, 1, [Define if MPI library provides HINDEXED_BLOCK datatype]) -elif test $FROM_LAM = yes ; then - # LAM does have the status set bytes functionality - AC_DEFINE(HAVE_STATUS_SET_BYTES,1,[Define if have MPIR_Status_set_bytes]) - - # Used in the tests/ subdirectory for after ROMIO is built - TEST_CC=mpicc - TEST_F77=mpifort - MPIRUN=mpirun - MPI_LIB= - ROMIO_INCLUDE= - USER_CFLAGS= - USER_FFLAGS= - TEST_LIBNAME= - EXTRA_DIRS="mpi-io/fortran mpi2-other/info mpi2-other/info/fortran mpi2-other/array mpi2-other/array/fortran" elif test $FROM_MPICH = yes ; then # For now, separate the mpich from mpich cases MPICH_HOME=`dirname $ROMIO_HOME` diff --git a/src/mpi/romio/mpi-io/fortran/get_extentf.c b/src/mpi/romio/mpi-io/fortran/get_extentf.c index 9a11d3c..c39845d 100644 --- a/src/mpi/romio/mpi-io/fortran/get_extentf.c +++ b/src/mpi/romio/mpi-io/fortran/get_extentf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_get_type_extent_( MPI_Fint *, MPI_Fin #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_get_type_extent_(MPI_Fint *fh,MPI_Fint *datatype, MPI_Fint *extent, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/get_groupf.c b/src/mpi/romio/mpi-io/fortran/get_groupf.c index bb8c9a9..4e8b8ba 100644 --- a/src/mpi/romio/mpi-io/fortran/get_groupf.c +++ b/src/mpi/romio/mpi-io/fortran/get_groupf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_get_group_( MPI_Fint *, MPI_Group*, M #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_get_group_(MPI_Fint *fh, MPI_Fint *group, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/get_viewf.c b/src/mpi/romio/mpi-io/fortran/get_viewf.c index 8a4bc3d..465cd9a 100644 --- a/src/mpi/romio/mpi-io/fortran/get_viewf.c +++ b/src/mpi/romio/mpi-io/fortran/get_viewf.c @@ -92,7 +92,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_get_view_( MPI_Fint *, MPI_Offset*, M #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_get_view_(MPI_Fint *fh,MPI_Offset *disp,MPI_Fint *etype, MPI_Fint *filetype,char *datarep, MPI_Fint *ierr, int str_len ); diff --git a/src/mpi/romio/mpi-io/fortran/iread_atf.c b/src/mpi/romio/mpi-io/fortran/iread_atf.c index c6a687d..00729cf 100644 --- a/src/mpi/romio/mpi-io/fortran/iread_atf.c +++ b/src/mpi/romio/mpi-io/fortran/iread_atf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_iread_at_( MPI_Fint *, MPI_Offset *, #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_iread_at_(MPI_Fint *fh,MPI_Offset *offset,void *buf, MPI_Fint *count,MPI_Fint *datatype, diff --git a/src/mpi/romio/mpi-io/fortran/iread_shf.c b/src/mpi/romio/mpi-io/fortran/iread_shf.c index 84dc375..382bb29 100644 --- a/src/mpi/romio/mpi-io/fortran/iread_shf.c +++ b/src/mpi/romio/mpi-io/fortran/iread_shf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_iread_shared_( MPI_Fint *, void*, MPI #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_iread_shared_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Fint *request, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/ireadf.c b/src/mpi/romio/mpi-io/fortran/ireadf.c index ae9fbaf..09c9f56 100644 --- a/src/mpi/romio/mpi-io/fortran/ireadf.c +++ b/src/mpi/romio/mpi-io/fortran/ireadf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_iread_( MPI_Fint *, void*, MPI_Fint * #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_iread_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Fint *request, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/iwrite_atf.c b/src/mpi/romio/mpi-io/fortran/iwrite_atf.c index b326fc3..affdaef 100644 --- a/src/mpi/romio/mpi-io/fortran/iwrite_atf.c +++ b/src/mpi/romio/mpi-io/fortran/iwrite_atf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_iwrite_at_( MPI_Fint *, MPI_Offset *, #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_iwrite_at_(MPI_Fint *fh,MPI_Offset *offset,void *buf, MPI_Fint *count,MPI_Fint *datatype, diff --git a/src/mpi/romio/mpi-io/fortran/iwrite_shf.c b/src/mpi/romio/mpi-io/fortran/iwrite_shf.c index 90ea687..a10f700 100644 --- a/src/mpi/romio/mpi-io/fortran/iwrite_shf.c +++ b/src/mpi/romio/mpi-io/fortran/iwrite_shf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_iwrite_shared_( MPI_Fint *, void*, MP #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_iwrite_shared_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Fint *request, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/iwritef.c b/src/mpi/romio/mpi-io/fortran/iwritef.c index 4410c01..4200fd9 100644 --- a/src/mpi/romio/mpi-io/fortran/iwritef.c +++ b/src/mpi/romio/mpi-io/fortran/iwritef.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_iwrite_( MPI_Fint *, void*, MPI_Fint #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_iwrite_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Fint *request, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/openf.c b/src/mpi/romio/mpi-io/fortran/openf.c index ea1a5d1..5d02ca0 100644 --- a/src/mpi/romio/mpi-io/fortran/openf.c +++ b/src/mpi/romio/mpi-io/fortran/openf.c @@ -92,7 +92,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_open_( MPI_Fint *, char * FORT_MIXED_ #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_open_(MPI_Fint *comm,char *filename,MPI_Fint *amode, MPI_Fint *info, MPI_Fint *fh, MPI_Fint *ierr, int str_len ); diff --git a/src/mpi/romio/mpi-io/fortran/rd_atallbf.c b/src/mpi/romio/mpi-io/fortran/rd_atallbf.c index 5fff4e9..e548cfc 100644 --- a/src/mpi/romio/mpi-io/fortran/rd_atallbf.c +++ b/src/mpi/romio/mpi-io/fortran/rd_atallbf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_at_all_begin_( MPI_Fint *, MPI_O #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_at_all_begin_(MPI_Fint *fh,MPI_Offset *offset,void *buf, MPI_Fint *count,MPI_Fint *datatype, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/read_allbf.c b/src/mpi/romio/mpi-io/fortran/read_allbf.c index 5708a03..665d47f 100644 --- a/src/mpi/romio/mpi-io/fortran/read_allbf.c +++ b/src/mpi/romio/mpi-io/fortran/read_allbf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_all_begin_( MPI_Fint *, void*, M #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_all_begin_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/read_allf.c b/src/mpi/romio/mpi-io/fortran/read_allf.c index 99e1229..725f58a 100644 --- a/src/mpi/romio/mpi-io/fortran/read_allf.c +++ b/src/mpi/romio/mpi-io/fortran/read_allf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_all_( MPI_Fint *, void*, MPI_Fin #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_all_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/read_atallf.c b/src/mpi/romio/mpi-io/fortran/read_atallf.c index b9f30a0..8ef2764 100644 --- a/src/mpi/romio/mpi-io/fortran/read_atallf.c +++ b/src/mpi/romio/mpi-io/fortran/read_atallf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_at_all_( MPI_Fint *, MPI_Offset #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_at_all_(MPI_Fint *fh,MPI_Offset *offset,void *buf, MPI_Fint *count,MPI_Fint *datatype, diff --git a/src/mpi/romio/mpi-io/fortran/read_atf.c b/src/mpi/romio/mpi-io/fortran/read_atf.c index 2602e39..646ec5c 100644 --- a/src/mpi/romio/mpi-io/fortran/read_atf.c +++ b/src/mpi/romio/mpi-io/fortran/read_atf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_at_( MPI_Fint *, MPI_Offset *, v #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_at_(MPI_Fint *fh,MPI_Offset *offset,void *buf, MPI_Fint *count,MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/read_ordbf.c b/src/mpi/romio/mpi-io/fortran/read_ordbf.c index 7438917..9dcff02 100644 --- a/src/mpi/romio/mpi-io/fortran/read_ordbf.c +++ b/src/mpi/romio/mpi-io/fortran/read_ordbf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_ordered_begin_( MPI_Fint *, void #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_ordered_begin_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/read_ordf.c b/src/mpi/romio/mpi-io/fortran/read_ordf.c index a45ae12..428ce03 100644 --- a/src/mpi/romio/mpi-io/fortran/read_ordf.c +++ b/src/mpi/romio/mpi-io/fortran/read_ordf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_ordered_( MPI_Fint *, void*, MPI #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_ordered_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/read_shf.c b/src/mpi/romio/mpi-io/fortran/read_shf.c index 937e54f..7132ef2 100644 --- a/src/mpi/romio/mpi-io/fortran/read_shf.c +++ b/src/mpi/romio/mpi-io/fortran/read_shf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_shared_( MPI_Fint *, void*, MPI_ #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_shared_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/readf.c b/src/mpi/romio/mpi-io/fortran/readf.c index c802739..45664a9 100644 --- a/src/mpi/romio/mpi-io/fortran/readf.c +++ b/src/mpi/romio/mpi-io/fortran/readf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_read_( MPI_Fint *, void*, MPI_Fint *, #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_read_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/set_viewf.c b/src/mpi/romio/mpi-io/fortran/set_viewf.c index 97151d9..9d75ab1 100644 --- a/src/mpi/romio/mpi-io/fortran/set_viewf.c +++ b/src/mpi/romio/mpi-io/fortran/set_viewf.c @@ -92,7 +92,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_set_view_( MPI_Fint *, MPI_Offset *, #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_set_view_(MPI_Fint *fh,MPI_Offset *disp,MPI_Fint *etype, MPI_Fint *filetype,char *datarep,MPI_Fint *info, MPI_Fint *ierr, diff --git a/src/mpi/romio/mpi-io/fortran/wr_atallbf.c b/src/mpi/romio/mpi-io/fortran/wr_atallbf.c index 836dd37..af880f0 100644 --- a/src/mpi/romio/mpi-io/fortran/wr_atallbf.c +++ b/src/mpi/romio/mpi-io/fortran/wr_atallbf.c @@ -90,7 +90,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_at_all_begin_( MPI_Fint *, MPI_ #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_at_all_begin_(MPI_Fint *fh,MPI_Offset *offset,void *buf, MPI_Fint *count,MPI_Fint *datatype, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/write_allbf.c b/src/mpi/romio/mpi-io/fortran/write_allbf.c index e47d3cd..e873787 100644 --- a/src/mpi/romio/mpi-io/fortran/write_allbf.c +++ b/src/mpi/romio/mpi-io/fortran/write_allbf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_all_begin_( MPI_Fint *, void*, #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_all_begin_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/write_allf.c b/src/mpi/romio/mpi-io/fortran/write_allf.c index bddcac1..e6e9646 100644 --- a/src/mpi/romio/mpi-io/fortran/write_allf.c +++ b/src/mpi/romio/mpi-io/fortran/write_allf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_all_( MPI_Fint *, void*, MPI_Fi #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_all_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/write_atallf.c b/src/mpi/romio/mpi-io/fortran/write_atallf.c index 030e7ae..cf68edf 100644 --- a/src/mpi/romio/mpi-io/fortran/write_atallf.c +++ b/src/mpi/romio/mpi-io/fortran/write_atallf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_at_all_( MPI_Fint *, MPI_Offset #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_at_all_(MPI_Fint *fh,MPI_Offset *offset,void *buf, MPI_Fint *count,MPI_Fint *datatype, diff --git a/src/mpi/romio/mpi-io/fortran/write_atf.c b/src/mpi/romio/mpi-io/fortran/write_atf.c index 8ba429d..984b4c6 100644 --- a/src/mpi/romio/mpi-io/fortran/write_atf.c +++ b/src/mpi/romio/mpi-io/fortran/write_atf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_at_( MPI_Fint *, MPI_Offset *, #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_at_(MPI_Fint *fh,MPI_Offset *offset,void *buf, MPI_Fint *count,MPI_Fint *datatype, diff --git a/src/mpi/romio/mpi-io/fortran/write_ordbf.c b/src/mpi/romio/mpi-io/fortran/write_ordbf.c index 41b9acc..99959c8 100644 --- a/src/mpi/romio/mpi-io/fortran/write_ordbf.c +++ b/src/mpi/romio/mpi-io/fortran/write_ordbf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_ordered_begin_( MPI_Fint *, voi #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_ordered_begin_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/write_ordf.c b/src/mpi/romio/mpi-io/fortran/write_ordf.c index fe96406..0665605 100644 --- a/src/mpi/romio/mpi-io/fortran/write_ordf.c +++ b/src/mpi/romio/mpi-io/fortran/write_ordf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_ordered_( MPI_Fint *, void*, MP #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_ordered_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/write_shf.c b/src/mpi/romio/mpi-io/fortran/write_shf.c index 30d80e0..2452361 100644 --- a/src/mpi/romio/mpi-io/fortran/write_shf.c +++ b/src/mpi/romio/mpi-io/fortran/write_shf.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_shared_( MPI_Fint *, void*, MPI #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_shared_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); diff --git a/src/mpi/romio/mpi-io/fortran/writef.c b/src/mpi/romio/mpi-io/fortran/writef.c index 9b07ba0..63158fb 100644 --- a/src/mpi/romio/mpi-io/fortran/writef.c +++ b/src/mpi/romio/mpi-io/fortran/writef.c @@ -89,7 +89,7 @@ extern FORTRAN_API void FORT_CALL mpi_file_write_( MPI_Fint *, void*, MPI_Fint * #endif #endif -#if defined(MPIHP) || defined(MPILAM) +#if defined(MPIHP) /* Prototype to keep compiler happy */ void mpi_file_write_(MPI_Fint *fh,void *buf,MPI_Fint *count, MPI_Fint *datatype,MPI_Status *status, MPI_Fint *ierr ); http://git.mpich.org/mpich.git/commitdiff/e9f73814bb051da5a47fcd089524a576be... commit e9f73814bb051da5a47fcd089524a576be462fa9 Author: Rob Latham <[email protected]> Date: Wed Jan 13 11:00:52 2016 -0600 remove special cases for SGI's MPI Michael Raymond tells me that SGI's MPI no longer provides the mpisgi2.h header file, nor does it have the datatype bug ROMIO was working around. Signed-off-by: Halim Amer <[email protected]> diff --git a/src/mpi/romio/adio/ad_nfs/ad_nfs_fcntl.c b/src/mpi/romio/adio/ad_nfs/ad_nfs_fcntl.c index c73006e..729291f 100644 --- a/src/mpi/romio/adio/ad_nfs/ad_nfs_fcntl.c +++ b/src/mpi/romio/adio/ad_nfs/ad_nfs_fcntl.c @@ -7,9 +7,6 @@ #include "ad_nfs.h" #include "adio_extern.h" -/* #ifdef MPISGI -#include "mpisgi2.h" -#endif */ void ADIOI_NFS_Fcntl(ADIO_File fd, int flag, ADIO_Fcntl_t *fcntl_struct, int *error_code) { diff --git a/src/mpi/romio/adio/common/flatten.c b/src/mpi/romio/adio/common/flatten.c index ac31007..d51f63d 100644 --- a/src/mpi/romio/adio/common/flatten.c +++ b/src/mpi/romio/adio/common/flatten.c @@ -6,9 +6,6 @@ #include "adio.h" #include "adio_extern.h" -/* #ifdef MPISGI -#include "mpisgi2.h" -#endif */ #ifdef USE_DBG_LOGGING #define FLATTEN_DEBUG 1 @@ -816,15 +813,11 @@ void ADIOI_Flatten(MPI_Datatype datatype, ADIOI_Flatlist_node *flat, MPI_Abort(MPI_COMM_WORLD, 1); } -#ifndef MPISGI -/* There is a bug in SGI's impl. of MPI_Type_get_contents. It doesn't - return new datatypes. Therefore no need to free. */ for (i=0; i<ntypes; i++) { MPI_Type_get_envelope(types[i], &old_nints, &old_nadds, &old_ntypes, &old_combiner); if (old_combiner != MPI_COMBINER_NAMED) MPI_Type_free(types+i); } -#endif ADIOI_Free(ints); ADIOI_Free(adds); @@ -1104,15 +1097,11 @@ MPI_Count ADIOI_Count_contiguous_blocks(MPI_Datatype datatype, MPI_Count *curr_i MPI_Abort(MPI_COMM_WORLD, 1); } -#ifndef MPISGI -/* There is a bug in SGI's impl. of MPI_Type_get_contents. It doesn't - return new datatypes. Therefore no need to free. */ for (i=0; i<ntypes; i++) { MPI_Type_get_envelope(types[i], &old_nints, &old_nadds, &old_ntypes, &old_combiner); if (old_combiner != MPI_COMBINER_NAMED) MPI_Type_free(types+i); } -#endif ADIOI_Free(ints); ADIOI_Free(adds); diff --git a/src/mpi/romio/adio/common/iscontig.c b/src/mpi/romio/adio/common/iscontig.c index 3c8aa71..0825ffd 100644 --- a/src/mpi/romio/adio/common/iscontig.c +++ b/src/mpi/romio/adio/common/iscontig.c @@ -5,9 +5,6 @@ */ #include "adio.h" -/* #ifdef MPISGI -#include "mpisgi2.h" -#endif */ #if defined(MPICH) /* MPICH also provides this routine */ @@ -83,12 +80,8 @@ void ADIOI_Datatype_iscontig(MPI_Datatype datatype, int *flag) adds, types); ADIOI_Datatype_iscontig(types[0], flag); -#ifndef MPISGI -/* There is a bug in SGI's impl. of MPI_Type_get_contents. It doesn't - return new datatypes. Therefore no need to free. */ MPI_Type_get_envelope(types[0], &ni, &na, &nt, &cb); if (cb != MPI_COMBINER_NAMED) MPI_Type_free(types); -#endif ADIOI_Free(ints); ADIOI_Free(adds); diff --git a/src/mpi/romio/mpi-io/get_view.c b/src/mpi/romio/mpi-io/get_view.c index 46b0926..e6d1d63 100644 --- a/src/mpi/romio/mpi-io/get_view.c +++ b/src/mpi/romio/mpi-io/get_view.c @@ -25,9 +25,6 @@ int MPI_File_get_view(MPI_File fh, MPI_Offset *disp, MPI_Datatype *etype, MPI_Da #define MPIO_BUILD_PROFILING #include "mpioprof.h" #endif -#ifdef MPISGI -#include "mpisgi2.h" -#endif /*@ MPI_File_get_view - Returns the file view http://git.mpich.org/mpich.git/commitdiff/4e6693f7d60f487d55609f7cd249182655... commit 4e6693f7d60f487d55609f7cd2491826552acb2b Author: Rob Latham <[email protected]> Date: Wed Jan 13 10:25:51 2016 -0600 change cb_config_list delimiter only on bluegene at one time, we (incorrectly) mixed GPFS file system support and BlueGene architecture into one driver. When we broke out GPFS into its own driver with architectue-specific "flavors", we should have tweaked the delimiter only on BlueGene (it's necessary because BlueGene machine names have special characters in them). With this change, folks who configure ROMIO with GPFS support won't be surprised by a cb_config_list change (and noncontig_coll2 will pass). Signed-off-by: Halim Amer <[email protected]> diff --git a/src/mpi/romio/adio/common/cb_config_list.c b/src/mpi/romio/adio/common/cb_config_list.c index 1c1fef7..6b4d82c 100644 --- a/src/mpi/romio/adio/common/cb_config_list.c +++ b/src/mpi/romio/adio/common/cb_config_list.c @@ -702,7 +702,7 @@ static int get_max_procs(int cb_nodes) * * Returns a token of types defined at top of this file. */ -#if defined(ROMIO_GPFS) +#if defined(BGQPLATFORM) /* On BlueGene, the ',' character shows up in get_processor_name, so we have to * use a different delimiter */ #define COLON ':' ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/.codingcheck | 1 - src/mpi/romio/adio/ad_nfs/ad_nfs_fcntl.c | 3 --- src/mpi/romio/adio/common/cb_config_list.c | 2 +- src/mpi/romio/adio/common/flatten.c | 11 ----------- src/mpi/romio/adio/common/iscontig.c | 7 ------- src/mpi/romio/adio/common/status_setb.c | 13 +------------ src/mpi/romio/configure.ac | 21 +-------------------- src/mpi/romio/mpi-io/fortran/get_extentf.c | 2 +- src/mpi/romio/mpi-io/fortran/get_groupf.c | 2 +- src/mpi/romio/mpi-io/fortran/get_viewf.c | 2 +- src/mpi/romio/mpi-io/fortran/iread_atf.c | 2 +- src/mpi/romio/mpi-io/fortran/iread_shf.c | 2 +- src/mpi/romio/mpi-io/fortran/ireadf.c | 2 +- src/mpi/romio/mpi-io/fortran/iwrite_atf.c | 2 +- src/mpi/romio/mpi-io/fortran/iwrite_shf.c | 2 +- src/mpi/romio/mpi-io/fortran/iwritef.c | 2 +- src/mpi/romio/mpi-io/fortran/openf.c | 2 +- src/mpi/romio/mpi-io/fortran/rd_atallbf.c | 2 +- src/mpi/romio/mpi-io/fortran/read_allbf.c | 2 +- src/mpi/romio/mpi-io/fortran/read_allf.c | 2 +- src/mpi/romio/mpi-io/fortran/read_atallf.c | 2 +- src/mpi/romio/mpi-io/fortran/read_atf.c | 2 +- src/mpi/romio/mpi-io/fortran/read_ordbf.c | 2 +- src/mpi/romio/mpi-io/fortran/read_ordf.c | 2 +- src/mpi/romio/mpi-io/fortran/read_shf.c | 2 +- src/mpi/romio/mpi-io/fortran/readf.c | 2 +- src/mpi/romio/mpi-io/fortran/set_viewf.c | 2 +- src/mpi/romio/mpi-io/fortran/wr_atallbf.c | 2 +- src/mpi/romio/mpi-io/fortran/write_allbf.c | 2 +- src/mpi/romio/mpi-io/fortran/write_allf.c | 2 +- src/mpi/romio/mpi-io/fortran/write_atallf.c | 2 +- src/mpi/romio/mpi-io/fortran/write_atf.c | 2 +- src/mpi/romio/mpi-io/fortran/write_ordbf.c | 2 +- src/mpi/romio/mpi-io/fortran/write_ordf.c | 2 +- src/mpi/romio/mpi-io/fortran/write_shf.c | 2 +- src/mpi/romio/mpi-io/fortran/writef.c | 2 +- src/mpi/romio/mpi-io/get_view.c | 3 --- 37 files changed, 32 insertions(+), 87 deletions(-) hooks/post-receive -- MPICH primary repository