[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1-68-g58287a0
Service Account
noreply at mpich.org
Mon Mar 24 15:06:25 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 58287a002675b391b0b6381d043aca23a6dd9f29 (commit)
from 4b2433e9a1b27aa595f8f52c6d4c5c265d10714f (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/58287a002675b391b0b6381d043aca23a6dd9f29
commit 58287a002675b391b0b6381d043aca23a6dd9f29
Author: Michael Blocksome <blocksom at us.ibm.com>
Date: Wed Mar 19 14:18:45 2014 -0500
warning cleanup: pamid
powerpc64-bgq-linux-gcc v4.7.2
diff --git a/src/mpid/pamid/include/mpidi_macros.h b/src/mpid/pamid/include/mpidi_macros.h
index 144b0b6..2720149 100644
--- a/src/mpid/pamid/include/mpidi_macros.h
+++ b/src/mpid/pamid/include/mpidi_macros.h
@@ -77,6 +77,25 @@ _dt_contig_out, _data_sz_out, _dt_ptr, _dt_true_lb) \
} \
})
+/**
+ * \brief Gets data size of the datatype
+ */
+#define MPIDI_Datatype_get_data_size(_count, _datatype, \
+_data_sz_out) \
+({ \
+ if (HANDLE_GET_KIND(_datatype) == HANDLE_KIND_BUILTIN) \
+ { \
+ (_data_sz_out) = (_count) * \
+ MPID_Datatype_get_basic_size(_datatype); \
+ } \
+ else \
+ { \
+ MPID_Datatype *_dt_ptr; \
+ MPID_Datatype_get_ptr((_datatype), (_dt_ptr)); \
+ (_data_sz_out) = (_count) * (_dt_ptr)->size; \
+ } \
+})
+
/* Add some error checking for size eventually */
#define MPIDI_Update_last_algorithm(_comm, _name) \
({ strncpy( (_comm)->mpid.last_algorithm, (_name), strlen((_name))+1); })
diff --git a/src/mpid/pamid/include/mpidi_trace.h b/src/mpid/pamid/include/mpidi_trace.h
index bc21bb5..a921e68 100644
--- a/src/mpid/pamid/include/mpidi_trace.h
+++ b/src/mpid/pamid/include/mpidi_trace.h
@@ -252,15 +252,15 @@ MPIDI_Trace_buf_t *MPIDI_Trace_buf;
int recv_status;
int send_status;
int posted_recv;
-#define MPIDI_SET_PR_REC(rreq,buf,ct,dt,pami_id,rank,tag,comm,is_blk) 0
-#define MPIDI_GET_S_REC(dest,sreq,ctx,isSync,dataSize) 0
-#define TRACE_SET_S_BIT(dd,ii,mbr) 0
-#define TRACE_SET_R_BIT(dd,ii,mbr) 0
-#define TRACE_SET_S_VAL(dd,ii,mbr,val) 0
-#define TRACE_SET_R_VALX(dd,rr,mbr,val) 0
-#define TRACE_SET_R_VAL(dd,ii,mbr,val) 0
-#define TRACE_SET_REQ_VAL(ww,val1) 0
-#define TRACE_MEMSET_R(tt,nbr,str) 0
+#define MPIDI_SET_PR_REC(rreq,buf,ct,dt,pami_id,rank,tag,comm,is_blk)
+#define MPIDI_GET_S_REC(dest,sreq,ctx,isSync,dataSize)
+#define TRACE_SET_S_BIT(dd,ii,mbr)
+#define TRACE_SET_R_BIT(dd,ii,mbr)
+#define TRACE_SET_S_VAL(dd,ii,mbr,val)
+#define TRACE_SET_R_VALX(dd,rr,mbr,val)
+#define TRACE_SET_R_VAL(dd,ii,mbr,val)
+#define TRACE_SET_REQ_VAL(ww,val1)
+#define TRACE_MEMSET_R(tt,nbr,str)
#endif /* MPIDI_TRACE */
#endif /* include_mpidi_trace_h */
diff --git a/src/mpid/pamid/src/coll/allgather/mpido_allgather.c b/src/mpid/pamid/src/coll/allgather/mpido_allgather.c
index 517f20e..6f5e4e6 100644
--- a/src/mpid/pamid/src/coll/allgather/mpido_allgather.c
+++ b/src/mpid/pamid/src/coll/allgather/mpido_allgather.c
@@ -305,7 +305,7 @@ MPIDO_Allgather(const void *sendbuf,
MPID_Datatype * dt_null = NULL;
MPI_Aint send_true_lb = 0;
MPI_Aint recv_true_lb = 0;
- int rc, comm_size = comm_ptr->local_size;
+ int comm_size = comm_ptr->local_size;
size_t send_bytes = 0;
size_t recv_bytes = 0;
volatile unsigned allred_active = 1;
diff --git a/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c b/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c
index 1663f8f..0bc3d42 100644
--- a/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c
+++ b/src/mpid/pamid/src/coll/allgatherv/mpido_allgatherv.c
@@ -313,7 +313,6 @@ MPIDO_Allgatherv(const void *sendbuf,
size_t send_size = 0;
size_t recv_size = 0;
int config[6];
- double msize;
int scount=sendcount;
int i, rc, buffer_sum = 0;
@@ -423,7 +422,6 @@ MPIDO_Allgatherv(const void *sendbuf,
buffer_sum += recvcounts[size - 1];
buffer_sum *= recv_size;
- msize = (double)buffer_sum / (double)size;
/* disable with "safe allgatherv" env var */
if(mpid->preallreduces[MPID_ALLGATHERV_PREALLREDUCE])
diff --git a/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c b/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c
index 41e5759..5920817 100644
--- a/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c
+++ b/src/mpid/pamid/src/coll/allreduce/mpido_allreduce.c
@@ -176,10 +176,8 @@ int MPIDO_Allreduce(const void *sendbuf,
/* Check if the message range if restricted */
if(my_md->check_correct.values.rangeminmax)
{
- MPI_Aint data_true_lb;
- MPID_Datatype *data_ptr;
- int data_size, data_contig;
- MPIDI_Datatype_get_info(count, dt, data_contig, data_size, data_ptr, data_true_lb);
+ int data_size;
+ MPIDI_Datatype_get_data_size(count, dt, data_size);
if((my_md->range_lo <= data_size) &&
(my_md->range_hi >= data_size))
; /* ok, algorithm selected */
@@ -276,10 +274,8 @@ int MPIDO_Allreduce(const void *sendbuf,
/* Check if the message range if restricted */
if(my_md->check_correct.values.rangeminmax)
{
- MPI_Aint data_true_lb;
- MPID_Datatype *data_ptr;
- int data_size, data_contig;
- MPIDI_Datatype_get_info(count, dt, data_contig, data_size, data_ptr, data_true_lb);
+ int data_size;
+ MPIDI_Datatype_get_data_size(count, dt, data_size);
if((my_md->range_lo <= data_size) &&
(my_md->range_hi >= data_size))
; /* ok, algorithm selected */
@@ -341,10 +337,8 @@ int MPIDO_Allreduce(const void *sendbuf,
/* Check if the message range if restricted */
if(my_md->check_correct.values.rangeminmax)
{
- MPI_Aint data_true_lb;
- MPID_Datatype *data_ptr;
- int data_size, data_contig;
- MPIDI_Datatype_get_info(count, dt, data_contig, data_size, data_ptr, data_true_lb);
+ int data_size;
+ MPIDI_Datatype_get_data_size(count, dt, data_size);
if((my_md->range_lo <= data_size) &&
(my_md->range_hi >= data_size))
alg_selected = 1; /* query algorithm successfully selected */
@@ -427,7 +421,6 @@ int MPIDO_Allreduce_simple(const void *sendbuf,
volatile unsigned active = 1;
pami_xfer_t allred;
const pami_metadata_t *my_allred_md = (pami_metadata_t *)NULL;
- const int rank = comm_ptr->rank;
const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid);
MPID_Datatype *data_ptr;
MPI_Aint data_true_lb = 0;
diff --git a/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c b/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c
index 1e45d58..61644f5 100644
--- a/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c
+++ b/src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c
@@ -55,7 +55,8 @@ int MPIDO_Alltoall(const void *sendbuf,
pami_type_t stype, rtype;
MPI_Aint sdt_true_lb=0, rdt_true_lb;
MPIDI_Post_coll_t alltoall_post;
- int sndlen, rcvlen, snd_contig, rcv_contig, pamidt=1;
+ int snd_contig, rcv_contig, pamidt=1;
+ int sndlen ATTRIBUTE((unused)), rcvlen ATTRIBUTE((unused));
int tmp;
#if ASSERT_LEVEL==0
/* We can't afford the tracing in ndebug/performance libraries */
@@ -152,9 +153,9 @@ int MPIDO_Alltoall(const void *sendbuf,
result.check.unspecified = 1;
if(my_md->check_correct.values.rangeminmax)
{
- MPI_Aint data_true_lb;
+ MPI_Aint data_true_lb ATTRIBUTE((unused));
MPID_Datatype *data_ptr;
- int data_size, data_contig;
+ int data_size, data_contig ATTRIBUTE((unused));
MPIDI_Datatype_get_info(sendcount, sendtype, data_contig, data_size, data_ptr, data_true_lb);
if((my_md->range_lo <= data_size) &&
(my_md->range_hi >= data_size))
@@ -243,11 +244,9 @@ int MPIDO_Alltoall_simple(const void *sendbuf,
size_t recv_size = 0;
MPID_Segment segment;
MPID_Datatype *sdt, *rdt;
- pami_type_t stype = NULL, rtype;
MPI_Aint sdt_true_lb=0, rdt_true_lb;
MPIDI_Post_coll_t alltoall_post;
- int sndlen, rcvlen, snd_contig = 1, rcv_contig = 1, pamidt=1;
- int tmp;
+ int sndlen, rcvlen, snd_contig = 1, rcv_contig = 1;
const int rank = comm_ptr->rank;
const int size = comm_ptr->local_size;
#if ASSERT_LEVEL==0
@@ -331,12 +330,11 @@ int MPIDO_Alltoall_simple(const void *sendbuf,
pami_xfer_t alltoall;
+#ifdef TRACE_ON
const pami_metadata_t *my_alltoall_md;
my_alltoall_md = &mpid->coll_metadata[PAMI_XFER_ALLTOALL][0][0];
-
- char *pname = my_alltoall_md->name;
- TRACE_ERR("Using alltoall protocol %s\n", pname);
-
+ TRACE_ERR("Using alltoall protocol %s\n", my_alltoall_md->name);
+#endif
alltoall.cb_done = cb_alltoall;
alltoall.cookie = (void *)&active;
alltoall.algorithm = mpid->coll_algorithm[PAMI_XFER_ALLTOALL][0][0];
diff --git a/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c b/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c
index adf3157..9648dd2 100644
--- a/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c
+++ b/src/mpid/pamid/src/coll/alltoallv/mpido_alltoallv.c
@@ -60,7 +60,6 @@ int MPIDO_Alltoallv(const void *sendbuf,
pami_type_t stype, rtype;
MPI_Aint sdt_true_lb, rdt_true_lb;
MPIDI_Post_coll_t alltoallv_post;
- int pamidt = 1;
int tmp;
const int rank = comm_ptr->rank;
#if ASSERT_LEVEL==0
@@ -629,11 +628,7 @@ int MPIDO_Alltoallv_simple(const void *sendbuf,
pami_xfer_t alltoallv;
- const pami_metadata_t *my_alltoallv_md;
- my_alltoallv_md = &mpid->coll_metadata[PAMI_XFER_ALLTOALLV_INT][0][0];
-
alltoallv.algorithm = mpid->coll_algorithm[PAMI_XFER_ALLTOALLV_INT][0][0];
- char *pname = my_alltoallv_md->name;
alltoallv.cb_done = cb_alltoallv;
alltoallv.cookie = (void *)&active;
diff --git a/src/mpid/pamid/src/coll/bcast/mpido_bcast.c b/src/mpid/pamid/src/coll/bcast/mpido_bcast.c
index 0c2730e..1e995ff 100644
--- a/src/mpid/pamid/src/coll/bcast/mpido_bcast.c
+++ b/src/mpid/pamid/src/coll/bcast/mpido_bcast.c
@@ -193,7 +193,6 @@ int MPIDO_Bcast(void *buffer,
my_md->name, queryreq);
if(my_md->check_fn != NULL) /* calling the check fn is sufficient */
{
- metadata_result_t result = {0};
result = my_md->check_fn(&bcast);
result.check.nonlocal = 0; /* #warning REMOVE THIS WHEN IMPLEMENTED */
}
@@ -343,7 +342,6 @@ int MPIDO_Bcast_simple(void *buffer,
pami_xfer_t bcast;
const pami_metadata_t *my_bcast_md;
- int queryreq = 0;
bcast.cb_done = cb_bcast;
bcast.cookie = (void *)&active;
diff --git a/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c b/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c
index 07bd89a..836ccfe 100644
--- a/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c
+++ b/src/mpid/pamid/src/coll/bcast/mpido_ibcast.c
@@ -33,24 +33,6 @@ int MPIDO_Ibcast(void *buffer,
{
TRACE_ERR("in mpido_ibcast\n");
- const unsigned is_root_rank = (comm_ptr->rank == root);
- const unsigned user_selected_type =
- comm_ptr->mpid.user_selected_type[PAMI_XFER_BROADCAST];
-
- int data_size, data_contig;
- MPI_Aint data_true_lb = 0;
- MPID_Datatype *data_ptr;
-
- MPIDI_Datatype_get_info(count, datatype,
- data_contig, data_size, data_ptr, data_true_lb);
-
- /*
- * If the user has constructed some weird 0-length datatype but
- * count is not 0, or if the user forced a mpich bcast alogorith,
- * perform a mpich bcast.
- */
- /*if (unlikely((data_size == 0) || (user_selected_type == MPID_COLL_USE_MPICH)))*/
- {
/*
* If the mpich mpir non-blocking collectives are enabled, return without
* first constructing the MPID_Request. This signals to MPIR_Ibcast_impl
@@ -79,7 +61,6 @@ int MPIDO_Ibcast(void *buffer,
MPIDI_Request_complete_norelease_inline(mpid_request);
return rc;
- }
TRACE_ERR("leaving ibcast\n");
return 0;
diff --git a/src/mpid/pamid/src/coll/gather/mpido_gather.c b/src/mpid/pamid/src/coll/gather/mpido_gather.c
index 7e508d8..302cbe5 100644
--- a/src/mpid/pamid/src/coll/gather/mpido_gather.c
+++ b/src/mpid/pamid/src/coll/gather/mpido_gather.c
@@ -48,10 +48,11 @@ int MPIDO_Gather_reduce(void * sendbuf,
int *mpierrno)
{
MPID_Datatype * data_ptr;
- MPI_Aint true_lb;
+ MPI_Aint true_lb ATTRIBUTE((unused));
const int rank = comm_ptr->rank;
const int size = comm_ptr->local_size;
- int rc, sbytes, rbytes, contig;
+ int rc, sbytes, rbytes;
+ int contig ATTRIBUTE((unused));
char *tempbuf = NULL;
char *inplacetemp = NULL;
@@ -138,7 +139,7 @@ int MPIDO_Gather(const void *sendbuf,
}
#endif
MPID_Datatype * data_ptr;
- MPI_Aint true_lb = 0;
+ MPI_Aint true_lb ATTRIBUTE((unused));
pami_xfer_t gather;
MPIDI_Post_coll_t gather_post;
int use_opt = 1, contig=0, send_bytes=-1, recv_bytes = 0;
diff --git a/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c b/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c
index 0c2556a..7a07544 100644
--- a/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c
+++ b/src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c
@@ -50,8 +50,7 @@ int MPIDO_Gatherv(const void *sendbuf,
}
#endif
TRACE_ERR("Entering MPIDO_Gatherv\n");
- int rc;
- int contig, rsize=0, ssize=0;
+ int contig ATTRIBUTE((unused)), rsize ATTRIBUTE((unused)), ssize ATTRIBUTE((unused));
int pamidt = 1;
MPID_Datatype *dt_ptr = NULL;
MPI_Aint send_true_lb, recv_true_lb;
diff --git a/src/mpid/pamid/src/coll/reduce/mpido_reduce.c b/src/mpid/pamid/src/coll/reduce/mpido_reduce.c
index 9a0055e..d3ac54b 100644
--- a/src/mpid/pamid/src/coll/reduce/mpido_reduce.c
+++ b/src/mpid/pamid/src/coll/reduce/mpido_reduce.c
@@ -49,7 +49,7 @@ int MPIDO_Reduce(const void *sendbuf,
#endif
MPID_Datatype *dt_null = NULL;
MPI_Aint true_lb = 0;
- int dt_contig, tsize;
+ int dt_contig ATTRIBUTE((unused)), tsize;
int mu;
char *sbuf, *rbuf;
pami_data_function pop;
@@ -166,9 +166,9 @@ int MPIDO_Reduce(const void *sendbuf,
result.check.unspecified = 1;
if(my_md->check_correct.values.rangeminmax)
{
- MPI_Aint data_true_lb;
+ MPI_Aint data_true_lb ATTRIBUTE((unused));
MPID_Datatype *data_ptr;
- int data_size, data_contig;
+ int data_size, data_contig ATTRIBUTE((unused));
MPIDI_Datatype_get_info(count, datatype, data_contig, data_size, data_ptr, data_true_lb);
if((my_md->range_lo <= data_size) &&
(my_md->range_hi >= data_size))
@@ -269,7 +269,6 @@ int MPIDO_Reduce_simple(const void *sendbuf,
pami_data_function pop;
pami_type_t pdt;
int rc;
- int alg_selected = 0;
const int rank = comm_ptr->rank;
#if ASSERT_LEVEL==0
/* We can't afford the tracing in ndebug/performance libraries */
diff --git a/src/mpid/pamid/src/coll/scan/mpido_scan.c b/src/mpid/pamid/src/coll/scan/mpido_scan.c
index a6452dc..6f33c02 100644
--- a/src/mpid/pamid/src/coll/scan/mpido_scan.c
+++ b/src/mpid/pamid/src/coll/scan/mpido_scan.c
@@ -105,7 +105,7 @@ int MPIDO_Doscan(const void *sendbuf, void *recvbuf,
#endif
MPID_Datatype *dt_null = NULL;
MPI_Aint true_lb = 0;
- int dt_contig, tsize;
+ int dt_contig ATTRIBUTE((unused)), tsize ATTRIBUTE((unused));
int mu;
char *sbuf, *rbuf;
pami_data_function pop;
@@ -192,9 +192,9 @@ int MPIDO_Doscan(const void *sendbuf, void *recvbuf,
result.check.unspecified = 1;
if(my_md->check_correct.values.rangeminmax)
{
- MPI_Aint data_true_lb;
+ MPI_Aint data_true_lb ATTRIBUTE((unused));
MPID_Datatype *data_ptr;
- int data_size, data_contig;
+ int data_size ATTRIBUTE((unused)), data_contig ATTRIBUTE((unused));
MPIDI_Datatype_get_info(count, datatype, data_contig, data_size, data_ptr, data_true_lb);
if((my_md->range_lo <= data_size) &&
(my_md->range_hi >= data_size))
diff --git a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c
index b96dc92..b034064 100644
--- a/src/mpid/pamid/src/coll/scatter/mpido_scatter.c
+++ b/src/mpid/pamid/src/coll/scatter/mpido_scatter.c
@@ -44,32 +44,23 @@ int MPIDO_Scatter_bcast(void * sendbuf,
int *mpierrno)
{
/* Pretty simple - bcast a temp buffer and copy our little chunk out */
- int contig, nbytes, rc;
+ int nbytes, rc;
const int rank = comm_ptr->rank;
const int size = comm_ptr->local_size;
char *tempbuf = NULL;
- MPID_Datatype * dt_ptr;
- MPI_Aint true_lb = 0;
-
if(rank == root)
{
- MPIDI_Datatype_get_info(sendcount,
+ MPIDI_Datatype_get_data_size(sendcount,
sendtype,
- contig,
- nbytes,
- dt_ptr,
- true_lb);
+ nbytes);
tempbuf = sendbuf;
}
else
{
- MPIDI_Datatype_get_info(recvcount,
+ MPIDI_Datatype_get_data_size(recvcount,
recvtype,
- contig,
- nbytes,
- dt_ptr,
- true_lb);
+ nbytes);
tempbuf = MPIU_Malloc(nbytes * size);
if(!tempbuf)
@@ -116,8 +107,8 @@ int MPIDO_Scatter(const void *sendbuf,
}
#endif
MPID_Datatype * data_ptr;
- MPI_Aint true_lb = 0;
- int contig, nbytes = 0;
+ MPI_Aint true_lb ATTRIBUTE((unused));
+ int contig, nbytes ATTRIBUTE((unused));
const int rank = comm_ptr->rank;
int success = 1;
pami_type_t stype, rtype;
@@ -250,13 +241,11 @@ int MPIDO_Scatter(const void *sendbuf,
result.check.unspecified = 1;
if(my_md->check_correct.values.rangeminmax)
{
- MPI_Aint data_true_lb;
- MPID_Datatype *data_ptr;
- int data_size, data_contig;
+ int data_size;
if(rank == root)
- MPIDI_Datatype_get_info(sendcount, sendtype, data_contig, data_size, data_ptr, data_true_lb);
+ MPIDI_Datatype_get_data_size(sendcount, sendtype, data_size);
else
- MPIDI_Datatype_get_info(recvcount, recvtype, data_contig, data_size, data_ptr, data_true_lb);
+ MPIDI_Datatype_get_data_size(recvcount, recvtype, data_size);
if((my_md->range_lo <= data_size) &&
(my_md->range_hi >= data_size))
; /* ok, algorithm selected */
@@ -345,8 +334,6 @@ int MPIDO_Scatter_simple(const void *sendbuf,
size_t send_size = 0;
size_t recv_size = 0;
MPI_Aint snd_true_lb = 0, rcv_true_lb = 0;
- int tmp;
- int use_pami = 1;
MPID_Segment segment;
const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid);
const int size = comm_ptr->local_size;
@@ -477,12 +464,10 @@ int MPIDO_Scatter_simple(const void *sendbuf,
pami_xfer_t scatter;
MPIDI_Post_coll_t scatter_post;
- const pami_metadata_t *my_scatter_md;
volatile unsigned scatter_active = 1;
scatter.algorithm = mpid->coll_algorithm[PAMI_XFER_SCATTER][0][0];
- my_scatter_md = &mpid->coll_metadata[PAMI_XFER_SCATTER][0][0];
scatter.cb_done = cb_scatter;
scatter.cookie = (void *)&scatter_active;
diff --git a/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c b/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c
index ae0a0aa..b3767d0 100644
--- a/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c
+++ b/src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c
@@ -39,20 +39,15 @@ int MPIDO_Scatterv_bcast(void *sendbuf,
const int rank = comm_ptr->rank;
const int size = comm_ptr->local_size;
char *tempbuf;
- int i, sum = 0, dtsize, rc=0, contig;
- MPID_Datatype *dt_ptr;
- MPI_Aint dt_lb;
+ int i, sum = 0, dtsize, rc=0;
for (i = 0; i < size; i++)
if (sendcounts > 0)
sum += sendcounts[i];
- MPIDI_Datatype_get_info(1,
+ MPIDI_Datatype_get_data_size(1,
recvtype,
- contig,
- dtsize,
- dt_ptr,
- dt_lb);
+ dtsize);
if (rank != root)
{
@@ -101,21 +96,12 @@ int MPIDO_Scatterv_alltoallv(void * sendbuf,
int *sdispls, *scounts;
int *rdispls, *rcounts;
char *sbuf, *rbuf;
- int contig, rbytes, sbytes;
+ int rbytes;
int rc;
- MPID_Datatype *dt_ptr;
- MPI_Aint dt_lb=0;
-
- MPIDI_Datatype_get_info(recvcount,
+ MPIDI_Datatype_get_data_size(recvcount,
recvtype,
- contig,
- rbytes,
- dt_ptr,
- dt_lb);
-
- if(rank == root)
- MPIDI_Datatype_get_info(1, sendtype, contig, sbytes, dt_ptr, dt_lb);
+ rbytes);
rbuf = MPIU_Malloc(size * rbytes * sizeof(char));
if(!rbuf)
@@ -211,13 +197,6 @@ int MPIDO_Scatterv_alltoallv(void * sendbuf,
return rc;
}
-static void allred_cb_done(void *ctxt, void *clientdata, pami_result_t err)
-{
- unsigned *active = (unsigned *)clientdata;
- (*active)--;
-}
-
-
static void cb_scatterv(void *ctxt, void *clientdata, pami_result_t err)
{
unsigned *active = (unsigned *)clientdata;
@@ -243,14 +222,13 @@ int MPIDO_Scatterv(const void *sendbuf,
return -1;
}
#endif
- int contig, tmp, pamidt = 1;
- int ssize, rsize;
+ int tmp, pamidt = 1;
+ int contig ATTRIBUTE((unused));
+ int ssize ATTRIBUTE((unused));
+ int rsize ATTRIBUTE((unused));
MPID_Datatype *dt_ptr = NULL;
MPI_Aint send_true_lb=0, recv_true_lb;
char *sbuf, *rbuf;
- volatile unsigned allred_active = 1;
- pami_xfer_t allred;
- int optscatterv[3];
pami_type_t stype, rtype;
const int rank = comm_ptr->rank;
#if ASSERT_LEVEL==0
@@ -262,18 +240,6 @@ int MPIDO_Scatterv(const void *sendbuf,
const struct MPIDI_Comm* const mpid = &(comm_ptr->mpid);
const int selected_type = mpid->user_selected_type[PAMI_XFER_SCATTERV_INT];
- allred.cb_done = allred_cb_done;
- allred.cookie = (void *)&allred_active;
- allred.algorithm = mpid->coll_algorithm[PAMI_XFER_ALLREDUCE][0][0];
- allred.cmd.xfer_allreduce.sndbuf = (void *)optscatterv;
- allred.cmd.xfer_allreduce.stype = PAMI_TYPE_SIGNED_INT;
- allred.cmd.xfer_allreduce.rcvbuf = (void *)optscatterv;
- allred.cmd.xfer_allreduce.rtype = PAMI_TYPE_SIGNED_INT;
- allred.cmd.xfer_allreduce.stypecount = 3;
- allred.cmd.xfer_allreduce.rtypecount = 3;
- allred.cmd.xfer_allreduce.op = PAMI_DATA_BAND;
-
-
if(selected_type == MPID_COLL_USE_MPICH)
{
if(unlikely(verbose))
@@ -468,7 +434,6 @@ int MPIDO_Scatterv_simple(const void *sendbuf,
void *snd_noncontig_buff = NULL, *rcv_noncontig_buff = NULL;
void *sbuf = NULL, *rbuf = NULL;
int *sdispls = NULL, *scounts = NULL;
- int sndlen = 0;
int sndcount = 0;
MPID_Segment segment;
int tmp, i;
diff --git a/src/mpid/pamid/src/comm/mpid_comm.c b/src/mpid/pamid/src/comm/mpid_comm.c
index 8d46768..2d3d605 100644
--- a/src/mpid/pamid/src/comm/mpid_comm.c
+++ b/src/mpid/pamid/src/comm/mpid_comm.c
@@ -61,8 +61,6 @@ pami_result_t MPIDI_Comm_create_from_pami_geom(pami_geometry_range_t *task_slic
MPID_Comm *comm_ptr = NULL, *new_comm_ptr = NULL;
MPID_Group *group_ptr = NULL, *new_group_ptr = NULL;
int i = 0, j = 0;
- MPIR_Context_id_t new_context_id = 0;
- int *mapping = NULL;
/* Get comm_ptr for MPI_COMM_WORLD and get the group_ptr for it */
MPID_Comm_get_ptr( MPI_COMM_WORLD, comm_ptr );
diff --git a/src/mpid/pamid/src/mpid_improbe.c b/src/mpid/pamid/src/mpid_improbe.c
index ebac24c..dc101fa 100644
--- a/src/mpid/pamid/src/mpid_improbe.c
+++ b/src/mpid/pamid/src/mpid_improbe.c
@@ -9,9 +9,7 @@
int MPID_Improbe(int source, int tag, MPID_Comm *comm, int context_offset,
int *flag, MPID_Request **message, MPI_Status *status)
{
- int mpi_errno = MPI_SUCCESS;
const int context = comm->recvcontext_id + context_offset;
- int pami_source;
int foundp = FALSE;
MPID_Request * rreq = NULL;
@@ -25,14 +23,15 @@ int MPID_Improbe(int source, int tag, MPID_Comm *comm, int context_offset,
return MPI_SUCCESS;
}
+#ifndef OUT_OF_ORDER_HANDLING
+ rreq = MPIDI_Recvq_FDU(source, tag, context, &foundp);
+#else
+ int pami_source;
if(source != MPI_ANY_SOURCE) {
pami_source = MPID_VCR_GET_LPID(comm->vcr, source);
} else {
pami_source = MPI_ANY_SOURCE;
}
-#ifndef OUT_OF_ORDER_HANDLING
- rreq = MPIDI_Recvq_FDU(source, tag, context, &foundp);
-#else
rreq = MPIDI_Recvq_FDU(source, pami_source, tag, context, &foundp);
#endif
if (rreq==NULL) {
diff --git a/src/mpid/pamid/src/mpid_imrecv.c b/src/mpid/pamid/src/mpid_imrecv.c
index e2e35fe..68a011a 100644
--- a/src/mpid/pamid/src/mpid_imrecv.c
+++ b/src/mpid/pamid/src/mpid_imrecv.c
@@ -12,7 +12,6 @@ int MPID_Imrecv(void *buf, int count, MPI_Datatype datatype,
int mpi_errno = MPI_SUCCESS;
MPID_Request * rreq;
- int found;
/* ---------------------------------------- */
/* NULL rank means empty request */
diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c
index 51a8d57..2cd5b62 100644
--- a/src/mpid/pamid/src/mpid_init.c
+++ b/src/mpid/pamid/src/mpid_init.c
@@ -443,7 +443,7 @@ MPIDI_PAMI_client_init(int* rank, int* size, int* mpidi_dynamic_tasking, char **
char * env = getenv("PAMID_DISABLE_INTERNAL_EAGER_TASK_LIMIT");
if (env != NULL)
{
- size_t i, n = strlen(env);
+ size_t n = strlen(env);
char * tmp = (char *) MPIU_Malloc(n+1);
strncpy(tmp,env,n);
if (n>0) tmp[n]=0;
@@ -630,8 +630,10 @@ void MPIDI_Collsel_table_generate()
static void
MPIDI_PAMI_context_init(int* threading, int *size)
{
+#ifdef TRACE_ON
int requested_thread_level;
requested_thread_level = *threading;
+#endif
int numTasks;
#if (MPIU_THREAD_GRANULARITY == MPIU_THREAD_GRANULARITY_PER_OBJECT)
@@ -1066,8 +1068,8 @@ MPIDI_VCRT_init(int rank, int size, char *world_tasks, MPIDI_PG_t *pg)
{
int i, rc;
MPID_Comm * comm;
- int p, mpi_errno=0;
#ifdef DYNAMIC_TASKING
+ int p, mpi_errno=0;
char *world_tasks_save,*cp;
char *pg_id;
#endif
diff --git a/src/mpid/pamid/src/mpid_mprobe.c b/src/mpid/pamid/src/mpid_mprobe.c
index ec1a6fc..81e0690 100644
--- a/src/mpid/pamid/src/mpid_mprobe.c
+++ b/src/mpid/pamid/src/mpid_mprobe.c
@@ -9,9 +9,7 @@
int MPID_Mprobe(int source, int tag, MPID_Comm *comm, int context_offset,
MPID_Request **message, MPI_Status *status)
{
- int mpi_errno = MPI_SUCCESS;
const int context = comm->recvcontext_id + context_offset;
- int pami_source;
int foundp;
MPID_Request * rreq = NULL;
@@ -21,14 +19,15 @@ int MPID_Mprobe(int source, int tag, MPID_Comm *comm, int context_offset,
return MPI_SUCCESS;
}
+#ifndef OUT_OF_ORDER_HANDLING
+ MPID_PROGRESS_WAIT_WHILE((rreq=MPIDI_Recvq_FDU(source, tag, context, &foundp) ) == NULL );
+#else
+ int pami_source;
if(source != MPI_ANY_SOURCE) {
pami_source = MPID_VCR_GET_LPID(comm->vcr, source);
} else {
pami_source = MPI_ANY_SOURCE;
}
-#ifndef OUT_OF_ORDER_HANDLING
- MPID_PROGRESS_WAIT_WHILE((rreq=MPIDI_Recvq_FDU(source, tag, context, &foundp) ) == NULL );
-#else
MPID_PROGRESS_WAIT_WHILE((rreq=MPIDI_Recvq_FDU(source, pami_source, tag, context, &foundp) ) == NULL );
#endif
diff --git a/src/mpid/pamid/src/mpid_recvq.c b/src/mpid/pamid/src/mpid_recvq.c
index 7bbb213..b62d8f0 100644
--- a/src/mpid/pamid/src/mpid_recvq.c
+++ b/src/mpid/pamid/src/mpid_recvq.c
@@ -636,12 +636,12 @@ MPIDI_Recvq_FDPR(MPID_Request * req)
MPID_Request * cur_rreq = NULL;
MPID_Request * prev_rreq = NULL;
int found = FALSE;
- void * it;
#ifdef USE_STATISTICS
unsigned search_length = 0;
#endif
#ifdef QUEUE_BINARY_SEARCH_SUPPORT
+ void * it;
if(MPIDI_Process.queue_binary_search_support_on)
{
MPIDI_Recvq_find_in_post(MPIDI_Request_getMatchRank(req), MPIDI_Request_getMatchTag(req), MPIDI_Request_getMatchCtxt(req), &cur_rreq, &it);
@@ -823,7 +823,6 @@ MPIDI_Recvq_DumpQueues(int verbose)
return;
MPID_Request * rreq = MPIDI_Recvq.posted_head;
- MPID_Request * prev_rreq = NULL;
unsigned i=0, numposted=0, numue=0;
unsigned postedbytes=0, uebytes=0;
@@ -840,7 +839,6 @@ MPIDI_Recvq_DumpQueues(int verbose)
);
numposted++;
postedbytes+=rreq->mpid.userbufcount;
- prev_rreq = rreq;
rreq = rreq->mpid.next;
}
fprintf(stderr, "Posted Requests %d, Total Mem: %d bytes\n",
@@ -874,7 +872,6 @@ MPIDI_Recvq_DumpQueues(int verbose)
#endif
numue++;
uebytes+=rreq->mpid.uebuflen;
- prev_rreq = rreq;
rreq = rreq->mpid.next;
}
fprintf(stderr, "Unexpected Requests %d, Total Mem: %d bytes\n",
diff --git a/src/mpid/pamid/src/mpid_recvq.h b/src/mpid/pamid/src/mpid_recvq.h
index 9aa0d56..739bc7f 100644
--- a/src/mpid/pamid/src/mpid_recvq.h
+++ b/src/mpid/pamid/src/mpid_recvq.h
@@ -277,13 +277,13 @@ MPIDI_Recvq_FDP(size_t source, pami_task_t pami_source, int tag, int context_id,
{
MPID_Request * rreq;
MPID_Request * prev_rreq = NULL;
- void * it;
#ifdef USE_STATISTICS
unsigned search_length = 0;
#endif
TRACE_MEMSET_R(pami_source,msg_seqno,recv_status);
#ifdef QUEUE_BINARY_SEARCH_SUPPORT
+ void * it;
if(MPIDI_Process.queue_binary_search_support_on)
{
MPIDI_Recvq_find_in_post(source, tag, context_id, &rreq, &it);
diff --git a/src/mpid/pamid/src/mpid_vc.c b/src/mpid/pamid/src/mpid_vc.c
index 7a22133..454c360 100644
--- a/src/mpid/pamid/src/mpid_vc.c
+++ b/src/mpid/pamid/src/mpid_vc.c
@@ -95,12 +95,13 @@ int MPID_VCRT_Add_ref(MPID_VCRT vcrt)
int MPID_VCRT_Release(MPID_VCRT vcrt, int isDisconnect)
{
- int count, i, inuse;
+ int count, i;
MPIU_Object_release_ref(vcrt, &count);
if (count == 0) {
#ifdef DYNAMIC_TASKING
+ int inuse;
if(mpidi_dynamic_tasking) {
for (i = 0; i < vcrt->size; i++)
{
diff --git a/src/mpid/pamid/src/mpidi_env.c b/src/mpid/pamid/src/mpidi_env.c
index eb72939..34f3244 100644
--- a/src/mpid/pamid/src/mpidi_env.c
+++ b/src/mpid/pamid/src/mpidi_env.c
@@ -946,7 +946,6 @@ MPIDI_Env_setup(int rank, int requested)
/* Check for deprecated collectives environment variables. These variables are
* used in src/mpid/pamid/src/comm/mpid_selectcolls.c */
{
- unsigned tmp;
{
char* names[] = {"PAMID_COLLECTIVE_ALLGATHER", "PAMI_ALLGATHER", NULL};
ENV_Deprecated(names, 1, &found_deprecated_env_var, rank, 0);
diff --git a/src/mpid/pamid/src/mpidi_util.c b/src/mpid/pamid/src/mpidi_util.c
index 1c6cf3c..d6e3d84 100644
--- a/src/mpid/pamid/src/mpidi_util.c
+++ b/src/mpid/pamid/src/mpidi_util.c
@@ -1865,7 +1865,6 @@ static void MPIDI_collsel_print_params(advisor_params_t *params, char *output_fi
int MPIDI_collsel_pami_tune_parse_params(int argc, char ** argv)
{
- pami_configuration_t config;
MPIDI_Collsel_output_file = NULL;
num_tasks = PAMIX_Client_query(MPIDI_Client, PAMI_CLIENT_NUM_TASKS).value.intval;
task_id = PAMIX_Client_query(MPIDI_Client, PAMI_CLIENT_TASK_ID ).value.intval;
diff --git a/src/mpid/pamid/src/mpix/mpix.c b/src/mpid/pamid/src/mpix/mpix.c
index 88df322..fdb2d28 100644
--- a/src/mpid/pamid/src/mpix/mpix.c
+++ b/src/mpid/pamid/src/mpix/mpix.c
@@ -534,7 +534,6 @@ int MPIX_IO_node_id ()
int fd;
char* uci_str;
char buffer[4096];
- unsigned long uci;
fd = open("/dev/bgpers", O_RDONLY, 0);
assert(fd>=0);
@@ -556,14 +555,13 @@ int MPIX_IO_node_id ()
#define FCNAME MPIU_QUOTE(FUNCNAME)
int MPIX_IO_link_id ()
{
- int nA, nB, nC, nD, nE; /* Size of each torus dimension */
+ int nB, nC, nD, nE; /* Size of each torus dimension */
int brA, brB, brC, brD, brE; /* The bridge node's coordinates */
Personality_t personality;
Kernel_GetPersonality(&personality, sizeof(personality));
- nA = personality.Network_Config.Anodes;
nB = personality.Network_Config.Bnodes;
nC = personality.Network_Config.Cnodes;
nD = personality.Network_Config.Dnodes;
diff --git a/src/mpid/pamid/src/onesided/mpid_1s.c b/src/mpid/pamid/src/onesided/mpid_1s.c
index 6e64c3f..0f504ff 100644
--- a/src/mpid/pamid/src/onesided/mpid_1s.c
+++ b/src/mpid/pamid/src/onesided/mpid_1s.c
@@ -27,9 +27,7 @@ MPIDI_Win_DoneCB(pami_context_t context,
void * cookie,
pami_result_t result)
{
- int target_rank;
MPIDI_Win_request *req = (MPIDI_Win_request*)cookie;
- target_rank = req->target.rank;
++req->win->mpid.sync.complete;
++req->origin.completed;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c
index 4789b8b..6ee57d2 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c
@@ -38,9 +38,6 @@ MPIDI_WinAccumCB(pami_context_t context,
MPID_assert(msginfo_size == sizeof(MPIDI_Win_MsgInfo));
MPID_assert(_msginfo != NULL);
const MPIDI_Win_MsgInfo * msginfo = (const MPIDI_Win_MsgInfo*)_msginfo;
- const MPIDI_Win_request * req = (const MPIDI_Win_request*)(msginfo->req);
- char *tmpbuf;
- int mpi_errno, rc;
int null=0;
pami_type_t pami_type;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
index 4ce53d9..dea20d7 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c
@@ -41,13 +41,10 @@ extern int mpidi_dynamic_tasking;
int CheckRankOnNode(MPID_Comm * comm_ptr,int *onNode ) {
- int rank,comm_size,i;
+ int comm_size,i;
int mpi_errno=PAMI_SUCCESS;
-
- rank=comm_ptr->rank;
comm_size = comm_ptr->local_size;
- rank = comm_ptr->rank;
*onNode=1;
for (i=0; i< comm_size; i++) {
@@ -92,7 +89,6 @@ int GetPageSize(void *addr, ulong *pageSize)
char A3[50],A4[50];
int i=0;
char *t1,*t2;
- int len;
#ifndef REDHAT
char a='-';
char *search = &a;
@@ -132,7 +128,6 @@ int GetPageSize(void *addr, ulong *pageSize)
break;
}
if ((strlen(A2) == 4) && ((A2[0]=='r') || (A2[3]=='p'))) {
- len = strlen(A1);
#ifndef REDHAT
t1=strtok(A1,search);
#else
@@ -168,18 +163,15 @@ MPID_getSharedSegment(MPI_Aint size,
{
int mpi_errno = MPI_SUCCESS;
void **base_pp = base_ptr;
- int i, k, comm_size, rank;
+ int i, comm_size, rank;
uint32_t shm_key;
- int node_rank;
int shm_id;
- MPI_Aint *node_sizes;
MPI_Aint *tmp_buf;
int errflag = FALSE;
MPI_Aint pageSize,pageSize2, len,new_size;
char *cp;
MPID_Win *win;
int padSize;
- MPIDI_Win_info *winfo;
int shm_flag = IPC_CREAT | IPC_EXCL | S_IRUSR | S_IWUSR;
win = *win_ptr;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c b/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c
index 5a23e40..ebbe56e 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_compare_and_swap.c
@@ -25,18 +25,16 @@ extern pami_result_t
MPIDI_Atomic (pami_context_t context,
void * _req);
+#ifndef __BGQ__
static pami_result_t
MPIDI_Compare_and_swap_using_pami_rmw(pami_context_t context,
void * _req)
{
MPIDI_Win_request *req = (MPIDI_Win_request*)_req;
pami_result_t rc;
- void *map;
- MPID_Win *win;
int target_rank;
MPID_assert(req != NULL);
- win = req->win;
target_rank = req->target.rank;
pami_rmw_t params;
@@ -55,6 +53,7 @@ MPIDI_Compare_and_swap_using_pami_rmw(pami_context_t context,
MPID_assert(rc == PAMI_SUCCESS);
return rc;
}
+#endif
#undef FUNCNAME
#define FUNCNAME MPIDI_Compare_and_swap
@@ -66,8 +65,6 @@ int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr,
{
int mpi_errno = MPI_SUCCESS;
MPIDI_Win_request *req;
- int good_for_rmw=0;
- pami_type_t pami_type;
int shm_locked=0;
if(win->mpid.sync.origin_epoch_type == win->mpid.sync.target_epoch_type &&
@@ -187,9 +184,10 @@ int MPID_Compare_and_swap(const void *origin_addr, const void *compare_addr,
* better latency for one-sided operations.
*/
+#ifndef __BGQ__
MPI_Op null_op=0;
pami_data_function pami_op;
-#ifndef __BGQ__
+ pami_type_t pami_type;
if(MPIDI_Datatype_is_pami_rmw_supported(basic_type, &pami_type, null_op, &pami_op) ) {
req->pami_datatype = pami_type;
PAMI_Context_post(MPIDI_Context[0], &req->post_request, MPIDI_Compare_and_swap_using_pami_rmw, req);
diff --git a/src/mpid/pamid/src/onesided/mpid_win_create.c b/src/mpid/pamid/src/onesided/mpid_win_create.c
index e3d2b9d..7be9415 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_create.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_create.c
@@ -38,11 +38,8 @@ MPIDI_Win_init( MPI_Aint length,
int model)
{
int mpi_errno=MPI_SUCCESS;
- size_t length_out = 0;
- pami_result_t rc;
size_t rank, size;
MPIDI_Win_info *winfo;
- int i;
static char FCNAME[] = "MPIDI_Win_init";
/* ----------------------------------------- */
@@ -109,14 +106,11 @@ MPIDI_Win_allgather( MPI_Aint size, MPID_Win **win_ptr )
{
int mpi_errno = MPI_SUCCESS;
MPID_Win *win;
- int i, k, comm_size, rank;;
- MPI_Aint temp;
- int nErrors=0;
+ int rank;
MPID_Comm *comm_ptr;
size_t length_out = 0;
pami_result_t rc;
MPIDI_Win_info *winfo;
- pami_task_t task_id;
static char FCNAME[] = "MPIDI_Win_allgather";
win = *win_ptr;
@@ -190,12 +184,9 @@ MPID_Win_create(void * base,
MPID_Win ** win_ptr)
{
int mpi_errno = MPI_SUCCESS;
- int rc = MPI_SUCCESS,i;
- static char FCNAME[] = "MPID_Win_create";
+ int rc = MPI_SUCCESS;
MPID_Win *win;
- MPID_Win *sub_win;
- size_t rank,rk;
- pami_task_t taskid;
+ size_t rank;
MPIDI_Win_info *winfo;
rc=MPIDI_Win_init(size,disp_unit,win_ptr, info, comm_ptr, MPI_WIN_FLAVOR_CREATE, MPI_WIN_UNIFIED);
diff --git a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c
index 4a194b2..633a8c5 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_create_dynamic.c
@@ -44,10 +44,9 @@ MPID_Win_create_dynamic( MPID_Info * info,
{
int mpi_errno = MPI_SUCCESS;
int rc = MPI_SUCCESS;
- static char FCNAME[] = "MPID_Win_allocate_dynamic";
MPIDI_Win_info *winfo;
MPID_Win *win;
- int rank,i;
+ int rank;
rc=MPIDI_Win_init(0,1,win_ptr, info, comm_ptr, MPI_WIN_FLAVOR_DYNAMIC, MPI_WIN_UNIFIED);
win = *win_ptr;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c b/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c
index 7c64145..4a6e831 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_fetch_and_op.c
@@ -27,11 +27,9 @@ MPIDI_Fetch_and_op_using_pami_rmw(pami_context_t context,
{
MPIDI_Win_request *req = (MPIDI_Win_request*)_req;
pami_result_t rc;
- MPID_Win *win;
int target_rank;
MPID_assert(req != NULL);
- win = req->win;
target_rank = req->target.rank;
pami_rmw_t params;
@@ -106,7 +104,7 @@ MPIDI_WinAtomicCB(pami_context_t context,
.iov_base = NULL,
.iov_len = 0,
},
- .hints = 0,
+ .hints = {0},
};
pami_result_t rc = PAMI_Send_immediate(context, ¶ms);
@@ -173,7 +171,7 @@ MPIDI_Atomic (pami_context_t context,
.iov_base = NULL,
.iov_len = 0,
},
- .hints = 0,
+ .hints = {0},
};
rc = PAMI_Send_immediate(context, ¶ms);
@@ -191,7 +189,6 @@ int MPID_Fetch_and_op(const void *origin_addr, void *result_addr,
{
int mpi_errno = MPI_SUCCESS;
MPIDI_Win_request *req;
- int datatype_iscontig=0;
int good_for_rmw=0;
int count = 1;
int shm_locked = 0;
@@ -207,8 +204,6 @@ int MPID_Fetch_and_op(const void *origin_addr, void *result_addr,
return mpi_errno, "**rmasync");
}
- int null=0;
- MPI_Op null_op=0;
pami_type_t pami_type;
pami_atomic_t pami_op;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_get_info.c b/src/mpid/pamid/src/onesided/mpid_win_get_info.c
index 9d0abf9..08c4d03 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_get_info.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_get_info.c
@@ -62,7 +62,7 @@ int MPIDI_Win_get_info(MPID_Win *win, MPID_Info **info_used)
MPID_assert(mpi_errno == MPI_SUCCESS);
#undef BUFSIZE
}
- if (win->mpid.info_args.accumulate_ops == MPIDI_ACCU_OPS_SAME_OP)
+ if (win->mpid.info_args.accumulate_ops == (unsigned) MPIDI_ACCU_OPS_SAME_OP)
mpi_errno = MPIR_Info_set_impl(*info_used, "accumulate_ops", "same_op");
else
mpi_errno = MPIR_Info_set_impl(*info_used, "accumulate_ops", "same_op_no_op");
diff --git a/src/mpid/pamid/src/onesided/mpid_win_lock.c b/src/mpid/pamid/src/onesided/mpid_win_lock.c
index 5871ddc..e9b4d5b 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_lock.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_lock.c
@@ -177,7 +177,6 @@ MPID_Win_lock(int lock_type,
return mpi_errno, "**rmasync");
}
if (rank == MPI_PROC_NULL) goto fn_exit;
- struct MPIDI_Win_sync* sync = &win->mpid.sync;
MPIDI_WinLock_info info = {
.done = 0,
diff --git a/src/mpid/pamid/src/onesided/mpid_win_lock_all.c b/src/mpid/pamid/src/onesided/mpid_win_lock_all.c
index fcd5be0..1ab8657 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_lock_all.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_lock_all.c
@@ -46,13 +46,11 @@ static pami_result_t
MPIDI_WinUnlockAllReq_post(pami_context_t context,
void * _info)
{
- MPID_Win *win;
MPIDI_WinLock_info* info = (MPIDI_WinLock_info*)_info;
MPIDI_Win_control_t msg = {
.type = MPIDI_WIN_MSGTYPE_UNLOCKALL,
.flagAddr = info,
};
- win=info->win;
MPIDI_WinCtrlSend(context, &msg, info->peer, info->win);
return PAMI_SUCCESS;
}
diff --git a/src/mpid/pamid/src/onesided/mpid_win_reqops.c b/src/mpid/pamid/src/onesided/mpid_win_reqops.c
index b3e5516..15ac4e4 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_reqops.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_reqops.c
@@ -51,10 +51,6 @@ MPID_Rput(const void *origin_addr,
MPID_Request **request)
{
int mpi_errno = MPI_SUCCESS;
- MPID_Datatype *dtp;
- int dt_contig ATTRIBUTE((unused));
- MPI_Aint dt_true_lb ATTRIBUTE((unused));
- MPIDI_msg_sz_t data_sz;
if(win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_LOCK &&
win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_LOCK_ALL){
@@ -62,9 +58,6 @@ MPID_Rput(const void *origin_addr,
return mpi_errno, "**rmasync");
}
- MPIDI_Datatype_get_info(origin_count, origin_datatype,
- dt_contig, data_sz, dtp, dt_true_lb);
-
MPID_Request *rreq = MPIDI_Request_create2();
*request = rreq;
rreq->kind = MPID_WIN_REQUEST;
@@ -110,10 +103,6 @@ MPID_Rget(void *origin_addr,
MPID_Request **request)
{
int mpi_errno = MPI_SUCCESS;
- int dt_contig ATTRIBUTE((unused));
- MPID_Datatype *dtp;
- MPI_Aint dt_true_lb ATTRIBUTE((unused));
- MPIDI_msg_sz_t data_sz;
if(win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_LOCK &&
win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_LOCK_ALL){
@@ -121,9 +110,6 @@ MPID_Rget(void *origin_addr,
return mpi_errno, "**rmasync");
}
- MPIDI_Datatype_get_info(origin_count, origin_datatype,
- dt_contig, data_sz, dtp, dt_true_lb);
-
MPID_Request *rreq = MPIDI_Request_create2();
rreq->kind = MPID_WIN_REQUEST;
*request = rreq;
@@ -176,10 +162,6 @@ MPID_Raccumulate(const void *origin_addr,
MPID_Request **request)
{
int mpi_errno = MPI_SUCCESS;
- int dt_contig ATTRIBUTE((unused));
- MPID_Datatype *dtp;
- MPIDI_msg_sz_t data_sz;
- MPI_Aint dt_true_lb ATTRIBUTE((unused));
if(win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_LOCK &&
win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_LOCK_ALL){
@@ -187,9 +169,6 @@ MPID_Raccumulate(const void *origin_addr,
return mpi_errno, "**rmasync");
}
- MPIDI_Datatype_get_info(origin_count, origin_datatype,
- dt_contig, data_sz, dtp, dt_true_lb);
-
MPID_Request *rreq = MPIDI_Request_create2();
rreq->kind = MPID_WIN_REQUEST;
*request = rreq;
@@ -248,10 +227,6 @@ MPID_Rget_accumulate(const void *origin_addr,
{
int mpi_errno = MPI_SUCCESS;
- MPID_Datatype *dtp;
- int dt_contig ATTRIBUTE((unused));
- MPIDI_msg_sz_t data_sz;
- MPI_Aint dt_true_lb ATTRIBUTE((unused));
if(win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_LOCK &&
win->mpid.sync.origin_epoch_type != MPID_EPOTYPE_LOCK_ALL){
@@ -259,8 +234,6 @@ MPID_Rget_accumulate(const void *origin_addr,
return mpi_errno, "**rmasync");
}
- MPIDI_Datatype_get_info(origin_count, origin_datatype,
- dt_contig, data_sz, dtp, dt_true_lb);
MPID_Request *rreq = MPIDI_Request_create2();
rreq->kind = MPID_WIN_REQUEST;
*request = rreq;
diff --git a/src/mpid/pamid/src/onesided/mpid_win_set_info.c b/src/mpid/pamid/src/onesided/mpid_win_set_info.c
index 6719150..1566910 100644
--- a/src/mpid/pamid/src/onesided/mpid_win_set_info.c
+++ b/src/mpid/pamid/src/onesided/mpid_win_set_info.c
@@ -34,11 +34,9 @@ int MPIDI_Win_set_info(MPID_Win *win, MPID_Info *info)
{
int mpi_errno = MPI_SUCCESS;
- MPID_Info *curr_ptr, *prev_ptr;
- MPID_Info *c_ptr, *p_ptr;
+ MPID_Info *curr_ptr;
char *value, *token;
char *savePtr;
- prev_ptr = info;
curr_ptr = info->next;
uint save_ordering;
@@ -85,7 +83,6 @@ int MPIDI_Win_set_info(MPID_Win *win, MPID_Info *info)
if (!strcmp(curr_ptr->value,"same_op"))
win->mpid.info_args.accumulate_ops = MPIDI_ACCU_SAME_OP;
}
- prev_ptr = curr_ptr;
curr_ptr = curr_ptr->next;
}
-----------------------------------------------------------------------
Summary of changes:
src/mpid/pamid/include/mpidi_macros.h | 19 +++++++
src/mpid/pamid/include/mpidi_trace.h | 18 +++---
.../pamid/src/coll/allgather/mpido_allgather.c | 2 +-
.../pamid/src/coll/allgatherv/mpido_allgatherv.c | 2 -
.../pamid/src/coll/allreduce/mpido_allreduce.c | 19 ++-----
src/mpid/pamid/src/coll/alltoall/mpido_alltoall.c | 18 +++----
.../pamid/src/coll/alltoallv/mpido_alltoallv.c | 5 --
src/mpid/pamid/src/coll/bcast/mpido_bcast.c | 2 -
src/mpid/pamid/src/coll/bcast/mpido_ibcast.c | 19 -------
src/mpid/pamid/src/coll/gather/mpido_gather.c | 7 ++-
src/mpid/pamid/src/coll/gatherv/mpido_gatherv.c | 3 +-
src/mpid/pamid/src/coll/reduce/mpido_reduce.c | 7 +--
src/mpid/pamid/src/coll/scan/mpido_scan.c | 6 +-
src/mpid/pamid/src/coll/scatter/mpido_scatter.c | 35 ++++---------
src/mpid/pamid/src/coll/scatterv/mpido_scatterv.c | 55 ++++----------------
src/mpid/pamid/src/comm/mpid_comm.c | 2 -
src/mpid/pamid/src/mpid_improbe.c | 9 ++--
src/mpid/pamid/src/mpid_imrecv.c | 1 -
src/mpid/pamid/src/mpid_init.c | 6 ++-
src/mpid/pamid/src/mpid_mprobe.c | 9 ++--
src/mpid/pamid/src/mpid_recvq.c | 5 +--
src/mpid/pamid/src/mpid_recvq.h | 2 +-
src/mpid/pamid/src/mpid_vc.c | 3 +-
src/mpid/pamid/src/mpidi_env.c | 1 -
src/mpid/pamid/src/mpidi_util.c | 1 -
src/mpid/pamid/src/mpix/mpix.c | 4 +-
src/mpid/pamid/src/onesided/mpid_1s.c | 2 -
src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 3 -
.../pamid/src/onesided/mpid_win_allocate_shared.c | 12 +----
.../pamid/src/onesided/mpid_win_compare_and_swap.c | 10 ++--
src/mpid/pamid/src/onesided/mpid_win_create.c | 15 +----
.../pamid/src/onesided/mpid_win_create_dynamic.c | 3 +-
.../pamid/src/onesided/mpid_win_fetch_and_op.c | 9 +---
src/mpid/pamid/src/onesided/mpid_win_get_info.c | 2 +-
src/mpid/pamid/src/onesided/mpid_win_lock.c | 1 -
src/mpid/pamid/src/onesided/mpid_win_lock_all.c | 2 -
src/mpid/pamid/src/onesided/mpid_win_reqops.c | 27 ----------
src/mpid/pamid/src/onesided/mpid_win_set_info.c | 5 +--
38 files changed, 105 insertions(+), 246 deletions(-)
hooks/post-receive
--
MPICH primary repository
More information about the commits
mailing list