[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.1-11-gd016c5c
Service Account
noreply at mpich.org
Thu Jun 12 16:03:56 CDT 2014
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 d016c5c5f396a0496a295310cd2cc8a9ffceca3a (commit)
from b88df6648432569f72a61b7dfa35c33799902708 (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/d016c5c5f396a0496a295310cd2cc8a9ffceca3a
commit d016c5c5f396a0496a295310cd2cc8a9ffceca3a
Author: Antonio J. Pena <apenya at mcs.anl.gov>
Date: Wed Jun 11 15:56:57 2014 -0500
Fixed unused variable compiler warnings in ROMIO
Signed-off-by: Rob Latham <robl at mcs.anl.gov>
diff --git a/src/mpi/romio/adio/common/ad_read.c b/src/mpi/romio/adio/common/ad_read.c
index 13d5986..83510ba 100644
--- a/src/mpi/romio/adio/common/ad_read.c
+++ b/src/mpi/romio/adio/common/ad_read.c
@@ -27,7 +27,9 @@ void ADIOI_GEN_ReadContig(ADIO_File fd, void *buf, int count,
ADIO_Offset len, bytes_xfered=0;
size_t rd_count;
static char myname[] = "ADIOI_GEN_READCONTIG";
+#ifdef ROMIO_GPFS
double io_time=0;
+#endif
char *p;
#ifdef AGGREGATION_PROFILE
@@ -36,8 +38,8 @@ void ADIOI_GEN_ReadContig(ADIO_File fd, void *buf, int count,
MPI_Type_size_x(datatype, &datatype_size);
len = datatype_size * (ADIO_Offset)count;
- io_time = MPI_Wtime();
#ifdef ROMIO_GPFS
+ io_time = MPI_Wtime();
if (gpfsmpio_timing) {
gpfsmpio_prof_cr[ GPFSMPIO_CIO_DATA_SIZE ] += len;
}
diff --git a/src/mpi/romio/adio/common/ad_write.c b/src/mpi/romio/adio/common/ad_write.c
index 72a9a53..6a79f59 100644
--- a/src/mpi/romio/adio/common/ad_write.c
+++ b/src/mpi/romio/adio/common/ad_write.c
@@ -29,7 +29,9 @@ void ADIOI_GEN_WriteContig(ADIO_File fd, const void *buf, int count,
ADIO_Offset len, bytes_xfered=0;
size_t wr_count;
static char myname[] = "ADIOI_GEN_WRITECONTIG";
+#ifdef ROMIO_GPFS
double io_time=0;
+#endif
char * p;
#ifdef AGGREGATION_PROFILE
@@ -39,8 +41,8 @@ void ADIOI_GEN_WriteContig(ADIO_File fd, const void *buf, int count,
MPI_Type_size_x(datatype, &datatype_size);
len = (ADIO_Offset)datatype_size * (ADIO_Offset)count;
- io_time = MPI_Wtime();
#ifdef ROMIO_GPFS
+ io_time = MPI_Wtime();
if (gpfsmpio_timing) {
gpfsmpio_prof_cw[ GPFSMPIO_CIO_DATA_SIZE ] += len;
}
diff --git a/src/mpi/romio/adio/common/p2p_aggregation.c b/src/mpi/romio/adio/common/p2p_aggregation.c
index 692de74..20caf8d 100644
--- a/src/mpi/romio/adio/common/p2p_aggregation.c
+++ b/src/mpi/romio/adio/common/p2p_aggregation.c
@@ -15,7 +15,9 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd,
*error_code = MPI_SUCCESS; // initialize to success
+#ifdef ROMIO_GPFS
double startTimeBase,endTimeBase;
+#endif
MPI_Status status;
pthread_t io_thread;
@@ -29,7 +31,9 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd,
int myAggRank = -1; // if I am an aggregor this is my index into fd->hints->ranklist
int iAmUsedAgg = 0;
+#ifdef ROMIO_GPFS
startTimeBase = MPI_Wtime();
+#endif
int naggs = fd->hints->cb_nodes;
int coll_bufsize = fd->hints->cb_buffer_size;
@@ -173,11 +177,11 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd,
int *dataSizeGottenThisRoundPerProc = (int *)ADIOI_Malloc(numSourceProcs * sizeof(int));
int *mpiRequestMapPerProc = (int *)ADIOI_Malloc(numSourceProcs * sizeof(int));
- endTimeBase = MPI_Wtime();
#ifdef ROMIO_GPFS
+ endTimeBase = MPI_Wtime();
gpfsmpio_prof_cw[GPFSMPIO_CIO_T_MYREQ] += (endTimeBase-startTimeBase);
-#endif
startTimeBase = MPI_Wtime();
+#endif
/* each iteration of this loop writes a coll_bufsize portion of the file
* domain */
@@ -200,7 +204,9 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd,
int irecv;
/* the source procs receive the amount of data the aggs want them to send */
+#ifdef ROMIO_GPFS
startTimeBase = MPI_Wtime();
+#endif
for (i=0;i<numTargetAggs;i++) {
MPI_Irecv(&amountOfDataReqestedByTargetAgg[i],1,
MPI_INT,targetAggsForMyData[i],0,
@@ -255,8 +261,8 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd,
#ifdef ROMIO_GPFS
gpfsmpio_prof_cw[GPFSMPIO_CIO_T_DEXCH_SETUP] += (endTimeBase-startTimeBase);
-#endif
startTimeBase = MPI_Wtime();
+#endif
// the aggs receive the data from the source procs
int numDataRecvToWaitFor = 0;
@@ -302,8 +308,8 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd,
}
- endTimeBase = MPI_Wtime();
#ifdef ROMIO_GPFS
+ endTimeBase = MPI_Wtime();
gpfsmpio_prof_cw[GPFSMPIO_CIO_T_DEXCH_NET] += (endTimeBase-startTimeBase);
#endif
// the aggs now write the data
@@ -358,8 +364,8 @@ void ADIOI_P2PContigWriteAggregation(ADIO_File fd,
} // for-loop roundIter
- endTimeBase=MPI_Wtime();
#ifdef ROMIO_GPFS
+ endTimeBase = MPI_Wtime();
gpfsmpio_prof_cw[GPFSMPIO_CIO_T_DEXCH] += (endTimeBase-startTimeBase);
#endif
@@ -407,14 +413,19 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd,
*error_code = MPI_SUCCESS; // initialize to success
+#ifdef ROMIO_GPFS
double startTimeBase,endTimeBase;
+#endif
MPI_Status status;
pthread_t io_thread;
void *thread_ret;
ADIOI_IO_ThreadFuncData io_thread_args;
+#ifdef ROMIO_GPFS
startTimeBase = MPI_Wtime();
+#endif
+
int nprocs,myrank;
MPI_Comm_size(fd->comm, &nprocs);
MPI_Comm_rank(fd->comm, &myrank);
@@ -569,8 +580,8 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd,
}
#endif
- endTimeBase = MPI_Wtime();
#ifdef ROMIO_GPFS
+ endTimeBase = MPI_Wtime();
gpfsmpio_prof_cw[GPFSMPIO_CIO_T_MYREQ] += (endTimeBase-startTimeBase);
#endif
@@ -601,7 +612,9 @@ void ADIOI_P2PContigReadAggregation(ADIO_File fd,
MPI_BYTE, ADIO_EXPLICIT_OFFSET, currentRoundFDStart,
&status, error_code);
+#ifdef ROMIO_GPFS
endTimeBase = MPI_Wtime();
+#endif
}
if (useIOBuffer) { // use the thread reader for the next round
-----------------------------------------------------------------------
Summary of changes:
src/mpi/romio/adio/common/ad_read.c | 4 +++-
src/mpi/romio/adio/common/ad_write.c | 4 +++-
src/mpi/romio/adio/common/p2p_aggregation.c | 25 +++++++++++++++++++------
3 files changed, 25 insertions(+), 8 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list