March 2014 - commits - mailman3.cels.anl.gov

[mpich] MPICH primary repository branch, master, updated. v3.1-70-g22c4940
by noreply＠mpich.org 24 Mar '14

24 Mar '14

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 22c4940aed5d4fedd24e4f7613f0929275ba5824 (commit) via 78177acc954f9cc944365ff3f4752348d01a8403 (commit) from 58287a002675b391b0b6381d043aca23a6dd9f29 (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/22c4940aed5d4fedd24e4f7613f092927… commit 22c4940aed5d4fedd24e4f7613f0929275ba5824 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Mar 14 09:11:41 2014 -0500 warning fix: provide proper prototype Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_tuning.h b/src/mpi/romio/adio/ad_bg/ad_bg_tuning.h index 98cca71..03703a0 100644 --- a/src/mpi/romio/adio/ad_bg/ad_bg_tuning.h +++ b/src/mpi/romio/adio/ad_bg/ad_bg_tuning.h @@ -77,7 +77,7 @@ extern int bgmpio_bg_nagg_pset; /* set internal variables for tuning environment variables */ -void ad_bg_get_env_vars(); +void ad_bg_get_env_vars(void); /* report timing breakdown for MPI I/O collective call */ void ad_bg_timing_crw_report( int rw, ADIO_File fd, int myrank, int nprocs ); http://git.mpich.org/mpich.git/commitdiff/78177acc954f9cc944365ff3f4752348d… commit 78177acc954f9cc944365ff3f4752348d01a8403 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Mar 14 09:11:09 2014 -0500 warning fix: shadowed declarations Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_read.c b/src/mpi/romio/adio/ad_bg/ad_bg_read.c index 225d459..32d0c6d 100644 --- a/src/mpi/romio/adio/ad_bg/ad_bg_read.c +++ b/src/mpi/romio/adio/ad_bg/ad_bg_read.c @@ -264,7 +264,6 @@ void ADIOI_BG_ReadStrided(ADIO_File fd, void *buf, int count, for (j=0; j<count; j++) { - int i; for (i=0; i<flat_buf->count; i++) { userbuf_off = (ADIO_Offset)j*(ADIO_Offset)buftype_extent + flat_buf->indices[i]; req_off = off; diff --git a/src/mpi/romio/adio/ad_bg/ad_bg_write.c b/src/mpi/romio/adio/ad_bg/ad_bg_write.c index 85ea670..4ffbab7 100644 --- a/src/mpi/romio/adio/ad_bg/ad_bg_write.c +++ b/src/mpi/romio/adio/ad_bg/ad_bg_write.c @@ -299,7 +299,6 @@ void ADIOI_BG_WriteStrided(ADIO_File fd, const void *buf, int count, for (j=0; j<count; j++) { - int i; for (i=0; i<flat_buf->count; i++) { userbuf_off = (ADIO_Offset)j*(ADIO_Offset)buftype_extent + flat_buf->indices[i]; req_off = off; @@ -366,7 +365,6 @@ void ADIOI_BG_WriteStrided(ADIO_File fd, const void *buf, int count, offset += disp + (ADIO_Offset)n_filetypes*filetype_extent; } else { - int i; n_etypes_in_filetype = filetype_size/etype_size; n_filetypes = offset / n_etypes_in_filetype; etype_in_filetype = offset % n_etypes_in_filetype; ----------------------------------------------------------------------- Summary of changes: src/mpi/romio/adio/ad_bg/ad_bg_read.c | 1 - src/mpi/romio/adio/ad_bg/ad_bg_tuning.h | 2 +- src/mpi/romio/adio/ad_bg/ad_bg_write.c | 2 -- 3 files changed, 1 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-68-g58287a0
by noreply＠mpich.org 24 Mar '14

24 Mar '14

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/58287a002675b391b0b6381d043aca23a… commit 58287a002675b391b0b6381d043aca23a6dd9f29 Author: Michael Blocksome <blocksom(a)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, &params); @@ -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, &params); @@ -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

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-67-g4b2433e
by noreply＠mpich.org 24 Mar '14

24 Mar '14

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 4b2433e9a1b27aa595f8f52c6d4c5c265d10714f (commit) via 11e961e66c0dfa362847dffef012293dbd27c412 (commit) via 8a87ad775770ee5c49d523f02309fd109318b730 (commit) via d4472888894365a1785805d43bdbde0e14cd4692 (commit) from f4a63c1bb1f90b122264cf37af08e13e3271dcde (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/4b2433e9a1b27aa595f8f52c6d4c5c265… commit 4b2433e9a1b27aa595f8f52c6d4c5c265d10714f Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Mar 14 08:42:04 2014 -0500 warning cleanup: non-void function explicit return Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_reqops.c b/src/mpid/pamid/src/onesided/mpid_win_reqops.c index a9350c2..b3e5516 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_reqops.c +++ b/src/mpid/pamid/src/onesided/mpid_win_reqops.c @@ -77,7 +77,7 @@ MPID_Rput(const void *origin_addr, target_disp, target_count, target_datatype, win); MPID_assert(mpi_errno == MPI_SUCCESS); - + return (mpi_errno); } @@ -135,6 +135,7 @@ MPID_Rget(void *origin_addr, target_disp, target_count, target_datatype, win); MPID_assert(mpi_errno == MPI_SUCCESS); + return(mpi_errno); } /** @@ -201,7 +202,7 @@ MPID_Raccumulate(const void *origin_addr, target_disp, target_count, target_datatype, op, win); MPID_assert(mpi_errno == MPI_SUCCESS); - + return(mpi_errno); } @@ -274,5 +275,6 @@ MPID_Rget_accumulate(const void *origin_addr, target_count, target_datatype, op, win); MPID_assert(mpi_errno == MPI_SUCCESS); + return (mpi_errno); } http://git.mpich.org/mpich.git/commitdiff/11e961e66c0dfa362847dffef012293db… commit 11e961e66c0dfa362847dffef012293dbd27c412 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Fri Mar 14 08:41:39 2014 -0500 warning fixup: clean up casting Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> 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 993d1a2..4ce53d9 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c @@ -285,7 +285,7 @@ MPID_getSharedSegment(MPI_Aint size, MPIU_ERR_CHKANDJUMP((shm_id == -1), mpi_errno, MPI_ERR_RMA_SHARED, "**rmashared"); win->mpid.shm->base_addr = (void *) shmat(shm_id,0,0); MPIU_ERR_CHKANDJUMP((win->mpid.shm->base_addr == NULL), mpi_errno,MPI_ERR_BUFFER, "**bufnull"); - GetPageSize((void *) win->mpid.shm->base_addr, &pageSize2); + GetPageSize((void *) win->mpid.shm->base_addr, (ulong*)&pageSize2); MPID_assert(pageSize == pageSize2); /* set mutex_lock address and initialize it */ win->mpid.shm->mutex_lock = (pthread_mutex_t *) win->mpid.shm->base_addr; @@ -399,7 +399,7 @@ MPID_Win_allocate_shared(MPI_Aint size, win->mpid.shm = MPIU_Malloc(sizeof(MPIDI_Win_shm_t)); win->mpid.shm->allocated=0; MPID_assert(win->mpid.shm != NULL); - MPID_getSharedSegment(size, disp_unit,comm_ptr,baseP, win_ptr,(ulong *)&pageSize,(int *)&noncontig); + MPID_getSharedSegment(size, disp_unit,comm_ptr,baseP, win_ptr,&pageSize,&noncontig); winfo = &win->mpid.info[rank]; winfo->win = win; http://git.mpich.org/mpich.git/commitdiff/8a87ad775770ee5c49d523f02309fd109… commit 8a87ad775770ee5c49d523f02309fd109318b730 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Thu Mar 13 21:57:21 2014 -0500 warning cleanup: clarify = and == in conditional Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> 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 d7dbc27..993d1a2 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c +++ b/src/mpid/pamid/src/onesided/mpid_win_allocate_shared.c @@ -72,7 +72,7 @@ int CheckSpaceType(MPID_Win **win_ptr, MPID_Info *info,int *noncontig) { char alloc_shared_nctg_value[MPI_MAX_INFO_VAL+1]; MPIR_Info_get_impl(info, "alloc_shared_noncontig", MPI_MAX_INFO_VAL, alloc_shared_nctg_value, &alloc_shared_nctg_flag); - if ((alloc_shared_nctg_flag == 1)) { + if (alloc_shared_nctg_flag == 1) { if (!strncmp(alloc_shared_nctg_value, "true", strlen("true"))) (*win_ptr)->mpid.info_args.alloc_shared_noncontig = 1; if (!strncmp(alloc_shared_nctg_value, "false", strlen("false"))) 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 5fdf67f..fcd5be0 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_lock_all.c +++ b/src/mpid/pamid/src/onesided/mpid_win_lock_all.c @@ -100,7 +100,7 @@ MPID_Win_lock_all(int assert, size = (MPIR_Comm_size(win->comm_ptr)); win->mpid.max_ctrlsends = MAX_NUM_CTRLSEND; nMask= win->mpid.max_ctrlsends - 1; - if (cp=getenv("MP_MAX_NUM_CTRLSEND")) { + if ( (cp=getenv("MP_MAX_NUM_CTRLSEND")) ) { win->mpid.max_ctrlsends = atoi(cp); } nMask=(win->mpid.max_ctrlsends - 1); http://git.mpich.org/mpich.git/commitdiff/d4472888894365a1785805d43bdbde0e1… commit d4472888894365a1785805d43bdbde0e14cd4692 Author: Rob Latham <robl(a)mcs.anl.gov> Date: Thu Mar 13 21:37:09 2014 -0500 introduce missing function prototypes Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/include/mpidimpl.h b/src/mpid/pamid/include/mpidimpl.h index c9c9f14..7f9e9ad 100644 --- a/src/mpid/pamid/include/mpidimpl.h +++ b/src/mpid/pamid/include/mpidimpl.h @@ -178,5 +178,7 @@ static inline pami_endpoint_t MPIDI_Task_to_endpoint(pami_task_t task, size_t of return ep; } - +int +MPIDI_Win_set_info(MPID_Win *win, + MPID_Info *info); #endif diff --git a/src/mpid/pamid/src/mpid_init.c b/src/mpid/pamid/src/mpid_init.c index f95dc0e..51a8d57 100644 --- a/src/mpid/pamid/src/mpid_init.c +++ b/src/mpid/pamid/src/mpid_init.c @@ -27,6 +27,8 @@ #include "mpidi_platform.h" #include "onesided/mpidi_onesided.h" +#include "mpidi_util.h" + #ifdef DYNAMIC_TASKING #define PAMIX_CLIENT_DYNAMIC_TASKING 1032 #define PAMIX_CLIENT_WORLD_TASKS 1033 diff --git a/src/mpid/pamid/src/mpidi_env.c b/src/mpid/pamid/src/mpidi_env.c index 873e926..eb72939 100644 --- a/src/mpid/pamid/src/mpidi_env.c +++ b/src/mpid/pamid/src/mpidi_env.c @@ -22,6 +22,8 @@ #include <mpidimpl.h> +#include "mpidi_util.h" + /** \page env_vars Environment Variables *************************************************************************** * Pt2Pt Options * diff --git a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c index e328d30..4789b8b 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_accumulate.c +++ b/src/mpid/pamid/src/onesided/mpid_win_accumulate.c @@ -20,6 +20,7 @@ * \brief ??? */ #include "mpidi_onesided.h" +#include "mpidi_util.h" void diff --git a/src/mpid/pamid/src/onesided/mpid_win_get.c b/src/mpid/pamid/src/onesided/mpid_win_get.c index ab341f7..f731e48 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get.c @@ -20,6 +20,7 @@ * \brief ??? */ #include "mpidi_onesided.h" +#include "mpidi_util.h" static inline int 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 88d083b..9d0abf9 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_get_info.c +++ b/src/mpid/pamid/src/onesided/mpid_win_get_info.c @@ -21,6 +21,7 @@ * associated with win. */ #include "mpidi_onesided.h" +#include "mpiinfo.h" /** * \brief MPI-PAMI glue for MPI_WIN_GET_INFO function diff --git a/src/mpid/pamid/src/onesided/mpid_win_put.c b/src/mpid/pamid/src/onesided/mpid_win_put.c index b98a99d..5c4a1ff 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_put.c +++ b/src/mpid/pamid/src/onesided/mpid_win_put.c @@ -20,6 +20,7 @@ * \brief ??? */ #include "mpidi_onesided.h" +#include "mpidi_util.h" static inline int diff --git a/src/mpid/pamid/src/onesided/mpidi_onesided.h b/src/mpid/pamid/src/onesided/mpidi_onesided.h index 85804b1..09af8b7 100644 --- a/src/mpid/pamid/src/onesided/mpidi_onesided.h +++ b/src/mpid/pamid/src/onesided/mpidi_onesided.h @@ -350,4 +350,20 @@ void MPIDI_WinLockReq_proc(pami_context_t context, const MPIDI_Win_control_t * info, unsigned peer); + +int +MPIDI_Datatype_is_pami_rmw_supported(MPI_Datatype datatype, + pami_type_t *pami_type, + MPI_Op op, + pami_atomic_t *pami_op); + +int +MPIDI_valid_group_rank(int lpid, + MPID_Group *grp); +void +MPIDI_WinLockAllAck_post(pami_context_t context, + unsigned peer, + MPID_Win * win); + + #endif ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/include/mpidimpl.h | 4 +++- src/mpid/pamid/src/mpid_init.c | 2 ++ src/mpid/pamid/src/mpidi_env.c | 2 ++ src/mpid/pamid/src/onesided/mpid_win_accumulate.c | 1 + .../pamid/src/onesided/mpid_win_allocate_shared.c | 6 +++--- src/mpid/pamid/src/onesided/mpid_win_get.c | 1 + src/mpid/pamid/src/onesided/mpid_win_get_info.c | 1 + src/mpid/pamid/src/onesided/mpid_win_lock_all.c | 2 +- src/mpid/pamid/src/onesided/mpid_win_put.c | 1 + src/mpid/pamid/src/onesided/mpid_win_reqops.c | 6 ++++-- src/mpid/pamid/src/onesided/mpidi_onesided.h | 16 ++++++++++++++++ 11 files changed, 35 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-63-gf4a63c1
by noreply＠mpich.org 24 Mar '14

24 Mar '14

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 f4a63c1bb1f90b122264cf37af08e13e3271dcde (commit) via 17821d558694e4f4e27882b9f21cdd0da0cf95e0 (commit) via 7d8aba5d2a3ea392fe1b6b05e86f266ed9627709 (commit) from 055abbd3fe7d0239611dd7f70c508a4a546c63aa (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/f4a63c1bb1f90b122264cf37af08e13e3… commit f4a63c1bb1f90b122264cf37af08e13e3271dcde Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Wed Mar 12 10:37:15 2014 -0500 add test for Op::Reduce_local Test the use of Reduce_local in C++. Use multiple built-in datatypes, as well as a derived vector. diff --git a/test/mpi/cxx/coll/Makefile.am b/test/mpi/cxx/coll/Makefile.am index 3a6f7cb..75a0fd8 100644 --- a/test/mpi/cxx/coll/Makefile.am +++ b/test/mpi/cxx/coll/Makefile.am @@ -14,6 +14,7 @@ noinst_PROGRAMS = \ uallredx \ uallreduce \ ureduce \ + ureducelocal \ uscan \ uexscan \ icbcastx \ @@ -35,6 +36,7 @@ arcomplex_SOURCES = arcomplex.cxx uallredx_SOURCES = uallredx.cxx uallreduce_SOURCES = uallreduce.cxx ureduce_SOURCES = ureduce.cxx +ureducelocal_SOURCES = ureducelocal.cxx uscan_SOURCES = uscan.cxx uexscan_SOURCES = uexscan.cxx icbcastx_SOURCES = icbcastx.cxx diff --git a/test/mpi/cxx/coll/testlist b/test/mpi/cxx/coll/testlist index 2c0b9e1..b4a1eaa 100644 --- a/test/mpi/cxx/coll/testlist +++ b/test/mpi/cxx/coll/testlist @@ -2,6 +2,7 @@ arcomplex 4 uallredx 5 uallreduce 5 ureduce 5 +ureducelocal 5 uscan 5 uexscan 5 alltoallw2x 10 diff --git a/test/mpi/cxx/coll/ureducelocal.cxx b/test/mpi/cxx/coll/ureducelocal.cxx new file mode 100644 index 0000000..97aaae8 --- /dev/null +++ b/test/mpi/cxx/coll/ureducelocal.cxx @@ -0,0 +1,128 @@ +/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil ; -*- */ +/* + * + * (C) 2003 by Argonne National Laboratory. + * See COPYRIGHT in top-level directory. + */ +#include "mpi.h" +#include "mpitestconf.h" +#ifdef HAVE_IOSTREAM +// Not all C++ compilers have iostream instead of iostream.h +#include <iostream> +#ifdef HAVE_NAMESPACE_STD +// Those that do often need the std namespace; otherwise, a bare "cout" +// is likely to fail to compile +using namespace std; +#endif +#else +#include <iostream.h> +#endif +#include "mpitestcxx.h" + +static MPI::Datatype my_datatype; +static int real_count; + +void uop(const void *invec, void *inoutvec, int count, const MPI::Datatype & datatype) +{ + int i; + + if (datatype == my_datatype) + count = real_count; + + for (i = 0; i < count; i++) { + if (datatype == MPI::INT) + ((int *)inoutvec)[i] = ((int *)invec)[i] + ((int *)inoutvec)[i]; + else if (datatype == MPI::DOUBLE || datatype == my_datatype) + ((double *)inoutvec)[i] = ((double *)invec)[i] + ((double *)inoutvec)[i]; + else + return; + } +} + +int main(int argc, char **argv) +{ + MPI::Op sumop; + MPI::Intracomm comm = MPI::COMM_WORLD; + int errs = 0; + int size, i, count, root, rank; + int *vin, *vout; + double *dvin, *dvout; + + MTest_Init(); + + sumop.Init(uop, true); + size = comm.Get_size(); + rank = comm.Get_rank(); + + for (count = 1; count < 66000; count = count * 2) { + /* MPI::INT */ + vin = new int[count]; + vout = new int[count]; + + for (root = 0; root < size; root++) { + for (i = 0; i < count; i++) { + vin[i] = i; + vout[i] = -1; + } + sumop.Reduce_local(vin, vout, count, MPI::INT); + for (i = 0; i < count; i++) { + if (vout[i] != i - 1) { + errs++; + if (errs < 10) + cerr << "vout[" << i << "] = " << vout[i] << endl; + } + } + } + delete[]vin; + delete[]vout; + + /* MPI::DOUBLE */ + dvin = new double[count]; + dvout = new double[count]; + for (root = 0; root < size; root++) { + for (i = 0; i < count; i++) { + dvin[i] = i; + dvout[i] = -1; + } + sumop.Reduce_local(dvin, dvout, count, MPI::DOUBLE); + for (i = 0; i < count; i++) { + if (dvout[i] != i - 1) { + errs++; + if (errs < 10) + cerr << "dvout[" << i << "] = " << dvout[i] << endl; + } + } + } + delete[]dvin; + delete[]dvout; + + /* A vector of MPI::DOUBLEs */ + dvin = new double[count]; + dvout = new double[count]; + my_datatype = MPI::DOUBLE.Create_vector(count/2, 1, 2); + my_datatype.Commit(); + real_count = count; + for (root = 0; root < size; root++) { + for (i = 0; i < count; i++) { + dvin[i] = i; + dvout[i] = -1; + } + sumop.Reduce_local(dvin, dvout, 1, my_datatype); + for (i = 0; i < count; i += 2) { + if (dvout[i] != i - 1) { + errs++; + if (errs < 10) + cerr << "dvout[" << i << "] = " << dvout[i] << endl; + } + } + } + delete[]dvin; + delete[]dvout; + my_datatype.Free(); + } + + sumop.Free(); + MTest_Finalize(errs); + MPI::Finalize(); + return 0; +} http://git.mpich.org/mpich.git/commitdiff/17821d558694e4f4e27882b9f21cdd0da… commit 17821d558694e4f4e27882b9f21cdd0da0cf95e0 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Fri Mar 21 08:52:29 2014 -0500 add missing consts to MPI::Op methods diff --git a/src/binding/cxx/cxxdecl3.dat b/src/binding/cxx/cxxdecl3.dat index 9a41931..4244bd7 100644 --- a/src/binding/cxx/cxxdecl3.dat +++ b/src/binding/cxx/cxxdecl3.dat @@ -248,7 +248,8 @@ dtype-Pack_size int (, ,in:constref:Comm ,return) const # op-Init requires special handling #op-Init void (,User_function* function ,in:bool ) op-Free void () -op-Reduce_local void (in:const, , ,in:constref:Datatype, ,) +op-Is_commutative () const +op-Reduce_local void (in:const, , ,in:constref:Datatype, ,) const #intra-Allreduce void (in:const , , ,in:constref:Datatype ,in:constref:Op ) const #intra-Reduce_scatter void (in:const , , ,in:constref:Datatype ,in:constref:Op ) const intra-Scan void (in:const , , ,in:constref:Datatype ,in:constref:Op ) const http://git.mpich.org/mpich.git/commitdiff/7d8aba5d2a3ea392fe1b6b05e86f266ed… commit 7d8aba5d2a3ea392fe1b6b05e86f266ed9627709 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Tue Mar 4 10:22:08 2014 -0600 Add const& to Datatype of MPI::Op::Reduce_local Fixes #2014 Signed-off-by: Ken Raffenetti <raffenet(a)mcs.anl.gov> diff --git a/src/binding/cxx/buildiface b/src/binding/cxx/buildiface index 7c1ff1b..53589da 100755 --- a/src/binding/cxx/buildiface +++ b/src/binding/cxx/buildiface @@ -521,7 +521,7 @@ $specialReturnType{"intra-Dup"} = "Intracomm"; ); %class_mpi2op = ( 'Is_commutative' => '2;bool', - 'Reduce_local' => '0', + 'Reduce_local' => '0:4', ); %class_mpi2preq = (); %class_mpi2req = (); diff --git a/src/binding/cxx/cxxdecl3.dat b/src/binding/cxx/cxxdecl3.dat index 9cbf2f9..9a41931 100644 --- a/src/binding/cxx/cxxdecl3.dat +++ b/src/binding/cxx/cxxdecl3.dat @@ -248,6 +248,7 @@ dtype-Pack_size int (, ,in:constref:Comm ,return) const # op-Init requires special handling #op-Init void (,User_function* function ,in:bool ) op-Free void () +op-Reduce_local void (in:const, , ,in:constref:Datatype, ,) #intra-Allreduce void (in:const , , ,in:constref:Datatype ,in:constref:Op ) const #intra-Reduce_scatter void (in:const , , ,in:constref:Datatype ,in:constref:Op ) const intra-Scan void (in:const , , ,in:constref:Datatype ,in:constref:Op ) const ----------------------------------------------------------------------- Summary of changes: src/binding/cxx/buildiface | 2 +- src/binding/cxx/cxxdecl3.dat | 2 + test/mpi/cxx/coll/Makefile.am | 2 + test/mpi/cxx/coll/testlist | 1 + test/mpi/cxx/coll/ureducelocal.cxx | 128 ++++++++++++++++++++++++++++++++++++ 5 files changed, 134 insertions(+), 1 deletions(-) create mode 100644 test/mpi/cxx/coll/ureducelocal.cxx hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-60-g055abbd
by noreply＠mpich.org 24 Mar '14

24 Mar '14

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 055abbd3fe7d0239611dd7f70c508a4a546c63aa (commit) from 1b0cd5fc5bce6bc9a0b6bde6d8779043b377fd34 (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/055abbd3fe7d0239611dd7f70c508a4a5… commit 055abbd3fe7d0239611dd7f70c508a4a546c63aa Author: Wesley Bland <wbland(a)mcs.anl.gov> Date: Wed Mar 19 16:13:59 2014 -0500 Remove the use of MPIDI_TAG_UB The constant MPIDI_TAG_UB is used in only one place at the moment, in the initialization of ch3 (source:src/mpid/ch3/src/mpid_init.c@4b35902a#L131). The problem is that the value which is being set (MPIR_Process.attrs.tag_ub) is set differently in pamid (INT_MAX). This leads to weird results when we set apart a bit in the tag space for failure propagation in non-blocking collectives (see #2008). Since this value isn't being referenced anywhere else, there doesn't seem to be a use for it and it's just leading to confusion. To avoid this, here we remove this value and just set MPIR_Process.attrs.tag_ub to INT_MAX in both ch3 and pamid. See #2009 Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/src/mpid/ch3/include/mpidpre.h b/src/mpid/ch3/include/mpidpre.h index 4dc4c6e..8ccbc1b 100644 --- a/src/mpid/ch3/include/mpidpre.h +++ b/src/mpid/ch3/include/mpidpre.h @@ -112,11 +112,6 @@ typedef union { MPIDI_Message_match_parts_t parts; MPIR_Upint whole; } MPIDI_Message_match; -/* NOTE-T1: We set MPIR_Process.attrs.tag_ub to this value during MPID_Init, but - * upper level code may then modify this value after MPID_Init and before the - * end of MPIR_Init_thread. Don't use this value directly, always check the - * runtime global value. */ -#define MPIDI_TAG_UB (0x7fffffff) /* Provides MPIDI_CH3_Pkt_t. Must come after MPIDI_Message_match definition. */ #include "mpidpkt.h" diff --git a/src/mpid/ch3/src/mpid_init.c b/src/mpid/ch3/src/mpid_init.c index e423751..43206bb 100644 --- a/src/mpid/ch3/src/mpid_init.c +++ b/src/mpid/ch3/src/mpid_init.c @@ -128,7 +128,7 @@ int MPID_Init(int *argc, char ***argv, int requested, int *provided, * Set global process attributes. These can be overridden by the channel * if necessary. */ - MPIR_Process.attrs.tag_ub = MPIDI_TAG_UB; /* see also mpidpre.h:NOTE-T1 */ + MPIR_Process.attrs.tag_ub = INT_MAX; MPIR_Process.attrs.io = MPI_ANY_SOURCE; /* ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/include/mpidpre.h | 5 ----- src/mpid/ch3/src/mpid_init.c | 2 +- 2 files changed, 1 insertions(+), 6 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-59-g1b0cd5f
by noreply＠mpich.org 22 Mar '14

22 Mar '14

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 1b0cd5fc5bce6bc9a0b6bde6d8779043b377fd34 (commit) from 134f47a235d546215f248dd936544a0b433aa123 (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/1b0cd5fc5bce6bc9a0b6bde6d8779043b… commit 1b0cd5fc5bce6bc9a0b6bde6d8779043b377fd34 Author: William Gropp <wgropp(a)illinois.edu> Date: Sat Mar 22 11:23:44 2014 -0500 Added summary.junit.xml to clean list make clean in test should remove all generated files. This file was not added to the clean list when it was added to the runlist output. diff --git a/test/mpi/Makefile.mtest b/test/mpi/Makefile.mtest index 5ac2226..f051b0f 100644 --- a/test/mpi/Makefile.mtest +++ b/test/mpi/Makefile.mtest @@ -31,4 +31,4 @@ testing: -mpiexec=${MPIEXEC} -xmlfile=summary.xml \ -tapfile=summary.tap -junitfile=summary.junit.xml -CLEANFILES = summary.xml summary.tap +CLEANFILES = summary.xml summary.tap summary.junit.xml ----------------------------------------------------------------------- Summary of changes: test/mpi/Makefile.mtest | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-58-g134f47a
by noreply＠mpich.org 21 Mar '14

21 Mar '14

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 134f47a235d546215f248dd936544a0b433aa123 (commit) from 32ab0609d378603af93418f12aac645da8af727e (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/134f47a235d546215f248dd936544a0b4… commit 134f47a235d546215f248dd936544a0b433aa123 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Mon Feb 24 21:39:51 2014 -0600 Rename Fortran binding directories. f77 and f90 were not consistent names with respect to what the code was providing. For example, "f90" also used code from "f77". This patch changes the naming to "mpif_h" and "use_mpi", which correspond to using the mpif.h and "use mpi module" conventions specified by the MPI standard. This also includes changes to buildiface, autogen.sh and .gitignore to work with these changes. Signed-off-by: Pavan Balaji <balaji(a)mcs.anl.gov> diff --git a/.gitignore b/.gitignore index 712b03a..6df55fc 100644 --- a/.gitignore +++ b/.gitignore @@ -144,8 +144,8 @@ Makefile.am-stamp # random stuff /maint/gcovmerge -/src/binding/f77/buildiface-stamp -/src/binding/f90/buildiface-stamp +/src/binding/fortran/mpif_h/buildiface-stamp +/src/binding/fortran/use_mpi/buildiface-stamp /src/binding/cxx/buildiface-stamp # script-generated f90 test files @@ -159,8 +159,8 @@ Makefile.am-stamp # random additions /README.envvar /maint/extracterrmsgs -/src/binding/f90/mpi_base.f90.in -/src/binding/f90/mpi_constants.f90.in +/src/binding/fortran/use_mpi/mpi_base.f90.in +/src/binding/fortran/use_mpi/mpi_constants.f90.in /src/env/mpixxx_opts.conf /src/mpi/romio/include/mpio.h /src/mpi/romio/include/mpiof.h @@ -186,11 +186,11 @@ Makefile.am-stamp /src/packaging/pkgconfig/mpich.pc # stamp "witness" files from the new build system -/src/binding/f90/buildiface.stamp -/src/binding/f90/mpi.mod-stamp -/src/binding/f90/mpi_base.mod-stamp -/src/binding/f90/mpi_constants.mod-stamp -/src/binding/f90/mpi_sizeofs.mod-stamp +/src/binding/fortran/use_mpi/buildiface.stamp +/src/binding/fortran/use_mpi/mpi.mod-stamp +/src/binding/fortran/use_mpi/mpi_base.mod-stamp +/src/binding/fortran/use_mpi/mpi_constants.mod-stamp +/src/binding/fortran/use_mpi/mpi_sizeofs.mod-stamp /src/mpe2/src/callstack/bin/bt2line @@ -221,8 +221,8 @@ Makefile.am-stamp /src/env/f77_shlib.conf /src/env/fc_shlib.conf /maint/Version -/src/binding/f77/Makefile.mk -/src/binding/f90/Makefile.mk +/src/binding/fortran/mpif_h/Makefile.mk +/src/binding/fortran/use_mpi/Makefile.mk # MPICH2 parameter handling /src/include/mpich_cvars.h @@ -403,37 +403,37 @@ Makefile.am-stamp /src/binding/cxx/cov2html /src/binding/cxx/*.h -# /src/binding/f77/ -/src/binding/f77/include -/src/binding/f77/Makefile.sm -/src/binding/f77/mpif_bottom.h -/src/binding/f77/setbotf.f -/src/binding/f77/setbot.c -/src/binding/f77/mpif77.conf -/src/binding/f77/mpif77 -/src/binding/f77/*.c -/src/binding/f77/fproto.h -/src/binding/f77/mpif.h -/src/binding/f77/mpif.h.in -/src/binding/f77/fprotos.h - -# /src/binding/f90/ -/src/binding/f90/mpi_base.f90.orig -/src/binding/f90/mpi_base.f90.new -/src/binding/f90/mpif.h -/src/binding/f90/Makefile.sm -/src/binding/f90/mpi.f90 -/src/binding/f90/mpi_t1.f90 -/src/binding/f90/mpimod.pcl -/src/binding/f90/mpi_sizeofs.f90 -/src/binding/f90/mpi_base.f90 -/src/binding/f90/mpif90model.h -/src/binding/f90/mpif90type.h -/src/binding/f90/mpi_constants.f90 -/src/binding/f90/typef90intf.c -/src/binding/f90/typef90realf.c -/src/binding/f90/typef90cmplxf.c -/src/binding/f90/mpifnoext.h +# /src/binding/fortran/mpif_h/ +/src/binding/fortran/mpif_h/include +/src/binding/fortran/mpif_h/Makefile.sm +/src/binding/fortran/mpif_h/mpif_bottom.h +/src/binding/fortran/mpif_h/setbotf.f +/src/binding/fortran/mpif_h/setbot.c +/src/binding/fortran/mpif_h/mpif77.conf +/src/binding/fortran/mpif_h/mpif77 +/src/binding/fortran/mpif_h/*.c +/src/binding/fortran/mpif_h/fproto.h +/src/binding/fortran/mpif_h/mpif.h +/src/binding/fortran/mpif_h/mpif.h.in +/src/binding/fortran/mpif_h/fprotos.h + +# /src/binding/fortran/use_mpi/ +/src/binding/fortran/use_mpi/mpi_base.f90.orig +/src/binding/fortran/use_mpi/mpi_base.f90.new +/src/binding/fortran/use_mpi/mpif.h +/src/binding/fortran/use_mpi/Makefile.sm +/src/binding/fortran/use_mpi/mpi.f90 +/src/binding/fortran/use_mpi/mpi_t1.f90 +/src/binding/fortran/use_mpi/mpimod.pcl +/src/binding/fortran/use_mpi/mpi_sizeofs.f90 +/src/binding/fortran/use_mpi/mpi_base.f90 +/src/binding/fortran/use_mpi/mpif90model.h +/src/binding/fortran/use_mpi/mpif90type.h +/src/binding/fortran/use_mpi/mpi_constants.f90 +/src/binding/fortran/use_mpi/typef90intf.c +/src/binding/fortran/use_mpi/typef90realf.c +/src/binding/fortran/use_mpi/typef90cmplxf.c +/src/binding/fortran/use_mpi/mpifnoext.h # /src/env/ /src/env/mpicc diff --git a/autogen.sh b/autogen.sh index 6b4c5e1..665f468 100755 --- a/autogen.sh +++ b/autogen.sh @@ -666,14 +666,14 @@ if [ $do_bindings = "yes" ] ; then build_f90=no build_cxx=no if [ $do_f77 = "yes" ] ; then - if [ ! -s src/binding/f77/abortf.c ] ; then + if [ ! -s src/binding/fortran/mpif_h/abortf.c ] ; then build_f77=yes - elif find src/binding/f77 -name 'buildiface' -newer 'src/binding/f77/abortf.c' >/dev/null 2>&1 ; then + elif find src/binding/fortran/mpif_h -name 'buildiface' -newer 'src/binding/fortran/mpif_h/abortf.c' >/dev/null 2>&1 ; then build_f77=yes fi - if [ ! -s src/binding/f90/mpi_base.f90 ] ; then + if [ ! -s src/binding/fortran/use_mpi/mpi_base.f90 ] ; then build_f90=yes - elif find src/binding/f90 -name 'buildiface' -newer 'src/binding/f90/mpi_base.f90' >/dev/null 2>&1 ; then + elif find src/binding/fortran/use_mpi -name 'buildiface' -newer 'src/binding/fortran/use_mpi/mpi_base.f90' >/dev/null 2>&1 ; then build_f90=yes fi @@ -681,16 +681,16 @@ if [ $do_bindings = "yes" ] ; then if [ $build_f77 = "yes" ] ; then echo_n "Building Fortran 77 interface... " - ( cd src/binding/f77 && chmod a+x ./buildiface && ./buildiface ) + ( cd src/binding/fortran/mpif_h && chmod a+x ./buildiface && ./buildiface ) echo "done" fi if [ $build_f90 = "yes" ] ; then echo_n "Building Fortran 90 interface... " # Remove any copy of mpi_base.f90 (this is used to handle the # Double precision vs. Real*8 option - rm -f src/binding/f90/mpi_base.f90.orig - ( cd src/binding/f90 && chmod a+x ./buildiface && ./buildiface ) - ( cd src/binding/f90 && ../f77/buildiface -infile=cf90t.h -deffile=cf90tdefs) + rm -f src/binding/fortran/use_mpi/mpi_base.f90.orig + ( cd src/binding/fortran/use_mpi && chmod a+x ./buildiface && ./buildiface ) + ( cd src/binding/fortran/use_mpi && ../mpif_h/buildiface -infile=cf90t.h -deffile=cf90tdefs) echo "done" fi diff --git a/configure.ac b/configure.ac index 6b1f14a..e086df1 100644 --- a/configure.ac +++ b/configure.ac @@ -2098,15 +2098,15 @@ dnl compilers without creating a separate version. dnl Note that this is run AFTER the AC_OUTPUT actions AC_OUTPUT_COMMANDS([if test "$enable_f77" = yes ; then if test "$has_exclaim" = "yes" ; then - sed -e 's/^C/\!/g' src/binding/f77/mpif.h > src/include/mpif.h - cp src/include/mpif.h src/binding/f77/mpif.h + sed -e 's/^C/\!/g' src/binding/fortran/mpif_h/mpif.h > src/include/mpif.h + cp src/include/mpif.h src/binding/fortran/mpif_h/mpif.h else - cp src/binding/f77/mpif.h src/include + cp src/binding/fortran/mpif_h/mpif.h src/include fi if test "$has_fort_real8" = "yes" ; then sed -e 's/DOUBLE PRECISION/REAL*8/g' src/include/mpif.h > src/include/mpif.h.new mv src/include/mpif.h.new src/include/mpif.h - cp src/include/mpif.h src/binding/f77/mpif.h + cp src/include/mpif.h src/binding/fortran/mpif_h/mpif.h fi fi], master_top_srcdir=$master_top_srcdir @@ -2123,7 +2123,7 @@ if test "$enable_fc" = "yes" ; then AC_MSG_WARN([Fortran 90 requires Fortran 77]) enable_fc=no else - bindingsubsystems="$bindingsubsystems src/binding/f90" + bindingsubsystems="$bindingsubsystems src/binding/fortran/use_mpi" bindings="$bindings f90" fi fi @@ -3075,7 +3075,7 @@ if test "$len_long_double" != 0 -a "$MPID_NO_LONG_DOUBLE" != yes ; then else MPI_LONG_DOUBLE=MPI_DATATYPE_NULL fi -# If you change MPI_BYTE, you must change it in src/binding/f77/buildiface +# If you change MPI_BYTE, you must change it in src/binding/fortran/mpif_h/buildiface MPI_BYTE="0x4c00010d" MPI_WCHAR="0x4c00${len_wchar_t}0e" MPI_PACKED="0x4c00010f" @@ -3907,7 +3907,7 @@ dnl len_doublecplx=$hexlen # interface (was error) # Check to see if the f77 binding has enabled the code to support # the case of int != fint. - if grep HAVE_FINT_IS_INT $master_top_srcdir/src/binding/f77/testf.c 2>&1 1>/dev/null ; then + if grep HAVE_FINT_IS_INT $master_top_srcdir/src/binding/fortran/mpif_h/testf.c 2>&1 1>/dev/null ; then AC_MSG_WARN([Fortran integers and C ints are not the same size. Support for this case is experimental; use at your own risk]) else AC_MSG_ERROR([Fortran integers and C ints are not the same size. The current Fortran binding does not support this case. Either force the Fortran compiler to use integers of $ac_cv_sizeof_int bytes, or use --disable-f77 on the configure line for MPICH.]) @@ -5786,7 +5786,7 @@ fi dnl FIXME XXX DJG does this need to actually be conditional on something? dnl previously it was conditional on the successful execution of -dnl "src/binding/f90/configure" but that would only fail if FC couldn't be +dnl "src/binding/fortran/use_mpi/configure" but that would only fail if FC couldn't be dnl determined or a bad VPATH build env was detected AC_DEFINE(HAVE_FC_TYPE_ROUTINES,1,[Define if Fortran 90 type routines available]) @@ -5907,7 +5907,7 @@ if test -z "$libbuild_dir" ; then fi if test -z "$modincbuild_dir" ; then # The include files may be in a different directory from the mpif.h file - modincbuild_dir=`pwd`/src/binding/f90 + modincbuild_dir=`pwd`/src/binding/fortran/use_mpi fi dnl @@ -6021,12 +6021,12 @@ AC_OUTPUT(Makefile \ src/include/glue_romio.h \ src/include/mpichtimer.h \ src/binding/cxx/mpicxx.h \ - src/binding/f77/mpif.h \ - src/binding/f77/setbotf.f \ - src/binding/f77/setbot.c \ - src/binding/f90/mpi_sizeofs.f90 \ - src/binding/f90/mpi_base.f90 \ - src/binding/f90/mpi_constants.f90 \ + src/binding/fortran/mpif_h/mpif.h \ + src/binding/fortran/mpif_h/setbotf.f \ + src/binding/fortran/mpif_h/setbot.c \ + src/binding/fortran/use_mpi/mpi_sizeofs.f90 \ + src/binding/fortran/use_mpi/mpi_base.f90 \ + src/binding/fortran/use_mpi/mpi_constants.f90 \ src/packaging/pkgconfig/mpich.pc \ src/packaging/envmods/mpich.module \ src/env/mpixxx_opts.conf \ diff --git a/src/binding/Makefile.mk b/src/binding/Makefile.mk index 94c4fa8..c102f9f 100644 --- a/src/binding/Makefile.mk +++ b/src/binding/Makefile.mk @@ -6,6 +6,6 @@ ## include $(top_srcdir)/src/binding/cxx/Makefile.mk -include $(top_srcdir)/src/binding/f77/Makefile.mk -include $(top_srcdir)/src/binding/f90/Makefile.mk +include $(top_srcdir)/src/binding/fortran/mpif_h/Makefile.mk +include $(top_srcdir)/src/binding/fortran/use_mpi/Makefile.mk diff --git a/src/binding/f77/buildiface b/src/binding/fortran/mpif_h/buildiface similarity index 99% rename from src/binding/f77/buildiface rename to src/binding/fortran/mpif_h/buildiface index ce278bc..024baca 100755 --- a/src/binding/f77/buildiface +++ b/src/binding/fortran/mpif_h/buildiface @@ -68,7 +68,7 @@ $do_logical = 1; $do_weak = 1; $do_subdecls = 1; $do_bufptr = 1; -$prototype_file = "../../include/mpi.h.in"; +$prototype_file = "../../../include/mpi.h.in"; # Global hashes used for definitions and to record the locations of the # defintions. @@ -946,11 +946,11 @@ if ($build_prototypes) { &ReadAndProcessInterface( $prototype_file, 0 ); # if doing MPI2, we also need to read the MPI-2 protottypes -if ( -s "../../mpi/romio/include/mpio.h.in" && $build_io) { +if ( -s "../../../mpi/romio/include/mpio.h.in" && $build_io) { %skipBlocks = ( 'HAVE_MPI_DARRAY_SUBARRAY' => 1, 'HAVE_MPI_INFO' => 1, 'MPICH' => 1 ); - &ReadAndProcessInterface( "../../mpi/romio/include/mpio.h.in", 1 ); + &ReadAndProcessInterface( "../../../mpi/romio/include/mpio.h.in", 1 ); %skipBlocks = (); } @@ -998,15 +998,15 @@ EOT print MAKEFD <<EOT; # ensure that the buildiface script ends up in the release tarball -EXTRA_DIST += src/binding/f77/buildiface +EXTRA_DIST += src/binding/fortran/mpif_h/buildiface # FIXME need to add proper rules to rebuild the fortran sources generated by # buildiface when buildiface is updated if MAINTAINER_MODE -\$(top_srcdir)/src/binding/f77/Makefile.mk: src/binding/f77/buildiface-stamp +\$(top_srcdir)/src/binding/fortran/mpif_h/Makefile.mk: src/binding/fortran/mpif_h/buildiface-stamp -src/binding/f77/buildiface-stamp: \$(top_srcdir)/src/binding/f77/buildiface \$(top_srcdir)/src/include/mpi.h.in - ( cd \$(top_srcdir)/src/binding/f77 && ./buildiface ) +src/binding/fortran/mpif_h/buildiface-stamp: \$(top_srcdir)/src/binding/fortran/mpif_h/buildiface \$(top_srcdir)/src/include/mpi.h.in + ( cd \$(top_srcdir)/src/binding/fortran/mpif_h && ./buildiface ) endif MAINTAINER_MODE mpi_f77_sources = @@ -1015,7 +1015,7 @@ EOT &print_line( MAKEFD, "mpi_f77_sources += ", 80, "\\\n\t", 8 ); for ($i=0; $i<=$#files; $i++) { $name = $files[$i]; - &print_line( MAKEFD, "src/binding/f77/$name ", 80, "\\\n\t", 8 ); + &print_line( MAKEFD, "src/binding/fortran/mpif_h/$name ", 80, "\\\n\t", 8 ); } &print_endline( MAKEFD ); @@ -1026,19 +1026,19 @@ EOT # clobber flags set by other parts of MPICH, and we don't want to re-add that # lib to the lib_LTLIBRARIES list #lib_LTLIBRARIES += lib/lib\@MPIFLIBNAME\@.la -#lib_lib\@MPIFLIBNAME\@_la_SOURCES = \$(mpi_f77_sources) src/binding/f77/setbot.c src/binding/f77/setbotf.f src/binding/f77/fdebug.c -#lib_lib\@MPIFLIBNAME\@_la_CPPFLAGS = -I\${master_top_srcdir}/src/binding/f77 -lib_lib\@MPILIBNAME\@_la_SOURCES += \$(mpi_f77_sources) src/binding/f77/fdebug.c +#lib_lib\@MPIFLIBNAME\@_la_SOURCES = \$(mpi_f77_sources) src/binding/fortran/mpif_h/setbot.c src/binding/fortran/mpif_h/setbotf.f src/binding/fortran/mpif_h/fdebug.c +#lib_lib\@MPIFLIBNAME\@_la_CPPFLAGS = -I\${master_top_srcdir}/src/binding/fortran/mpif_h +lib_lib\@MPILIBNAME\@_la_SOURCES += \$(mpi_f77_sources) src/binding/fortran/mpif_h/fdebug.c # these files are created by config.status from ".in" files -nodist_lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/f77/setbot.c src/binding/f77/setbotf.f +nodist_lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/fortran/mpif_h/setbot.c src/binding/fortran/mpif_h/setbotf.f # FIXME does AM_CPPFLAGS need to be included elsewhere somehow in the # target-specific variable? -AM_CPPFLAGS += -I\${master_top_srcdir}/src/binding/f77 +AM_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h -noinst_HEADERS += src/binding/f77/fproto.h src/binding/f77/mpi_fortimpl.h +noinst_HEADERS += src/binding/fortran/mpif_h/fproto.h src/binding/fortran/mpif_h/mpi_fortimpl.h if BUILD_PROFILING_LIB # FIXME tension here: PMPIFLIBNAME is always "pmpich", so we don't want to @@ -1046,17 +1046,17 @@ if BUILD_PROFILING_LIB # lib to the lib_LTLIBRARIES list #lib_LTLIBRARIES += lib/lib\@PMPIFLIBNAME\@.la #lib_lib\@PMPIFLIBNAME\@_la_SOURCES += \$(mpi_f77_sources) -#lib_lib\@PMPIFLIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/f77 +#lib_lib\@PMPIFLIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h lib_lib\@PMPILIBNAME\@_la_SOURCES += \$(mpi_f77_sources) -#lib_lib\@PMPILIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/f77 +#lib_lib\@PMPILIBNAME\@_la_CPPFLAGS += -I\${master_top_srcdir}/src/binding/fortran/mpif_h endif BUILD_PROFILING_LIB -# config.status copies src/binding/f77/mpif.h to src/include (see the relevant +# config.status copies src/binding/fortran/mpif_h/mpif.h to src/include (see the relevant # AC_OUTPUT_COMMANDS in configure.ac), so we need to delete it at distclean time # too. More work is needed in this Makefile.mk to keep src/include/mpif.h up to -# date w.r.t. the src/binding/f77 version. -DISTCLEANFILES += src/binding/f77/mpif.h src/include/mpif.h -nodist_include_HEADERS += src/binding/f77/mpif.h +# date w.r.t. the src/binding/fortran/mpif_h version. +DISTCLEANFILES += src/binding/fortran/mpif_h/mpif.h src/include/mpif.h +nodist_include_HEADERS += src/binding/fortran/mpif_h/mpif.h # FIXME disabled for now, need to re-enable it the "autotools way" ## Documentation sources @@ -3741,11 +3741,11 @@ sub print_special_decls { # and mpio.h.in (or other files) &ReadInterfaceForDefinitions( $prototype_file ); -if ( -s "../../mpi/romio/include/mpio.h.in" && $build_io) { +if ( -s "../../../mpi/romio/include/mpio.h.in" && $build_io) { %skipBlocks = ( 'HAVE_MPI_DARRAY_SUBARRAY' => 1, 'HAVE_MPI_INFO' => 1, 'MPICH' => 1 ); - &ReadInterfaceForDefinitions( "../../mpi/romio/include/mpio.h.in" ); + &ReadInterfaceForDefinitions( "../../../mpi/romio/include/mpio.h.in" ); %skipBlocks = (); } # diff --git a/src/binding/f77/fdebug.c b/src/binding/fortran/mpif_h/fdebug.c similarity index 100% rename from src/binding/f77/fdebug.c rename to src/binding/fortran/mpif_h/fdebug.c diff --git a/src/binding/f77/mpi_fortimpl.h b/src/binding/fortran/mpif_h/mpi_fortimpl.h similarity index 100% rename from src/binding/f77/mpi_fortimpl.h rename to src/binding/fortran/mpif_h/mpi_fortimpl.h diff --git a/src/binding/f77/mpichf.def b/src/binding/fortran/mpif_h/mpichf.def similarity index 100% rename from src/binding/f77/mpichf.def rename to src/binding/fortran/mpif_h/mpichf.def diff --git a/src/binding/f77/mpichff.vfproj b/src/binding/fortran/mpif_h/mpichff.vfproj similarity index 100% rename from src/binding/f77/mpichff.vfproj rename to src/binding/fortran/mpif_h/mpichff.vfproj diff --git a/src/binding/f77/mpichfg.def b/src/binding/fortran/mpif_h/mpichfg.def similarity index 100% rename from src/binding/f77/mpichfg.def rename to src/binding/fortran/mpif_h/mpichfg.def diff --git a/src/binding/f77/mpichfs.def b/src/binding/fortran/mpif_h/mpichfs.def similarity index 100% rename from src/binding/f77/mpichfs.def rename to src/binding/fortran/mpif_h/mpichfs.def diff --git a/src/binding/f77/setbot.c.in b/src/binding/fortran/mpif_h/setbot.c.in similarity index 100% rename from src/binding/f77/setbot.c.in rename to src/binding/fortran/mpif_h/setbot.c.in diff --git a/src/binding/f77/setbotf.f.in b/src/binding/fortran/mpif_h/setbotf.f.in similarity index 100% rename from src/binding/f77/setbotf.f.in rename to src/binding/fortran/mpif_h/setbotf.f.in diff --git a/src/binding/f90/binding.sub b/src/binding/fortran/use_mpi/binding.sub similarity index 100% rename from src/binding/f90/binding.sub rename to src/binding/fortran/use_mpi/binding.sub diff --git a/src/binding/f90/buildiface b/src/binding/fortran/use_mpi/buildiface similarity index 90% rename from src/binding/f90/buildiface rename to src/binding/fortran/use_mpi/buildiface index b1eb8b1..bfa3e78 100755 --- a/src/binding/f90/buildiface +++ b/src/binding/fortran/use_mpi/buildiface @@ -30,7 +30,7 @@ require "$mydir/binding.sub"; $arg_string = join( ' ', @ARGV ); $gDebug = 0; -$prototype_file = "../../include/mpi.h.in"; +$prototype_file = "../../../include/mpi.h.in"; $is_MPI = 1; $buildMPIX = 0; $routine_prefix = "MPI_"; @@ -673,7 +673,7 @@ $PRIVATEVAR = ""; # alignment restrictions may introduce padding in the structure # And one more problem: If a Fortran INTEGER is not the same as a C int, # then these are also wrong (see the "fint" option in -# src/binding/f77/buildiface +# src/binding/fortran/mpif_h/buildiface print MPIFD <<EOT; TYPE$BINDACCESS :: MPI_Status $BINDDEF @@ -897,19 +897,19 @@ print MAKEFD "FC_COMPILE_MODS = \$(LTFCCOMPILE)\n"; print MAKEFD <<EOT; # ensure that the buildiface script ends up in the release tarball -EXTRA_DIST += src/binding/f90/buildiface +EXTRA_DIST += src/binding/fortran/use_mpi/buildiface -# additional perl files that are "require"d by f90/buildiface and -# f77/buildiface, respectively -EXTRA_DIST += src/binding/f90/binding.sub src/binding/f90/cf90tdefs +# additional perl files that are "require"d by use_mpi/buildiface and +# mpif_h/buildiface, respectively +EXTRA_DIST += src/binding/fortran/use_mpi/binding.sub src/binding/fortran/use_mpi/cf90tdefs # FIXME need to add proper rules to rebuild the fortran sources generated by # buildiface when buildiface is updated if MAINTAINER_MODE -\$(top_srcdir)/src/binding/f90/Makefile.mk: src/binding/f90/buildiface-stamp +\$(top_srcdir)/src/binding/fortran/use_mpi/Makefile.mk: src/binding/fortran/use_mpi/buildiface-stamp -src/binding/f90/buildiface-stamp: \$(top_srcdir)/src/binding/f90/buildiface \$(top_srcdir)/src/include/mpi.h.in -\t( cd \$(top_srcdir)/src/binding/f90 && ./buildiface ) +src/binding/fortran/use_mpi/buildiface-stamp: \$(top_srcdir)/src/binding/fortran/use_mpi/buildiface \$(top_srcdir)/src/include/mpi.h.in +\t( cd \$(top_srcdir)/src/binding/fortran/use_mpi && ./buildiface ) endif MAINTAINER_MODE # variables for custom "silent-rules" for F90 modules @@ -922,7 +922,7 @@ if BUILD_F90_LIB # We need to tell some compilers (e.g., Solaris f90) to look for modules in the # current directory when the source file is not in the working directory (i.e., # in a VPATH build) -AM_FCFLAGS += \@FCINCFLAG\@src/binding/f90 +AM_FCFLAGS += \@FCINCFLAG\@src/binding/fortran/use_mpi lib_LTLIBRARIES += lib/lib\@FCWRAPNAME\@.la @@ -934,51 +934,51 @@ print MAKEFD <<EOT; # for inclusion in libpmpich.la on platforms that do not support weak symbols. # If shared libraries are enabled then the compilation space doubles again. mpi_f90_c_sources = \\ - src/binding/f90/create_f90_int.c \\ - src/binding/f90/create_f90_real.c \\ - src/binding/f90/create_f90_complex.c \\ - src/binding/f90/typef90cmplxf.c \\ - src/binding/f90/typef90realf.c \\ - src/binding/f90/typef90intf.c + src/binding/fortran/use_mpi/create_f90_int.c \\ + src/binding/fortran/use_mpi/create_f90_real.c \\ + src/binding/fortran/use_mpi/create_f90_complex.c \\ + src/binding/fortran/use_mpi/typef90cmplxf.c \\ + src/binding/fortran/use_mpi/typef90realf.c \\ + src/binding/fortran/use_mpi/typef90intf.c mpi_sources += \$(mpi_f90_c_sources) # utility code that has no PMPI equivalent -lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/f90/create_f90_util.c -AM_CPPFLAGS += -Isrc/binding/f90 +lib_lib\@MPILIBNAME\@_la_SOURCES += src/binding/fortran/use_mpi/create_f90_util.c +AM_CPPFLAGS += -Isrc/binding/fortran/use_mpi noinst_HEADERS += \\ - src/binding/f90/create_f90_util.h \\ - src/binding/f90/cf90t.h \\ - src/binding/f90/mpif90type.h \\ - src/binding/f90/mpifnoext.h + src/binding/fortran/use_mpi/create_f90_util.h \\ + src/binding/fortran/use_mpi/cf90t.h \\ + src/binding/fortran/use_mpi/mpif90type.h \\ + src/binding/fortran/use_mpi/mpifnoext.h nodist_noinst_HEADERS += \\ - src/binding/f90/mpif90model.h + src/binding/fortran/use_mpi/mpif90model.h # actual f90 code that also gets compiled into modules lib_lib\@FCWRAPNAME\@_la_LDFLAGS = \$(ABIVERSIONFLAGS) # cause any .\$(MOD) files to be output in the f90 bindings directory instead of # the current directory -AM_FCFLAGS += \$(FCMODOUTFLAG)src/binding/f90 +AM_FCFLAGS += \$(FCMODOUTFLAG)src/binding/fortran/use_mpi # we "manually" build the f90 sources and add them with LIBADD lib_lib\@FCWRAPNAME\@_la_SOURCES = lib_lib\@FCWRAPNAME\@_la_LIBADD = \\ - src/binding/f90/mpi.lo \\ - src/binding/f90/mpi_constants.lo \\ - src/binding/f90/mpi_sizeofs.lo \\ - src/binding/f90/${outfile_prefix}_base.lo + src/binding/fortran/use_mpi/mpi.lo \\ + src/binding/fortran/use_mpi/mpi_constants.lo \\ + src/binding/fortran/use_mpi/mpi_sizeofs.lo \\ + src/binding/fortran/use_mpi/${outfile_prefix}_base.lo # now force libtool FC rules/variables to be generated and cause FC linking to # be selected for lib/lib\@FCWRAPNAME\@.la EXTRA_lib_lib\@FCWRAPNAME\@_la_SOURCES = \\ - src/binding/f90/mpi.f90 \\ - src/binding/f90/mpi_constants.f90 + src/binding/fortran/use_mpi/mpi.f90 \\ + src/binding/fortran/use_mpi/mpi_constants.f90 nodist_EXTRA_lib_lib\@FCWRAPNAME\@_la_SOURCES = \\ - src/binding/f90/mpi_sizeofs.f90 \\ - src/binding/f90/${outfile_prefix}_base.f90 + src/binding/fortran/use_mpi/mpi_sizeofs.f90 \\ + src/binding/fortran/use_mpi/${outfile_prefix}_base.f90 EOT @@ -994,38 +994,38 @@ print MAKEFD <<EOT; EOT #print MAKEFD <<EOT; -#src/binding/f90/\$(MPIMOD).\$(MOD): src/binding/f90/\$(MPICONSTMOD).\$(MOD) src/binding/f90/\$(MPISIZEOFMOD).\$(MOD) \\ -#\t\t src/binding/f90/\$(MPIBASEMOD).\$(MOD) \$(srcdir)/src/binding/f90/mpi.f90 src/binding/f90/mpifnoext.h +#src/binding/fortran/use_mpi/\$(MPIMOD).\$(MOD): src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD) src/binding/fortran/use_mpi/\$(MPISIZEOFMOD).\$(MOD) \\ +#\t\t src/binding/fortran/use_mpi/\$(MPIBASEMOD).\$(MOD) \$(srcdir)/src/binding/fortran/use_mpi/mpi.f90 src/binding/fortran/use_mpi/mpifnoext.h #EOT #&createModSteps('mpi.f90', 1); -createModSteps('src/binding/f90/$(MPIMOD).$(MOD)', - join(' ', ('src/binding/f90/$(MPICONSTMOD).$(MOD)', - 'src/binding/f90/$(MPISIZEOFMOD).$(MOD)', - 'src/binding/f90/$(MPIBASEMOD).$(MOD)', - '$(srcdir)/src/binding/f90/mpi.f90', - 'src/binding/f90/mpifnoext.h') +createModSteps('src/binding/fortran/use_mpi/$(MPIMOD).$(MOD)', + join(' ', ('src/binding/fortran/use_mpi/$(MPICONSTMOD).$(MOD)', + 'src/binding/fortran/use_mpi/$(MPISIZEOFMOD).$(MOD)', + 'src/binding/fortran/use_mpi/$(MPIBASEMOD).$(MOD)', + '$(srcdir)/src/binding/fortran/use_mpi/mpi.f90', + 'src/binding/fortran/use_mpi/mpifnoext.h') ), 'mpi.f90', 1); -#print MAKEFD "src/binding/f90/\$(MPICONSTMOD).\$(MOD): \$(srcdir)/src/binding/f90/mpi_constants.f90 src/binding/f90/mpifnoext.h\n"; +#print MAKEFD "src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD): \$(srcdir)/src/binding/fortran/use_mpi/mpi_constants.f90 src/binding/fortran/use_mpi/mpifnoext.h\n"; #&createModSteps('mpi_constants.f90', 1); -createModSteps('src/binding/f90/$(MPICONSTMOD).$(MOD)', - 'src/binding/f90/mpi_constants.f90 src/binding/f90/mpifnoext.h', +createModSteps('src/binding/fortran/use_mpi/$(MPICONSTMOD).$(MOD)', + 'src/binding/fortran/use_mpi/mpi_constants.f90 src/binding/fortran/use_mpi/mpifnoext.h', 'mpi_constants.f90', 1); -#print MAKEFD "src/binding/f90/\$(MPISIZEOFMOD).\$(MOD): src/binding/f90/mpi_sizeofs.f90 src/binding/f90/mpifnoext.h\n"; +#print MAKEFD "src/binding/fortran/use_mpi/\$(MPISIZEOFMOD).\$(MOD): src/binding/fortran/use_mpi/mpi_sizeofs.f90 src/binding/fortran/use_mpi/mpifnoext.h\n"; #&createModSteps("mpi_sizeofs.f90", 0); -createModSteps('src/binding/f90/$(MPISIZEOFMOD).$(MOD)', - 'src/binding/f90/mpi_sizeofs.f90 src/binding/f90/mpifnoext.h', +createModSteps('src/binding/fortran/use_mpi/$(MPISIZEOFMOD).$(MOD)', + 'src/binding/fortran/use_mpi/mpi_sizeofs.f90 src/binding/fortran/use_mpi/mpifnoext.h', 'mpi_sizeofs.f90', 0); -#print MAKEFD "src/binding/f90/\$(MPIBASEMOD).\$(MOD): src/binding/f90/${outfile_prefix}_base.f90 src/binding/f90/\$(MPICONSTMOD).\$(MOD)\n"; +#print MAKEFD "src/binding/fortran/use_mpi/\$(MPIBASEMOD).\$(MOD): src/binding/fortran/use_mpi/${outfile_prefix}_base.f90 src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD)\n"; #&createModSteps("${outfile_prefix}_base.f90", 0); -createModSteps('src/binding/f90/$(MPIBASEMOD).$(MOD)', - "src/binding/f90/${outfile_prefix}_base.f90 src/binding/f90/\$(MPICONSTMOD).\$(MOD)", +createModSteps('src/binding/fortran/use_mpi/$(MPIBASEMOD).$(MOD)', + "src/binding/fortran/use_mpi/${outfile_prefix}_base.f90 src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD)", "${outfile_prefix}_base.f90", 0); @@ -1036,10 +1036,10 @@ createModSteps('src/binding/f90/$(MPIBASEMOD).$(MOD)', print MAKEFD <<EOT; mpi_f90_modules = \\ - src/binding/f90/\$(MPIMOD).\$(MOD) \\ - src/binding/f90/\$(MPISIZEOFMOD).\$(MOD) \\ - src/binding/f90/\$(MPICONSTMOD).\$(MOD) \\ - src/binding/f90/\$(MPIBASEMOD).\$(MOD) + src/binding/fortran/use_mpi/\$(MPIMOD).\$(MOD) \\ + src/binding/fortran/use_mpi/\$(MPISIZEOFMOD).\$(MOD) \\ + src/binding/fortran/use_mpi/\$(MPICONSTMOD).\$(MOD) \\ + src/binding/fortran/use_mpi/\$(MPIBASEMOD).\$(MOD) # the modules are effectively precompiled headers for Fortran programs modinc_HEADERS = \$(mpi_f90_modules) @@ -1049,14 +1049,14 @@ modinc_HEADERS = \$(mpi_f90_modules) # but leave MPI_WTIME_IS_GLOBAL). # Also allow REAL*8 or DOUBLE PRECISION for the MPI_WTIME/MPI_WTICK # declarations -src/binding/f90/mpifnoext.h: src/binding/f77/mpif.h +src/binding/fortran/use_mpi/mpifnoext.h: src/binding/fortran/mpif_h/mpif.h \trm -f \$@ \tsed -e 's/^C/\\!/g' -e '/EXTERNAL/d' \\ \t-e '/REAL\\*8/d' \\ \t-e '/DOUBLE PRECISION/d' \\ -\t-e '/MPI_WTICK/d' src/binding/f77/mpif.h > \$@ +\t-e '/MPI_WTICK/d' src/binding/fortran/mpif_h/mpif.h > \$@ -CLEANFILES += src/binding/f90/mpifnoext.h +CLEANFILES += src/binding/fortran/use_mpi/mpifnoext.h EOT @@ -1150,8 +1150,8 @@ sub createModSteps { $noext =~ s/\.f90$//; # filenames used by the make target - my $stamp = "src/binding/f90/${noext}.\$(MOD)-stamp"; - my $lockfile = "src/binding/f90/${noext}-lock"; + my $stamp = "src/binding/fortran/use_mpi/${noext}.\$(MOD)-stamp"; + my $lockfile = "src/binding/fortran/use_mpi/${noext}-lock"; # This code formerly supported the Intel Fortran Compiler's curious # "-cl,blah.pcl" argument in a fragile and complicated way. Since this @@ -1184,19 +1184,19 @@ sub createModSteps { print MAKEFD <<EOT; ${stamp}: ${deps} -\t\@rm -f src/binding/f90/${noext}-tmp -\t\@touch src/binding/f90/${noext}-tmp +\t\@rm -f src/binding/fortran/use_mpi/${noext}-tmp +\t\@touch src/binding/fortran/use_mpi/${noext}-tmp EOT if ($use_srcdir) { print MAKEFD <<EOT; -\t\@( cd src/binding/f90 && \\ +\t\@( cd src/binding/fortran/use_mpi && \\ \t if [ \"\$(FCEXT)\" != \"f90\" ] || [ ! -f $srcFileWithExt ] ; then \\ \t rm -f $srcFileWithExt ; \\ -\t \$(LN_S) \$(abs_top_srcdir)/src/binding/f90/$srcFile $srcFileWithExt ; \\ +\t \$(LN_S) \$(abs_top_srcdir)/src/binding/fortran/use_mpi/$srcFile $srcFileWithExt ; \\ \t fi ) -\t\$(mod_verbose)\$(FC_COMPILE_MODS) -c src/binding/f90/$srcFileWithExt -o src/binding/f90/$loFile -\t\@( cd src/binding/f90 && \\ +\t\$(mod_verbose)\$(FC_COMPILE_MODS) -c src/binding/fortran/use_mpi/$srcFileWithExt -o src/binding/fortran/use_mpi/$loFile +\t\@( cd src/binding/fortran/use_mpi && \\ \t if [ \"\$(FCEXT)\" != \"f90\" ] || [ ! -f $srcFileWithExt ] ; then \\ \t rm -f $srcFileWithExt ; \\ \t fi ) @@ -1204,13 +1204,13 @@ EOT } else { print MAKEFD <<EOT; -\t\@( cd src/binding/f90 && \\ +\t\@( cd src/binding/fortran/use_mpi && \\ \t if [ \"\$(FCEXT)\" != \"f90\" ] ; then \\ \t rm -f $srcFileWithExt ; \\ \t \$(LN_S) $srcFile $srcFileWithExt ; \\ \t fi ) -\t\$(mod_verbose)\$(FC_COMPILE_MODS) -c src/binding/f90/$srcFileWithExt -o src/binding/f90/$loFile -\t\@( cd src/binding/f90 && \\ +\t\$(mod_verbose)\$(FC_COMPILE_MODS) -c src/binding/fortran/use_mpi/$srcFileWithExt -o src/binding/fortran/use_mpi/$loFile +\t\@( cd src/binding/fortran/use_mpi && \\ \t if [ \"\$(FCEXT)\" != \"f90\" ] ; then \\ \t rm -f $srcFileWithExt ; \\ \t fi ) @@ -1218,9 +1218,9 @@ EOT } print MAKEFD <<EOT; -\t\@mv src/binding/f90/${noext}-tmp ${stamp} +\t\@mv src/binding/fortran/use_mpi/${noext}-tmp ${stamp} -src/binding/f90/${loFile} ${module}: ${stamp} +src/binding/fortran/use_mpi/${loFile} ${module}: ${stamp} ## Recover from the removal of \$\@ \t\@if test -f \$\@; then :; else \\ \t trap 'rm -rf ${lockfile} ${stamp}' 1 2 13 15; \\ @@ -1238,7 +1238,7 @@ src/binding/f90/${loFile} ${module}: ${stamp} \t fi; \\ \tfi -CLEANFILES += ${stamp} ${module} src/binding/f90/${loFile} src/binding/f90/${noext}-tmp +CLEANFILES += ${stamp} ${module} src/binding/fortran/use_mpi/${loFile} src/binding/fortran/use_mpi/${noext}-tmp EOT diff --git a/src/binding/f90/cf90t.h b/src/binding/fortran/use_mpi/cf90t.h similarity index 100% rename from src/binding/f90/cf90t.h rename to src/binding/fortran/use_mpi/cf90t.h diff --git a/src/binding/f90/cf90tdefs b/src/binding/fortran/use_mpi/cf90tdefs similarity index 87% rename from src/binding/f90/cf90tdefs rename to src/binding/fortran/use_mpi/cf90tdefs index d9f2fbb..820ab30 100644 --- a/src/binding/f90/cf90tdefs +++ b/src/binding/fortran/use_mpi/cf90tdefs @@ -6,7 +6,7 @@ $build_io = 0; # But we do need the the weak and profiling support $do_weak = 1; $do_profiling = 1; -$header_file = "../f77/mpi_fortimpl.h"; +$header_file = "../mpif_h/mpi_fortimpl.h"; $build_prototypes = 1; $prototype_header_file = "mpif90type.h"; #$debug = 1; diff --git a/src/binding/f90/create_f90_complex.c b/src/binding/fortran/use_mpi/create_f90_complex.c similarity index 100% rename from src/binding/f90/create_f90_complex.c rename to src/binding/fortran/use_mpi/create_f90_complex.c diff --git a/src/binding/f90/create_f90_int.c b/src/binding/fortran/use_mpi/create_f90_int.c similarity index 100% rename from src/binding/f90/create_f90_int.c rename to src/binding/fortran/use_mpi/create_f90_int.c diff --git a/src/binding/f90/create_f90_real.c b/src/binding/fortran/use_mpi/create_f90_real.c similarity index 100% rename from src/binding/f90/create_f90_real.c rename to src/binding/fortran/use_mpi/create_f90_real.c diff --git a/src/binding/f90/create_f90_util.c b/src/binding/fortran/use_mpi/create_f90_util.c similarity index 100% rename from src/binding/f90/create_f90_util.c rename to src/binding/fortran/use_mpi/create_f90_util.c diff --git a/src/binding/f90/create_f90_util.h b/src/binding/fortran/use_mpi/create_f90_util.h similarity index 100% rename from src/binding/f90/create_f90_util.h rename to src/binding/fortran/use_mpi/create_f90_util.h diff --git a/src/binding/f90/manf90.txt b/src/binding/fortran/use_mpi/manf90.txt similarity index 100% rename from src/binding/f90/manf90.txt rename to src/binding/fortran/use_mpi/manf90.txt diff --git a/src/binding/f90/mpi_sizeofs.f90.in b/src/binding/fortran/use_mpi/mpi_sizeofs.f90.in similarity index 100% rename from src/binding/f90/mpi_sizeofs.f90.in rename to src/binding/fortran/use_mpi/mpi_sizeofs.f90.in diff --git a/src/binding/f90/mpif90.vfproj b/src/binding/fortran/use_mpi/mpif90.vfproj similarity index 100% rename from src/binding/f90/mpif90.vfproj rename to src/binding/fortran/use_mpi/mpif90.vfproj diff --git a/src/binding/f90/mpif90model.h.in b/src/binding/fortran/use_mpi/mpif90model.h.in similarity index 100% rename from src/binding/f90/mpif90model.h.in rename to src/binding/fortran/use_mpi/mpif90model.h.in diff --git a/src/binding/f90/subconfigure.m4 b/src/binding/fortran/use_mpi/subconfigure.m4 similarity index 96% rename from src/binding/f90/subconfigure.m4 rename to src/binding/fortran/use_mpi/subconfigure.m4 index 538b3f2..65a776d 100644 --- a/src/binding/f90/subconfigure.m4 +++ b/src/binding/fortran/use_mpi/subconfigure.m4 @@ -9,7 +9,7 @@ AM_CONDITIONAL([BUILD_F90_LIB],[test "X$enable_fc" = "Xyes"]) AC_DEFUN([PAC_SUBCFG_BODY_]PAC_SUBCFG_AUTO_SUFFIX,[ AM_COND_IF([BUILD_F90_LIB],[ -# FIXME XXX DJG this code came from a sub-configure in src/binding/f90. Why +# FIXME XXX DJG this code came from a sub-configure in src/binding/fortran/use_mpi. Why # isn't this just all up in the top-level configure? Alternatively, why doesn't # most/all of the f90 configure code from the top level configure.ac live here # instead? Is it because of the c/f77/f90 interplay? @@ -58,7 +58,7 @@ PAC_FC_INTEGER_MODEL_MAP([FC_INTEGER_MODEL_MAP], [$CROSS_F90_INTEGER_MODEL_MAP]) AC_SUBST(FC_INTEGER_MODEL_MAP) -AC_CONFIG_FILES([src/binding/f90/mpif90model.h]) +AC_CONFIG_FILES([src/binding/fortran/use_mpi/mpif90model.h]) ])dnl end AM_COND_IF(BUILD_F90_LIB,...) ])dnl end _BODY ----------------------------------------------------------------------- Summary of changes: .gitignore | 84 ++++++------ autogen.sh | 16 +- configure.ac | 30 ++-- src/binding/Makefile.mk | 4 +- src/binding/{f77 => fortran/mpif_h}/buildiface | 44 +++--- src/binding/{f77 => fortran/mpif_h}/fdebug.c | 0 src/binding/{f77 => fortran/mpif_h}/mpi_fortimpl.h | 0 src/binding/{f77 => fortran/mpif_h}/mpichf.def | 0 src/binding/{f77 => fortran/mpif_h}/mpichff.vfproj | 0 src/binding/{f77 => fortran/mpif_h}/mpichfg.def | 0 src/binding/{f77 => fortran/mpif_h}/mpichfs.def | 0 src/binding/{f77 => fortran/mpif_h}/setbot.c.in | 0 src/binding/{f77 => fortran/mpif_h}/setbotf.f.in | 0 src/binding/{f90 => fortran/use_mpi}/binding.sub | 0 src/binding/{f90 => fortran/use_mpi}/buildiface | 140 ++++++++++---------- src/binding/{f90 => fortran/use_mpi}/cf90t.h | 0 src/binding/{f90 => fortran/use_mpi}/cf90tdefs | 2 +- .../{f90 => fortran/use_mpi}/create_f90_complex.c | 0 .../{f90 => fortran/use_mpi}/create_f90_int.c | 0 .../{f90 => fortran/use_mpi}/create_f90_real.c | 0 .../{f90 => fortran/use_mpi}/create_f90_util.c | 0 .../{f90 => fortran/use_mpi}/create_f90_util.h | 0 src/binding/{f90 => fortran/use_mpi}/manf90.txt | 0 .../{f90 => fortran/use_mpi}/mpi_sizeofs.f90.in | 0 src/binding/{f90 => fortran/use_mpi}/mpif90.vfproj | 0 .../{f90 => fortran/use_mpi}/mpif90model.h.in | 0 .../{f90 => fortran/use_mpi}/subconfigure.m4 | 4 +- 27 files changed, 162 insertions(+), 162 deletions(-) rename src/binding/{f77 => fortran/mpif_h}/buildiface (99%) rename src/binding/{f77 => fortran/mpif_h}/fdebug.c (100%) rename src/binding/{f77 => fortran/mpif_h}/mpi_fortimpl.h (100%) rename src/binding/{f77 => fortran/mpif_h}/mpichf.def (100%) rename src/binding/{f77 => fortran/mpif_h}/mpichff.vfproj (100%) rename src/binding/{f77 => fortran/mpif_h}/mpichfg.def (100%) rename src/binding/{f77 => fortran/mpif_h}/mpichfs.def (100%) rename src/binding/{f77 => fortran/mpif_h}/setbot.c.in (100%) rename src/binding/{f77 => fortran/mpif_h}/setbotf.f.in (100%) rename src/binding/{f90 => fortran/use_mpi}/binding.sub (100%) rename src/binding/{f90 => fortran/use_mpi}/buildiface (90%) rename src/binding/{f90 => fortran/use_mpi}/cf90t.h (100%) rename src/binding/{f90 => fortran/use_mpi}/cf90tdefs (87%) rename src/binding/{f90 => fortran/use_mpi}/create_f90_complex.c (100%) rename src/binding/{f90 => fortran/use_mpi}/create_f90_int.c (100%) rename src/binding/{f90 => fortran/use_mpi}/create_f90_real.c (100%) rename src/binding/{f90 => fortran/use_mpi}/create_f90_util.c (100%) rename src/binding/{f90 => fortran/use_mpi}/create_f90_util.h (100%) rename src/binding/{f90 => fortran/use_mpi}/manf90.txt (100%) rename src/binding/{f90 => fortran/use_mpi}/mpi_sizeofs.f90.in (100%) rename src/binding/{f90 => fortran/use_mpi}/mpif90.vfproj (100%) rename src/binding/{f90 => fortran/use_mpi}/mpif90model.h.in (100%) rename src/binding/{f90 => fortran/use_mpi}/subconfigure.m4 (96%) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-57-g32ab060
by noreply＠mpich.org 20 Mar '14

20 Mar '14

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 32ab0609d378603af93418f12aac645da8af727e (commit) from 4b35902a9704bb6ebdc1767d73d36443ca37fe73 (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/32ab0609d378603af93418f12aac645da… commit 32ab0609d378603af93418f12aac645da8af727e Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Tue Mar 18 23:11:43 2014 -0500 Put weak symbols in #ifndef MPICH_MPI_FROM_PMPI Fixes #2044 Signed-off-by: Antonio J. Pena <apenya(a)mcs.anl.gov> diff --git a/src/binding/f77/buildiface b/src/binding/f77/buildiface index 0395a9c..ce278bc 100755 --- a/src/binding/f77/buildiface +++ b/src/binding/f77/buildiface @@ -5261,17 +5261,17 @@ sub HelperForRegister_datarep { Like the attribute null functions, we provide multiple weak versions of this if possible */ +#if defined(USE_WEAK_SYMBOLS) + /* Add the prototype so the routine knows what this is */ extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ); -#if defined(USE_WEAK_SYMBOLS) - -#if defined(HAVE_MULTIPLE_PRAGMA_WEAK) /* If support multiple #pragma weak */ +#if defined(HAVE_MULTIPLE_PRAGMA_WEAK) && !defined(MPICH_MPI_FROM_PMPI) /* If support multiple #pragma weak */ #pragma weak mpi_conversion_fn_null__ = mpi_conversion_fn_null_ #pragma weak mpi_conversion_fn_null = mpi_conversion_fn_null_ #pragma weak MPI_CONVERSION_FN_NULL = mpi_conversion_fn_null_ -#elif defined(HAVE_PRAGMA_WEAK) /* If support single #pragma weak */ +#elif defined(HAVE_PRAGMA_WEAK) && !defined(MPICH_MPI_FROM_PMPI) /* If support single #pragma weak */ #if defined(F77_NAME_UPPER) #pragma weak MPI_CONVERSION_FN_NULL = mpi_conversion_fn_null_ #elif defined(F77_NAME_LOWER_2USCORE) @@ -5280,7 +5280,7 @@ extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v #pragma weak mpi_conversion_fn_null = mpi_conversion_fn_null_ #endif -#elif defined(HAVE_PRAGMA_HP_SEC_DEF) /* If support _HP_SECONDARY_DEF */ +#elif defined(HAVE_PRAGMA_HP_SEC_DEF) && !defined(MPICH_MPI_FROM_PMPI) /* If support _HP_SECONDARY_DEF */ #if defined(F77_NAME_UPPER) #pragma _HP_SECONDARY_DEF MPI_CONVERSION_FN_NULL = mpi_conversion_fn_null_ #elif defined(F77_NAME_LOWER_2USCORE) @@ -5289,7 +5289,7 @@ extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v #pragma _HP_SECONDARY_DEF mpi_conversion_fn_null = mpi_conversion_fn_null_ #endif -#elif defined(HAVE_PRAGMA_CRI_DUP) /* If support _CRI duplicate */ +#elif defined(HAVE_PRAGMA_CRI_DUP) && !defined(MPICH_MPI_FROM_PMPI) /* If support _CRI duplicate */ #if defined(F77_NAME_UPPER) #pragma _CRI duplicate MPI_CONVERSION_FN_NULL as mpi_conversion_fn_null_ #elif defined(F77_NAME_LOWER_2USCORE) @@ -5314,6 +5314,8 @@ extern FORT_DLL_SPEC int FORT_CALL MPI_CONVERSION_FN_NULL ( void*v1, MPI_Fint*v2 MPICH_ATTR_WEAK_ALIAS(\"mpi_conversion_fn_null_\") #endif ; +#endif + #else /* No weak symbol support, so simply rename the one version to match the Fortran naming convention */ #ifdef F77_NAME_UPPER @@ -5325,14 +5327,17 @@ MPICH_ATTR_WEAK_ALIAS(\"mpi_conversion_fn_null_\") /* Else leave name alone */ #endif /* End of test on name mapping without weak symbol support */ -#endif /* End of test on use weak symbols */ +/* Add the prototype so the routine knows what this is */ +extern FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ); #endif +#ifndef MPICH_MPI_FROM_PMPI /* This isn't a callable function */ FORT_DLL_SPEC int FORT_CALL mpi_conversion_fn_null_ ( void*v1, MPI_Fint*v2, MPI_Fint*v3, void*v4, MPI_Offset*v5, MPI_Fint *v6, MPI_Fint*v7, MPI_Fint *ierr ) { return 0; } +#endif "; ----------------------------------------------------------------------- Summary of changes: src/binding/f77/buildiface | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-56-g4b35902
by noreply＠mpich.org 19 Mar '14

19 Mar '14

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 4b35902a9704bb6ebdc1767d73d36443ca37fe73 (commit) from 1f532907778162971e6bf51b754b68c95861cd66 (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/4b35902a9704bb6ebdc1767d73d36443c… commit 4b35902a9704bb6ebdc1767d73d36443ca37fe73 Author: Su Huang <suhuang(a)us.ibm.com> Date: Wed Mar 19 04:27:47 2014 -0400 MPICH test case linked_list_lockall hang in MPI_Win_flush The scenario of the hang is described as follows: Assuming the job runs with 4 tasks, task 0 is in a loop of processing the following RMA operations to fetch the displacement, the loop ends if the displacement is being updated. MPI_Win_get_accumulate( target rank is task 0) MPI_Win_flush(task 0) task 1 and 3 hang in MPI_Win_flush() waiting for a call to MPI_Win_compare_and_swap() to complete. The target rank for this operation is task 0. task 2 hangs in MPI_Win_flush() waiting for a call to MPI_Accumulate() to complete. The target rank for this operation is task 0 as well. Task 0 is busy making MPI_Win_get_accumulate() and MPI_Win_flush() calls to see if the displacement is being updated, the target rank of the operation is task 0 itself which means the operation is local and can be completed without a need of making a PAMI dispatcher call. Meanwhile, the other three tasks issue RMA operations to the target task 0 and wait for the completion of the operations. Because task 0 is in a loop of making local operations, no PAMI dispatcher is called, no progress made for any remote operations which is the root cause of the hang. The fix for the problem is to add a call to PAMI dispatcher in MPI_Win_flush(), the call is made prior to the check of the condition. Current code checks the condition first, if the condition is satisfied, then no PAMI dispatcher is called. The following statement in MPI_Win_flush() MPID_PROGRESS_WAIT_WHILE(sync->total != sync->complete) will be replaced by MPID_PROGRESS_WAIT_DO_WHILE(sync->total != sync->complete) (ibm) D196445 Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> diff --git a/src/mpid/pamid/src/onesided/mpid_win_flush.c b/src/mpid/pamid/src/onesided/mpid_win_flush.c index c2e7e29..310d059 100644 --- a/src/mpid/pamid/src/onesided/mpid_win_flush.c +++ b/src/mpid/pamid/src/onesided/mpid_win_flush.c @@ -53,7 +53,7 @@ MPID_Win_flush(int rank, return mpi_errno, "**rmasync"); } sync = &win->mpid.sync; - MPID_PROGRESS_WAIT_WHILE(sync->total != sync->complete); + MPID_PROGRESS_WAIT_DO_WHILE(sync->total != sync->complete); sync->total = 0; sync->started = 0; sync->complete = 0; ----------------------------------------------------------------------- Summary of changes: src/mpid/pamid/src/onesided/mpid_win_flush.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1-55-g1f53290
by noreply＠mpich.org 18 Mar '14

18 Mar '14

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 1f532907778162971e6bf51b754b68c95861cd66 (commit) from cfe6626bb15dea1530d30388506977ca8534c2a5 (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/1f532907778162971e6bf51b754b68c95… commit 1f532907778162971e6bf51b754b68c95861cd66 Author: Ken Raffenetti <raffenet(a)mcs.anl.gov> Date: Tue Mar 18 14:39:54 2014 -0500 macro fix in datatype test The suncc compiler on Linux did not like the ternary conditional operands having different types. No reviewer. diff --git a/test/mpi/datatype/large_type_sendrec.c b/test/mpi/datatype/large_type_sendrec.c index 4b56f37..a697ef5 100644 --- a/test/mpi/datatype/large_type_sendrec.c +++ b/test/mpi/datatype/large_type_sendrec.c @@ -44,7 +44,7 @@ static void verbose_abort(int errorcode) return; } #define MPI_ASSERT(rc) \ - ((void) ((rc==MPI_SUCCESS) ? 0 : verbose_abort(rc) )) + do { if ((rc)!=MPI_SUCCESS) verbose_abort(rc); } while (0) int Type_contiguous_x(MPI_Count count, MPI_Datatype oldtype, MPI_Datatype * newtype); ----------------------------------------------------------------------- Summary of changes: test/mpi/datatype/large_type_sendrec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0