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

[mpich] MPICH primary repository branch, master, updated. v3.1.3-7-gdd62e80
by noreply＠mpich.org 10 Oct '14

10 Oct '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 dd62e80936512f3bf9e69ff466ff462202b44d00 (commit) from 8afce3469a7dffcbbe1f8b0a7c049604fa7970c4 (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/dd62e80936512f3bf9e69ff466ff46220… commit dd62e80936512f3bf9e69ff466ff462202b44d00 Author: Pavan Balaji <balaji(a)anl.gov> Date: Fri Oct 10 19:29:55 2014 -0500 Test MPI_IN_PLACE variants of NBCs. This doesn't pass with mpich yet. Signed-off-by: Wesley Bland <wbland(a)anl.gov> diff --git a/test/mpi/coll/nonblocking.c b/test/mpi/coll/nonblocking.c index 3a306f5..bbd2f95 100644 --- a/test/mpi/coll/nonblocking.c +++ b/test/mpi/coll/nonblocking.c @@ -86,48 +86,93 @@ int main(int argc, char **argv) MPI_Igather(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Igather(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Igatherv(sbuf, NUM_INTS, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Igatherv(NULL, -1, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscatter(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscatter(sbuf, NUM_INTS, MPI_INT, MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscatterv(sbuf, scounts, sdispls, MPI_INT, rbuf, NUM_INTS, MPI_INT, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscatterv(sbuf, scounts, sdispls, MPI_INT, MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallgather(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallgather(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallgatherv(sbuf, NUM_INTS, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallgatherv(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoall(sbuf, NUM_INTS, MPI_INT, rbuf, NUM_INTS, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoall(MPI_IN_PLACE, -1, MPI_DATATYPE_NULL, rbuf, NUM_INTS, MPI_INT, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoallv(sbuf, scounts, sdispls, MPI_INT, rbuf, rcounts, rdispls, MPI_INT, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoallv(MPI_IN_PLACE, NULL, NULL, MPI_DATATYPE_NULL, rbuf, rcounts, rdispls, MPI_INT, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoallw(sbuf, scounts, sdispls, types, rbuf, rcounts, rdispls, types, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ialltoallw(MPI_IN_PLACE, NULL, NULL, NULL, rbuf, rcounts, rdispls, types, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, 0, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallreduce(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iallreduce(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce_scatter(sbuf, rbuf, rcounts, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce_scatter(MPI_IN_PLACE, rbuf, rcounts, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce_scatter_block(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Ireduce_scatter_block(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscan(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iscan(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iexscan(sbuf, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); MPI_Wait(&req, MPI_STATUS_IGNORE); + MPI_Iexscan(MPI_IN_PLACE, rbuf, NUM_INTS, MPI_INT, MPI_SUM, comm, &req); + MPI_Wait(&req, MPI_STATUS_IGNORE); + if (sbuf) free(sbuf); if (rbuf) free(rbuf); if (scounts) free(scounts); ----------------------------------------------------------------------- Summary of changes: test/mpi/coll/nonblocking.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-6-g8afce34
by noreply＠mpich.org 10 Oct '14

10 Oct '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 8afce3469a7dffcbbe1f8b0a7c049604fa7970c4 (commit) from cc4b0952a7b8503e2340938ce11092aa5784305a (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/8afce3469a7dffcbbe1f8b0a7c049604f… commit 8afce3469a7dffcbbe1f8b0a7c049604fa7970c4 Author: Igor Ivanov <Igor.Ivanov(a)itseez.com> Date: Fri Oct 10 14:07:21 2014 +0200 mpid: Fix REQUEST memory leak for Irsend Memory leak can appear in case netmod usage. Comm override functions are responsible for creating its own request. So they need to come before the sreq is created. Signed-off-by: Igor Ivanov <Igor.Ivanov(a)itseez.com> Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpid/ch3/src/mpid_irsend.c b/src/mpid/ch3/src/mpid_irsend.c index d8a0c0a..0bae646 100644 --- a/src/mpid/ch3/src/mpid_irsend.c +++ b/src/mpid/ch3/src/mpid_irsend.c @@ -50,6 +50,19 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in mpi_errno = MPIDI_Isend_self(buf, count, datatype, rank, tag, comm, context_offset, MPIDI_REQUEST_TYPE_RSEND, &sreq); goto fn_exit; } + + if (rank != MPI_PROC_NULL) { + MPIDI_Comm_get_vc_set_active(comm, rank, &vc); +#ifdef ENABLE_COMM_OVERRIDES + /* this needs to come before the sreq is created, since the override + * function is responsible for creating its own request */ + if (vc->comm_ops && vc->comm_ops->irsend) + { + mpi_errno = vc->comm_ops->irsend( vc, buf, count, datatype, rank, tag, comm, context_offset, &sreq); + goto fn_exit; + } +#endif + } MPIDI_Request_create_sreq(sreq, mpi_errno, goto fn_exit); MPIDI_Request_set_type(sreq, MPIDI_REQUEST_TYPE_RSEND); @@ -62,16 +75,6 @@ int MPID_Irsend(const void * buf, int count, MPI_Datatype datatype, int rank, in goto fn_exit; } - MPIDI_Comm_get_vc_set_active(comm, rank, &vc); - -#ifdef ENABLE_COMM_OVERRIDES - if (vc->comm_ops && vc->comm_ops->irsend) - { - mpi_errno = vc->comm_ops->irsend( vc, buf, count, datatype, rank, tag, comm, context_offset, &sreq); - goto fn_exit; - } -#endif - MPIDI_Datatype_get_info(count, datatype, dt_contig, data_sz, dt_ptr, dt_true_lb); MPIDI_Pkt_init(ready_pkt, MPIDI_CH3_PKT_READY_SEND); ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/mpid_irsend.c | 23 +++++++++++++---------- 1 files changed, 13 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-5-gcc4b095
by noreply＠mpich.org 10 Oct '14

10 Oct '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 cc4b0952a7b8503e2340938ce11092aa5784305a (commit) from f38b5131d934987f139e5cf704cdf067d212ca21 (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/cc4b0952a7b8503e2340938ce11092aa5… commit cc4b0952a7b8503e2340938ce11092aa5784305a Author: Igor Ivanov <Igor.Ivanov(a)itseez.com> Date: Fri Oct 10 14:33:37 2014 +0200 mpi/coll: Fix incorrect parameter check Fixed wrong parameter check condition for MPI_Iallgather and MPI_Iallgatherv -1 is valid value for sendcount in case MPI_IN_PLACE MPI spec says: The in place option for intracommunicators is specified by passing the value MPI_IN_PLACE to the argument sendbuf at all processes. In such a case, sendcount and sendtype are ignored, and the input data of each process is assumed to be in the area where that process would receive its own contribution to the receive buffer. Signed-off-by: Igor Ivanov <Igor.Ivanov(a)itseez.com> Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/src/mpi/coll/iallgather.c b/src/mpi/coll/iallgather.c index 18d798c..1e0eb10 100644 --- a/src/mpi/coll/iallgather.c +++ b/src/mpi/coll/iallgather.c @@ -675,9 +675,10 @@ int MPI_Iallgather(const void *sendbuf, int sendcount, MPI_Datatype sendtype, { MPID_BEGIN_ERROR_CHECKS { - if (sendbuf != MPI_IN_PLACE) + if (sendbuf != MPI_IN_PLACE) { MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); - MPIR_ERRTEST_COUNT(sendcount, mpi_errno); + MPIR_ERRTEST_COUNT(sendcount, mpi_errno); + } MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); MPIR_ERRTEST_COMM(comm, mpi_errno); diff --git a/src/mpi/coll/iallgatherv.c b/src/mpi/coll/iallgatherv.c index 5d5fd15..39b88d6 100644 --- a/src/mpi/coll/iallgatherv.c +++ b/src/mpi/coll/iallgatherv.c @@ -779,8 +779,10 @@ int MPI_Iallgatherv(const void *sendbuf, int sendcount, MPI_Datatype sendtype, v { MPID_BEGIN_ERROR_CHECKS { - if (sendbuf != MPI_IN_PLACE) + if (sendbuf != MPI_IN_PLACE) { MPIR_ERRTEST_DATATYPE(sendtype, "sendtype", mpi_errno); + MPIR_ERRTEST_COUNT(sendcount, mpi_errno); + } MPIR_ERRTEST_DATATYPE(recvtype, "recvtype", mpi_errno); MPIR_ERRTEST_COMM(comm, mpi_errno); ----------------------------------------------------------------------- Summary of changes: src/mpi/coll/iallgather.c | 5 +++-- src/mpi/coll/iallgatherv.c | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-4-gf38b513
by noreply＠mpich.org 09 Oct '14

09 Oct '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 f38b5131d934987f139e5cf704cdf067d212ca21 (commit) from 696eb4aa3a74e13b5eff61fc8eebe2bd3b3df014 (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/f38b5131d934987f139e5cf704cdf067d… commit f38b5131d934987f139e5cf704cdf067d212ca21 Author: Igor Ivanov <Igor.Ivanov(a)itseez.com> Date: Thu Oct 9 15:26:10 2014 +0200 netmode/mxm: Add mprobe/imrecv support Signed-off-by: Igor Ivanov <Igor.Ivanov(a)itseez.com> diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h index bd80a69..3b2bb12 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_impl.h @@ -265,6 +265,11 @@ static inline void _mxm_req_wait(mxm_req_base_t * req) mxm_wait(&mxm_wreq); } +static inline int _mxm_eager_threshold(void) +{ + return 262144; +} + /* * Tag management section */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c index ca31588..7bd2cad 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c @@ -70,7 +70,7 @@ static MPIDI_Comm_ops_t comm_ops = { MPID_nem_mxm_ssend, /* ssend */ MPID_nem_mxm_isend, /* isend */ MPID_nem_mxm_isend, /* irsend */ - MPID_nem_mxm_issend, /* issend */ + MPID_nem_mxm_issend,/* issend */ NULL, /* send_init */ NULL, /* bsend_init */ @@ -142,6 +142,8 @@ int MPID_nem_mxm_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ if (mpi_errno) MPIU_ERR_POP(mpi_errno); + MPIDI_Anysource_improbe_fn = MPID_nem_mxm_anysource_improbe; + fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MXM_INIT); return mpi_errno; @@ -266,8 +268,12 @@ int MPID_nem_mxm_vc_init(MPIDI_VC_t * vc) vc_area->pending_sends = 0; - vc->rndvSend_fn = NULL; - vc->rndvRecv_fn = NULL; + /* Use default rendezvous functions */ + vc->eager_max_msg_sz = _mxm_eager_threshold(); + vc->ready_eager_max_msg_sz = vc->eager_max_msg_sz; + vc->rndvSend_fn = MPID_nem_lmt_RndvSend; + vc->rndvRecv_fn = MPID_nem_lmt_RndvRecv; + vc->sendNoncontig_fn = MPID_nem_mxm_SendNoncontig; vc->comm_ops = &comm_ops; diff --git a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c index c5d6d8a..0d7cf24 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_probe.c @@ -107,11 +107,76 @@ int MPID_nem_mxm_improbe(MPIDI_VC_t * vc, int source, int tag, MPID_Comm * comm, int *flag, MPID_Request ** message, MPI_Status * status) { int mpi_errno = MPI_SUCCESS; + mxm_error_t err; + mxm_recv_req_t mxm_req; + mxm_message_h mxm_msg; + MPID_nem_mxm_vc_area *vc_area = (vc ? VC_BASE(vc) : NULL); MPIDI_STATE_DECL(MPID_STATE_MXM_IMPROBE); MPIDI_FUNC_ENTER(MPID_STATE_MXM_IMPROBE); - MPIU_Assert(0 && "not currently implemented"); + mxm_req.base.state = MXM_REQ_NEW; + mxm_req.base.mq = (mxm_mq_h) comm->dev.ch.netmod_priv; + mxm_req.base.conn = (vc_area ? vc_area->mxm_ep->mxm_conn : 0); + + mxm_req.tag = _mxm_tag_mpi2mxm(tag, comm->context_id + context_offset); + mxm_req.tag_mask = _mxm_tag_mask(tag); + + err = mxm_req_mprobe(&mxm_req, &mxm_msg); + if (MXM_OK == err) { + MPID_Request *req; + + *flag = 1; + + req = MPID_Request_create(); + MPIU_Object_set_ref(req, 2); + req->kind = MPID_REQUEST_MPROBE; + req->comm = comm; + MPIR_Comm_add_ref(comm); + req->ch.vc = vc; +// MPIDI_Request_set_sync_send_flag(req, 1); /* set this flag in case MXM_REQ_OP_SEND_SYNC*/ + MPIDI_Request_set_msg_type(req, MPIDI_REQUEST_EAGER_MSG); + req->dev.recv_pending_count = 1; + + _mxm_to_mpi_status(mxm_req.base.error, &req->status); + req->status.MPI_TAG = _mxm_tag_mxm2mpi(mxm_req.completion.sender_tag); + req->status.MPI_SOURCE = mxm_req.completion.sender_imm; + req->dev.recv_data_sz = mxm_req.completion.sender_len; + MPIR_STATUS_SET_COUNT(req->status, req->dev.recv_data_sz); + req->dev.tmpbuf = MPIU_Malloc(req->dev.recv_data_sz); + MPIU_Assert(req->dev.tmpbuf); + + mxm_req.base.completed_cb = NULL; + mxm_req.base.context = req; + mxm_req.base.data_type = MXM_REQ_DATA_BUFFER; + mxm_req.base.data.buffer.ptr = req->dev.tmpbuf; + mxm_req.base.data.buffer.length = req->dev.recv_data_sz; + + err = mxm_message_recv(&mxm_req, mxm_msg); + _mxm_req_wait(&mxm_req.base); + + MPIDI_CH3U_Request_complete(req); + + *message = req; + + /* TODO: Should we change status + _mxm_to_mpi_status(mxm_req.base.error, status); + */ + status->MPI_SOURCE = req->status.MPI_SOURCE; + status->MPI_TAG = req->status.MPI_TAG; + MPIR_STATUS_SET_COUNT(*status, req->dev.recv_data_sz); + + _dbg_mxm_output(8, + "imProbe ========> Found USER msg (context %d from %d tag %d size %d) \n", + comm->context_id + context_offset, status->MPI_SOURCE, status->MPI_TAG, MPIR_STATUS_GET_COUNT(*status)); + } + else if (MXM_ERR_NO_MESSAGE == err) { + *flag = 0; + *message = NULL; + } + else { + mpi_errno = MPI_ERR_INTERN; + } fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MXM_IMPROBE); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_impl.h | 5 ++ .../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 12 +++- .../ch3/channels/nemesis/netmod/mxm/mxm_probe.c | 67 +++++++++++++++++++- 3 files changed, 80 insertions(+), 4 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-3-g696eb4a
by noreply＠mpich.org 08 Oct '14

08 Oct '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 696eb4aa3a74e13b5eff61fc8eebe2bd3b3df014 (commit) via 35d5da0c09b4e45828ba8327fa5f93ce1114027a (commit) from 7a36603163cd917fe89a39cad668e5a7b6f917cb (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/696eb4aa3a74e13b5eff61fc8eebe2bd3… commit 696eb4aa3a74e13b5eff61fc8eebe2bd3b3df014 Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Oct 7 22:11:02 2014 -0500 MPICH-specific initialization of hcoll. In some cases, we cannot let hcoll use whatever transport it needs. For example, ch3:sock assumes that while blocking the next event will come over the socket channel. If HCOLL decides to use a different transport (such as mxm) and the next event comes on that transport, this can result in a deadlock. In this patch, we let the channel specify what transports it can accept. Signed-off-by: Devendar Bureddy <devendar(a)mellanox.com> diff --git a/src/mpid/ch3/channels/sock/subconfigure.m4 b/src/mpid/ch3/channels/sock/subconfigure.m4 index 79b2250..b95f9cb 100644 --- a/src/mpid/ch3/channels/sock/subconfigure.m4 +++ b/src/mpid/ch3/channels/sock/subconfigure.m4 @@ -12,6 +12,7 @@ AC_DEFUN([PAC_SUBCFG_PREREQ_]PAC_SUBCFG_AUTO_SUFFIX,[ build_ch3u_sock=yes MPID_MAX_THREAD_LEVEL=MPI_THREAD_MULTIPLE + MPID_CH3I_CH_HCOLL_BCOL="basesmuma,basesmuma,ptpcoll" # code that formerly lived in setup_args # diff --git a/src/mpid/ch3/src/ch3u_comm.c b/src/mpid/ch3/src/ch3u_comm.c index b0e10c3..46bfe64 100644 --- a/src/mpid/ch3/src/ch3u_comm.c +++ b/src/mpid/ch3/src/ch3u_comm.c @@ -57,6 +57,9 @@ static hook_elt *destroy_hooks_tail = NULL; int MPIDI_CH3I_Comm_init(void) { int mpi_errno = MPI_SUCCESS; +#if defined HAVE_LIBHCOLL && MPID_CH3I_CH_HCOLL_BCOL + MPIU_CHKLMEM_DECL(1); +#endif MPIDI_STATE_DECL(MPID_STATE_MPIDI_CH3U_COMM_INIT); MPIDI_FUNC_ENTER(MPID_STATE_MPIDI_CH3U_COMM_INIT); @@ -69,6 +72,31 @@ int MPIDI_CH3I_Comm_init(void) #if defined HAVE_LIBHCOLL if (MPIR_CVAR_CH3_ENABLE_HCOLL) { + int r; + + /* check if the user is not trying to override the multicast + * setting before resetting it */ + if (getenv("HCOLL_ENABLE_MCAST_ALL") == NULL) { + /* FIXME: We should not unconditionally disable multicast. + * Test to make sure it's available before choosing to + * enable or disable it. */ + r = MPL_putenv("HCOLL_ENABLE_MCAST_ALL=0"); + MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv"); + } + +#if defined MPID_CH3I_CH_HCOLL_BCOL + if (getenv("HCOLL_BCOL") == NULL) { + char *envstr; + int size = strlen("HCOLL_BCOL=") + strlen(MPID_CH3I_CH_HCOLL_BCOL) + 1; + + MPIU_CHKLMEM_MALLOC(envstr, char *, size, mpi_errno, "**malloc"); + MPL_snprintf(envstr, size, "HCOLL_BCOL=%s", MPID_CH3I_CH_HCOLL_BCOL); + + r = MPL_putenv(envstr); + MPIU_ERR_CHKANDJUMP(r, mpi_errno, MPI_ERR_OTHER, "**putenv"); + } +#endif + mpi_errno = MPIDI_CH3U_Comm_register_create_hook(hcoll_comm_create, NULL); if (mpi_errno) MPIU_ERR_POP(mpi_errno); mpi_errno = MPIDI_CH3U_Comm_register_destroy_hook(hcoll_comm_destroy, NULL); @@ -81,6 +109,9 @@ int MPIDI_CH3I_Comm_init(void) fn_exit: MPIDI_FUNC_EXIT(MPID_STATE_MPIDI_CH3U_COMM_INIT); +#if defined HAVE_LIBHCOLL && MPID_CH3I_CH_HCOLL_BCOL + MPIU_CHKLMEM_FREEALL(); +#endif return mpi_errno; fn_fail: goto fn_exit; http://git.mpich.org/mpich.git/commitdiff/35d5da0c09b4e45828ba8327fa5f93ce1… commit 35d5da0c09b4e45828ba8327fa5f93ce1114027a Author: Pavan Balaji <balaji(a)anl.gov> Date: Sun Oct 5 20:50:22 2014 -0500 Added a note in the README about MXM_LOG_LEVEL. Tell users that they can disable warnings if needed. Signed-off-by: Devendar Bureddy <devendar(a)mellanox.com> diff --git a/README.vin b/README.vin index 528164b..b1ad747 100644 --- a/README.vin +++ b/README.vin @@ -492,6 +492,16 @@ include headers are present in /path/to/mxm/include): --with-mxm-lib=/path/to/mxm/lib --with-mxm-include=/path/to/mxm/include +By default, the mxm library throws warnings when the system does not +enable certain features that might hurt performance. These are +important warnings that might cause performance degradation on your +system. But you might need root privileges to fix some of them. If +you would like to disable such warnings, you can set the MXM log level +to "error" instead of the default "warn" by using: + + MXM_LOG_LEVEL=error + export MXM_LOG_LEVEL + ib network module ````````````````` The IB netmod provides support for InfiniBand on x86_64 platforms ----------------------------------------------------------------------- Summary of changes: README.vin | 10 +++++++++ src/mpid/ch3/channels/sock/subconfigure.m4 | 1 + src/mpid/ch3/src/ch3u_comm.c | 31 ++++++++++++++++++++++++++++ 3 files changed, 42 insertions(+), 0 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.1.3-1-g7a36603
by noreply＠mpich.org 08 Oct '14

08 Oct '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 7a36603163cd917fe89a39cad668e5a7b6f917cb (commit) from 835ab3bc2d051a44dc75aadd6ac1f9ace9b43c61 (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/7a36603163cd917fe89a39cad668e5a7b… commit 7a36603163cd917fe89a39cad668e5a7b6f917cb Author: Joe Ratterman <jratt(a)us.ibm.com> Date: Mon May 2 13:00:29 2011 -0500 When decrementing a ref-count to 0, do not bother with atomics. If the ref-count is 1, we *should* be the only thread holding a reference. It is therefore legal to skip atomics. If that is insufficient justificaion, consider that there are only three things a concurrent thread should be doing: 1) Reading: Not a problem, since the store is atomic. 2) Decrementing: Illegal; it would go negative using pure atomics. 3) Incrementing: Illegal; we are about to destroy the object. Add #ifdef guard for use of 'aggressive counter optimizations' (ibm) 20a558c3802fb3e138eb6b3c786a434538efffdd Signed-off-by: Joe Ratterman <jratt(a)us.ibm.com> Signed-off-by: Michael Blocksome <blocksom(a)us.ibm.com> Updated by Pavan Balaji to use an OPA atomic load instead of a simple load operation. Fixes #1835 Signed-off-by: Pavan Balaji <balaji(a)anl.gov> Signed-off-by: William Gropp <wgropp(a)illinois.edu> diff --git a/src/include/mpihandlemem.h b/src/include/mpihandlemem.h index 1847031..1ab6752 100644 --- a/src/include/mpihandlemem.h +++ b/src/include/mpihandlemem.h @@ -300,10 +300,25 @@ typedef OPA_int_t MPIU_Handle_ref_count; MPIU_HANDLE_LOG_REFCOUNT_CHANGE(objptr_, "incr"); \ MPIU_HANDLE_CHECK_REFCOUNT(objptr_,"incr"); \ } while (0) + +/* Special optimization: when the reference count touches one, we are + * about to free the object. In this case, it is illegal for another + * thread to either increment the reference (i.e., create a new object + * that depends on this object) or decrement the references (i.e., + * free the object simultaneously). We, however, have to ensure that + * our load is atomic. OPA does this for us, while optimizing it to a + * simple load for cases where the architecture already provides us + * with load atomicity and no need for load memory barriers. */ #define MPIU_Object_release_ref_always(objptr_,inuse_ptr) \ do { \ - int got_zero_ = OPA_decr_and_test_int(&((objptr_)->ref_count)); \ - *(inuse_ptr) = got_zero_ ? 0 : 1; \ + if (likely(OPA_load_int((objptr_)->ref_count.v) == 1)) { \ + (objptr_)->ref_count.v = 0; \ + *(inuse_ptr) = 0; \ + } \ + else { \ + int got_zero_ = OPA_decr_and_test_int(&((objptr_)->ref_count)); \ + *(inuse_ptr) = got_zero_ ? 0 : 1; \ + } \ MPIU_HANDLE_LOG_REFCOUNT_CHANGE(objptr_, "decr"); \ MPIU_HANDLE_CHECK_REFCOUNT(objptr_,"decr"); \ } while (0) ----------------------------------------------------------------------- Summary of changes: src/include/mpihandlemem.h | 19 +++++++++++++++++-- 1 files changed, 17 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository annotated tag, v3.1.3, created. v3.1.3
by noreply＠mpich.org 08 Oct '14

08 Oct '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 annotated tag, v3.1.3 has been created at 6845c55245868068a2794c9ee1205deefb46c41c (tag) tagging 835ab3bc2d051a44dc75aadd6ac1f9ace9b43c61 (commit) replaces v3.2a1 tagged by Sangmin Seo on Wed Oct 8 09:19:50 2014 -0500 - Log ----------------------------------------------------------------- tagging 'v3.1.3' Igor Ivanov (4): netmod/mxm: Cleanup code from warnings netmod/mxm: Change supported MXM version to 3.1+ netmode/mxm: Fix issue in anysource match mpi/comm: Fix MPI_Intercomm_merge Junchao Zhang (7): Fix switch(datatype) kind of errors Fix F77/90 binding errors in MPI_Pcontrol Fix an "unused variable" warning in F77/90 MPI_PCONTROL Fix mixed code warnings reported by --enable-strict=c89 Change // comments to /* */ style Remove unnessary array init in MPIU_CHKLMEM_DECL Revised the description of two MPI pvars Ken Raffenetti (4): portals4: support for MPI_ANY_TAG recvs add libraries needed to build MPICH to EXTERNAL_LIBS portals4: cleanup usage of datatype info portals4: invalidate ME handle before request dequeue Michael Blocksome (2): pamid: Add bgq libraries to wrapper scripts pamid: Do not compile/link C++ source if it is not used. Min Si (1): Added mb in flush handler. Resolves #2177. Norio Yamaguchi (2): Divide memory area to segments when registering Modify the method of IB-dereg_mr Nysal Jan K.A (1): pamid: Fix a hang in scatter Pavan Balaji (4): Fix incorrect portals library name. Cleanup release.pl to remove unnecessary code. Bug-fix: Expose sufficient memory as public. Bug-fix: look for man pages in the build directory, not source. Rob Latham (4): no reason for a huge stack in these tests fix logic in syshint processing check Remove comm_split in deferred open case romio: remove allreduce in flush Sameh Sharkawi (3): pamid: Adding empty implementation new MPID_Comm functions pamid: Fix for configure error in src/mpid/pamid/subconfigure.m4 pamid: Collectives using process topology segv if FCA on Sangmin Seo (3): Remove 3.2a1 changes in the CHANGES file. Update CHANGES for 3.1.3 release. Update version number for 3.1.3 release. Su Huang (1): pamid: LE RDMA hit "mlx5: got completion with error" and even coredump Wesley Bland (2): Turn on some of the FT tests that are now passing Revert "Turn on some of the FT tests that are now passing" William Gropp (1): Create doctext index and suppress location Xin Zhao (13): Bug-fix: avoid wrong synchronization in MPI_Win_complete. Bug-fix: skip synchronization in Win_start for MODE_NOCHECK. Enable SHM in PSCW tests. Bug-fix: waiting for ACKs for Active Target Synchronization. Pass tail pointer to MPL single direction linked-list API. Revert "Bug-fix: waiting for ACKs for Active Target Synchronization." Fix completion on target side in Active Target synchronization. Add a RMA test for target side completion in Active Target. Bug-fix: call RMA finish function when RMA ops finishes. Bug-fix: correct decrementing counter in GET-like operations. Modify variable name my_counter to at_completion_counter. Bug-fix: correct SHM barrier in MPI_Win_fence. Decrease iteration number in manyrma2 test. halim amer (2): Added an example for checking on which CPU a process is running on. Added missing incrementation of the posted_recvq_match_attempts pvar ----------------------------------------------------------------------- hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-54-g835ab3b
by noreply＠mpich.org 07 Oct '14

07 Oct '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 835ab3bc2d051a44dc75aadd6ac1f9ace9b43c61 (commit) via 0bfc1346cc85d9019cb6add96aeeeff0f031e2a1 (commit) via c2d941c9203e131a909bf8b224ee8d3dc06ec5b4 (commit) from 354396f8362fd72c8f6750a479d86804bb47ddaa (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/835ab3bc2d051a44dc75aadd6ac1f9ace… commit 835ab3bc2d051a44dc75aadd6ac1f9ace9b43c61 Author: Sangmin Seo <sseo(a)anl.gov> Date: Tue Oct 7 14:38:32 2014 -0500 Update version number for 3.1.3 release. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/maint/version.m4 b/maint/version.m4 index f4a1184..68b7b1b 100644 --- a/maint/version.m4 +++ b/maint/version.m4 @@ -14,7 +14,7 @@ # changing this by playing with diversions, but then we would probably be # playing with autotools-fire. -m4_define([MPICH_VERSION_m4],[3.2a1])dnl +m4_define([MPICH_VERSION_m4],[3.1.3])dnl m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # For libtool ABI versioning rules see: @@ -35,6 +35,6 @@ m4_define([MPICH_RELEASE_DATE_m4],[unreleased development copy])dnl # libmpi so version only includes functionality defined in the MPI # standard, and does not include MPIX_ functions and C++ bindings. -m4_define([libmpi_so_version_m4],[12:3:0])dnl +m4_define([libmpi_so_version_m4],[12:4:0])dnl [#] end of __file__ http://git.mpich.org/mpich.git/commitdiff/0bfc1346cc85d9019cb6add96aeeeff0f… commit 0bfc1346cc85d9019cb6add96aeeeff0f031e2a1 Author: Sangmin Seo <sseo(a)anl.gov> Date: Tue Oct 7 14:37:58 2014 -0500 Update CHANGES for 3.1.3 release. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/CHANGES b/CHANGES index bbcd316..9145ab0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,30 @@ =============================================================================== + Changes in 3.1.3 +=============================================================================== + + # Several enhancements to Portals4 support. + + # Several enhancements to PAMI (thanks to IBM for the code contribution). + + # Several enhancements to the CH3 RMA implementation. + + # Several enhancements to ROMIO. + + # Fixed deadlock in multi-threaded MPI_Comm_idup. + + # Several other minor bug fixes, memory leak fixes, and code cleanup. + + A full list of changes is available at the following link: + + http://git.mpich.org/mpich.git/shortlog/v3.1.2..v3.1.3 + + A full list of bugs that have been fixed is available at the + following link: + + https://trac.mpich.org/projects/mpich/query?status=closed&group=resolution&… + + +=============================================================================== Changes in 3.1.2 =============================================================================== http://git.mpich.org/mpich.git/commitdiff/c2d941c9203e131a909bf8b224ee8d3dc… commit c2d941c9203e131a909bf8b224ee8d3dc06ec5b4 Author: Sangmin Seo <sseo(a)anl.gov> Date: Tue Oct 7 14:36:16 2014 -0500 Remove 3.2a1 changes in the CHANGES file. Signed-off-by: Pavan Balaji <balaji(a)anl.gov> diff --git a/CHANGES b/CHANGES index d5e888d..bbcd316 100644 --- a/CHANGES +++ b/CHANGES @@ -1,28 +1,4 @@ =============================================================================== - Changes in 3.2 -=============================================================================== - - # Fortran 2008 bindings are enabled by default and fully supported. - - # Added support for the Mellanox MXM InfiniBand interface. (thanks - to Mellanox for the code contribution). - - # Added support for OFED IB on Xeon and Xeon Phi. (thanks to RIKEN - and University of Tokyo for the contribution). - - # Several other minor bug fixes, memory leak fixes, and code cleanup. - - A full list of changes is available at the following link: - - http://git.mpich.org/mpich.git/shortlog/v3.1.2..v3.2a1 - - A full list of bugs that have been fixed is available at the - following link: - - https://trac.mpich.org/projects/mpich/query?status=closed&group=resolution&… - - -=============================================================================== Changes in 3.1.2 =============================================================================== ----------------------------------------------------------------------- Summary of changes: CHANGES | 18 ++++++++++-------- maint/version.m4 | 4 ++-- 2 files changed, 12 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-51-g354396f
by noreply＠mpich.org 07 Oct '14

07 Oct '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 354396f8362fd72c8f6750a479d86804bb47ddaa (commit) from e899f71f715baea41625c33ab0e9c693fa970b31 (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/354396f8362fd72c8f6750a479d86804b… commit 354396f8362fd72c8f6750a479d86804bb47ddaa Author: Pavan Balaji <balaji(a)anl.gov> Date: Tue Oct 7 12:58:26 2014 -0500 Bug-fix: look for man pages in the build directory, not source. Signed-off-by: Rob Latham <robl(a)mcs.anl.gov> diff --git a/Makefile.am b/Makefile.am index e95edee..fe42721 100644 --- a/Makefile.am +++ b/Makefile.am @@ -453,7 +453,7 @@ htmldoc-local: $(mpi_sources:.c=.html-phony) $(doc1_src_txt:.txt=.html1-phony) INSTALL_DATA_LOCAL_TARGETS += install-man-local # this is a variation on the recipe that was previously generated by simplemake install-man-local: - @if test -d $(srcdir)/man && cd $(srcdir)/man ; then \ + @if test -d $(top_builddir)/man && cd $(top_builddir)/man ; then \ for name in * ; do \ if [ "$$name" = "*" ] ; then continue ; fi ; \ if [ -f $$name ] ; then \ ----------------------------------------------------------------------- Summary of changes: Makefile.am | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- MPICH primary repository

1 0

[mpich] MPICH primary repository branch, master, updated. v3.2a1-50-ge899f71
by noreply＠mpich.org 06 Oct '14

06 Oct '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 e899f71f715baea41625c33ab0e9c693fa970b31 (commit) via 3af7209c060326f1626c9e8425e06701af4f6c33 (commit) from 25e7fa93c9bc0bf8544478f3ff0d3db6de1def18 (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/e899f71f715baea41625c33ab0e9c693f… commit e899f71f715baea41625c33ab0e9c693fa970b31 Author: Junchao Zhang <jczhang(a)mcs.anl.gov> Date: Mon Oct 6 16:06:38 2014 -0500 Revised the description of two MPI pvars Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index aa5a91a..c37e4b3 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -139,7 +139,7 @@ int MPIDI_CH3U_Recvq_init(void) MPI_T_BIND_NO_OBJECT, (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", /* category name */ - "number of search passes on the message receive queue"); + "number of search passes on the posted message receive queue"); MPIR_T_PVAR_COUNTER_REGISTER_STATIC( RECVQ, @@ -149,7 +149,7 @@ int MPIDI_CH3U_Recvq_init(void) MPI_T_BIND_NO_OBJECT, (MPIR_T_PVAR_FLAG_READONLY | MPIR_T_PVAR_FLAG_CONTINUOUS), "CH3", - "number of search passes on the message receive queue"); + "number of search passes on the unexpected message receive queue"); MPIR_T_PVAR_TIMER_REGISTER_STATIC( RECVQ, http://git.mpich.org/mpich.git/commitdiff/3af7209c060326f1626c9e8425e06701a… commit 3af7209c060326f1626c9e8425e06701af4f6c33 Author: halim amer <halim.amer(a)gmail.com> Date: Fri Sep 5 14:02:19 2014 -0500 Added missing incrementation of the posted_recvq_match_attempts pvar This variable is incremented correctly by the MPIDI_CH3U_Recvq_FDP_or_AEU routine, but the MPIDI_CH3U_Recvq_DP fails to do so, although it also goes through the posted recv queue. For instance, the MXM Netmod calls this routine. Signed-off-by: Junchao Zhang <jczhang(a)mcs.anl.gov> diff --git a/src/mpid/ch3/src/ch3u_recvq.c b/src/mpid/ch3/src/ch3u_recvq.c index 8a76d13..aa5a91a 100644 --- a/src/mpid/ch3/src/ch3u_recvq.c +++ b/src/mpid/ch3/src/ch3u_recvq.c @@ -699,6 +699,7 @@ int MPIDI_CH3U_Recvq_DP(MPID_Request * rreq) MPIR_T_PVAR_TIMER_START(RECVQ, time_failed_matching_postedq); cur_rreq = recvq_posted_head; while (cur_rreq != NULL) { + MPIR_T_PVAR_COUNTER_INC(RECVQ, posted_recvq_match_attempts, 1); if (cur_rreq == rreq) { if (prev_rreq != NULL) { prev_rreq->dev.next = cur_rreq->dev.next; ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/src/ch3u_recvq.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) hooks/post-receive -- MPICH primary repository

1 0