[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-116-g3dba492

[Service Account]

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  3dba4928aefcdc7baaa977b5a345507c20b16fea (commit)
       via  81585955db60e556f9c6b26fc97b10230abb2aa6 (commit)
       via  db4296b64b6ed1e7282cdb4db62aa2925a66031a (commit)
      from  1357dae1ed0c3b73032e0205c2cce138fbb90b05 (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/3dba4928aefcdc7baaa977b5a345507c20b16fea

commit 3dba4928aefcdc7baaa977b5a345507c20b16fea
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Thu Mar 27 16:25:03 2014 +0000

    bring in missing header files for lseek and close
    
    No Reviewer

diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c
index d82e0e5..fbb03b7 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c
@@ -13,6 +13,7 @@
  */
 
 #include "ad_gpfs_tuning.h"
+#include <unistd.h>
 
 void ADIOI_GPFS_Close(ADIO_File fd, int *error_code)
 {
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 6225dd9..c3edd84 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c
@@ -16,6 +16,9 @@
 
 #include <sys/statfs.h>
 #include <sys/vfs.h>
+#include <sys/types.h>
+#include <unistd.h>
+
 
 void ADIOI_GPFS_Open(ADIO_File fd, int *error_code)
 {

http://git.mpich.org/mpich.git/commitdiff/81585955db60e556f9c6b26fc97b10230abb2aa6

commit 81585955db60e556f9c6b26fc97b10230abb2aa6
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Thu Mar 27 16:24:47 2014 +0000

    remove unused variables

diff --git a/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c b/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c
index 959e564..5c9c9bc 100644
--- a/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c
+++ b/src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c
@@ -374,7 +374,6 @@ ADIOI_BG_compute_agg_ranklist_serial ( ADIO_File fd,
 	 * know how many aggs belong to each bridge */
 	for (i=0;i<naggs;i++) {
 	    int aggbridgerank = all_procInfo[tmp_ranklist[i]].bridgeRank;
-	    int ionid = all_procInfo[tmp_ranklist[i]].ionID;
 	    int foundrank = 0;
 	    int summaryranklistbridgeindex = 0;
 	    int j;
@@ -447,7 +446,6 @@ ADIOI_BG_compute_agg_ranklist_serial ( ADIO_File fd,
 	 * is now sorted by the bridge node and ion minimum bridge rank */
 	int currentrankoffset = 0;
 	for (i=0;i<numbridges;i++) {
-	    int bridgerankiter = 0;
 	    int *thisBridgeAggList = (int *) ADIOI_Malloc (naggs * sizeof(int));
 	    int numAggsForThisBridge = 0;
 

http://git.mpich.org/mpich.git/commitdiff/db4296b64b6ed1e7282cdb4db62aa2925a66031a

commit db4296b64b6ed1e7282cdb4db62aa2925a66031a
Author: Rob Latham <robl at mcs.anl.gov>
Date:   Thu Mar 27 16:24:01 2014 +0000

    Missed a call site when renamed this function

diff --git a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
index eae5563..494ea12 100644
--- a/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
+++ b/src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c
@@ -287,7 +287,7 @@ void ADIOI_GPFS_ReadStridedColl(ADIO_File fd, void *buf, int count,
 	if (inOrderAndNoGaps && buftype_is_contig) {
 	    /* if these conditions exist then execute the P2PContig code else
 	     * execute the original code */
-	    P2PContigReadAggregation(fd, buf,
+	    ADIOI_P2PContigReadAggregation(fd, buf,
 		    error_code, st_offsets, end_offsets, fd_start, fd_end);
 
 	    /* NOTE: we are skipping the rest of two-phase in this path */

-----------------------------------------------------------------------

Summary of changes:
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_close.c  |    1 +
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_open.c   |    3 +++
 src/mpi/romio/adio/ad_gpfs/ad_gpfs_rdcoll.c |    2 +-
 src/mpi/romio/adio/ad_gpfs/bg/ad_bg_aggrs.c |    2 --
 4 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
MPICH primary repository