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 60cf2c24ec303404ebf60def0a6e9c8a9bd22f64 (commit) via 06ab532f4a6b5a860dcd1f82d9b7880eb44f626e (commit) via 5d0e0e3d01eb022cf53607e9a9c6c3047f098a10 (commit) via 6d963fb352315f48a3534d757660bf75c128addf (commit) from 2c6e27c32bf76302348aecfedf82856c04286003 (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/60cf2c24ec303404ebf60def0a6e9c8a9b... commit 60cf2c24ec303404ebf60def0a6e9c8a9bd22f64 Author: Rob Latham <[email protected]> Date: Mon Mar 31 16:29:20 2014 +0000 Fix up header files in ad_gpfs_open.c after re-engineering, ad_gpfs_open on some environments was missing a header file for 'struct stat64'. Found it was also bringing in header files it did not need. Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c index 4e236b6..d4e7466 100644 --- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c +++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c @@ -14,10 +14,11 @@ #include "ad_gpfs_tuning.h" -#include <sys/statfs.h> -#include <sys/vfs.h> #include <sys/types.h> +#include <sys/stat.h> #include <unistd.h> +#include <fcntl.h> + #ifdef HAVE_GPFS_H #include <gpfs.h> http://git.mpich.org/mpich.git/commitdiff/06ab532f4a6b5a860dcd1f82d9b7880eb4... commit 06ab532f4a6b5a860dcd1f82d9b7880eb44f626e Author: Rob Latham <[email protected]> Date: Thu Mar 27 18:49:40 2014 +0000 use apropriate enum even though they are the same value, clang noticed this structure expected members from one kind of enum, but was initialized with a different enum. Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpid/pamid/src/onesided/mpid_win_create.c b/src/mpid/pamid/src/onesided/mpid_win_create.c index 706da3c..20ce66a 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_create.c +++ b/src/mpid/pamid/src/onesided/mpid_win_create.c @@ -81,7 +81,7 @@ MPIDI_Win_init( MPI_Aint length, win->mpid.info_args.no_locks = 0; win->mpid.info_args.accumulate_ordering = (MPIDI_ACCU_ORDER_RAR | MPIDI_ACCU_ORDER_RAW | MPIDI_ACCU_ORDER_WAR | MPIDI_ACCU_ORDER_WAW); - win->mpid.info_args.accumulate_ops = MPIDI_ACCU_OPS_SAME_OP_NO_OP; /*default */ + win->mpid.info_args.accumulate_ops = MPIDI_ACCU_SAME_OP_NO_OP; /*default */ win->mpid.info_args.same_size = 0; win->mpid.info_args.alloc_shared_noncontig = 0; http://git.mpich.org/mpich.git/commitdiff/5d0e0e3d01eb022cf53607e9a9c6c3047f... commit 5d0e0e3d01eb022cf53607e9a9c6c3047f098a10 Author: Rob Latham <[email protected]> Date: Fri Jul 18 13:19:31 2014 -0500 munmap and shm_unlink prototyped in mman.h Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpid/pamid/src/onesided/mpid_win_free.c b/src/mpid/pamid/src/onesided/mpid_win_free.c index 00da268..9c57553 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_free.c +++ b/src/mpid/pamid/src/onesided/mpid_win_free.c @@ -23,6 +23,9 @@ #include <sys/shm.h> #include <sys/ipc.h> #include <sys/stat.h> +#ifdef USE_MMAP_SHM +#include <sys/mman.h> +#endif int MPIDI_SHM_Win_free(MPID_Win **win_ptr) http://git.mpich.org/mpich.git/commitdiff/6d963fb352315f48a3534d757660bf75c1... commit 6d963fb352315f48a3534d757660bf75c128addf Author: Rob Latham <[email protected]> Date: Wed Jul 16 16:30:20 2014 -0500 do not redefine MIN if provided elsewhere Signed-off-by: Michael Blocksome <[email protected]> diff --git a/src/mpid/pamid/src/pamix/pamix.c b/src/mpid/pamid/src/pamix/pamix.c index 78fb4c6..a24b59f 100644 --- a/src/mpid/pamid/src/pamix/pamix.c +++ b/src/mpid/pamid/src/pamix/pamix.c @@ -33,7 +33,9 @@ #define PAMIX_assert(x) assert(x) #endif -#define MIN(a,b) ((a<b)?a:b) +#ifndef MIN +#define MIN(a,b) (((a)<(b))?(a):(b)) +#endif #ifdef __BGQ__ #define __BG__ ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c | 5 +++-- src/mpid/pamid/src/onesided/mpid_win_create.c | 2 +- src/mpid/pamid/src/onesided/mpid_win_free.c | 3 +++ src/mpid/pamid/src/pamix/pamix.c | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository