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 d04c8a1e86c811422bf6d5f5afd78f8584ae36b0 (commit) via b6ce8a4cc37d7449708f4a9f080c0b091011a04d (commit) from b3a731791da03bf0489e0eec11c6f1e412bb0085 (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/d04c8a1e86c811422bf6d5f5afd78f8584... commit d04c8a1e86c811422bf6d5f5afd78f8584ae36b0 Author: Igor Ivanov <[email protected]> Date: Thu Apr 23 17:05:54 2015 +0300 mpid/common/hcoll: Fix broken hcoll support - Fixed hcoll broken by #98c76f7 commit; - Resolved warnings reported by hcoll supported code; Signed-off-by: Igor Ivanov <[email protected]> Signed-off-by: Pavan Balaji <[email protected]> diff --git a/src/mpid/common/hcoll/hcoll.h b/src/mpid/common/hcoll/hcoll.h index 2c09320..5671a0f 100644 --- a/src/mpid/common/hcoll/hcoll.h +++ b/src/mpid/common/hcoll/hcoll.h @@ -10,13 +10,13 @@ extern int world_comm_destroying; int hcoll_comm_create(MPID_Comm * comm, void *param); int hcoll_comm_destroy(MPID_Comm * comm, void *param); -int hcoll_Barrier(MPID_Comm * comm_ptr, int *err); +int hcoll_Barrier(MPID_Comm * comm_ptr, mpir_errflag_t *err); int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm_ptr, int *err); + MPID_Comm * comm_ptr, mpir_errflag_t *err); int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, - void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, int *err); + void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, mpir_errflag_t *err); int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *err); + MPI_Op op, MPID_Comm * comm_ptr, mpir_errflag_t *err); int hcoll_Ibarrier_req(MPID_Comm * comm_ptr, MPID_Request ** request); int hcoll_Ibcast_req(void *buffer, int count, MPI_Datatype datatype, int root, diff --git a/src/mpid/common/hcoll/hcoll_ops.c b/src/mpid/common/hcoll/hcoll_ops.c index 0719ff6..13523fc 100644 --- a/src/mpid/common/hcoll/hcoll_ops.c +++ b/src/mpid/common/hcoll/hcoll_ops.c @@ -5,7 +5,7 @@ #define FUNCNAME hcoll_Barrier #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) -int hcoll_Barrier(MPID_Comm * comm_ptr, int *err) +int hcoll_Barrier(MPID_Comm * comm_ptr, mpir_errflag_t *err) { int rc; MPI_Comm comm = comm_ptr->handle; @@ -29,7 +29,7 @@ int hcoll_Barrier(MPID_Comm * comm_ptr, int *err) #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, - MPID_Comm * comm_ptr, int *err) + MPID_Comm * comm_ptr, mpir_errflag_t *err) { dte_data_representation_t dtype; int rc; @@ -73,7 +73,7 @@ int hcoll_Bcast(void *buffer, int count, MPI_Datatype datatype, int root, #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype datatype, - MPI_Op op, MPID_Comm * comm_ptr, int *err) + MPI_Op op, MPID_Comm * comm_ptr, mpir_errflag_t *err) { dte_data_representation_t Dtype; hcoll_dte_op_t *Op; @@ -97,7 +97,7 @@ int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype use_fallback = 1; } else { - rc = hcoll_collectives.coll_allreduce(sendbuf, recvbuf, count, Dtype, Op, + rc = hcoll_collectives.coll_allreduce((void *)sendbuf, recvbuf, count, Dtype, Op, comm_ptr->hcoll_priv.hcoll_context); if (HCOLL_SUCCESS != rc) { use_fallback = 1; @@ -124,7 +124,7 @@ int hcoll_Allreduce(const void *sendbuf, void *recvbuf, int count, MPI_Datatype #undef FCNAME #define FCNAME MPIU_QUOTE(FUNCNAME) int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, - void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, int *err) + void *rbuf, int rcount, MPI_Datatype rdtype, MPID_Comm * comm_ptr, mpir_errflag_t *err) { int is_homogeneous = 1, use_fallback = 0; MPI_Comm comm = comm_ptr->handle; @@ -149,7 +149,7 @@ int hcoll_Allgather(const void *sbuf, int scount, MPI_Datatype sdtype, use_fallback = 1; } else { - rc = hcoll_collectives.coll_allgather(sbuf, scount, stype, rbuf, rcount, rtype, + rc = hcoll_collectives.coll_allgather((void *)sbuf, scount, stype, rbuf, rcount, rtype, comm_ptr->hcoll_priv.hcoll_context); if (HCOLL_SUCCESS != rc) { use_fallback = 1; @@ -282,7 +282,7 @@ int hcoll_Iallgather_req(const void *sendbuf, int sendcount, MPI_Datatype sendty use_fallback = 1; } else { - rc = hcoll_collectives.coll_iallgather(sendbuf, sendcount, stype, recvbuf, recvcount, rtype, + rc = hcoll_collectives.coll_iallgather((void *)sendbuf, sendcount, stype, recvbuf, recvcount, rtype, comm_ptr->hcoll_priv.hcoll_context, rt_handle); if (HCOLL_SUCCESS != rc) { use_fallback = 1; @@ -337,7 +337,7 @@ int hcoll_Iallreduce_req(const void *sendbuf, void *recvbuf, int count, MPI_Data use_fallback = 1; } else { - rc = hcoll_collectives.coll_iallreduce(sendbuf, recvbuf, count, Dtype, Op, + rc = hcoll_collectives.coll_iallreduce((void *)sendbuf, recvbuf, count, Dtype, Op, comm_ptr->hcoll_priv.hcoll_context, rt_handle); if (HCOLL_SUCCESS != rc) { use_fallback = 1; diff --git a/src/mpid/common/hcoll/hcoll_rte.c b/src/mpid/common/hcoll/hcoll_rte.c index 7dc1c3b..b6a3ea7 100644 --- a/src/mpid/common/hcoll/hcoll_rte.c +++ b/src/mpid/common/hcoll/hcoll_rte.c @@ -103,7 +103,7 @@ static inline int count_total_dte_repeat_entries(struct dte_data_representation_ struct dte_generalized_iovec_t *dte_iovec = data->rep.general_rep->data_representation.data; int total_entries_number = 0; for (i = 0; i < dte_iovec->repeat_count; i++) { - total_entries_number += dte_iovec->repeat[i].n_builtin_elements; + total_entries_number += dte_iovec->repeat[i].n_elements; } return total_entries_number; } @@ -161,7 +161,7 @@ static int recv_nb(struct dte_data_representation_t data, repeat = data.rep.general_rep->data_representation.data->repeat; repeat_count = data.rep.general_rep->data_representation.data->repeat_count; for (i = 0; i < repeat_count; i++) { - for (j = 0; j < repeat[i].n_builtin_elements; j++) { + for (j = 0; j < repeat[i].n_elements; j++) { char *repeat_unit = (char *) &repeat[i]; buf = (void *) (repeat_unit + repeat[i].elements[j].base_offset); len = repeat[i].elements[j].packed_size; @@ -228,7 +228,7 @@ static int send_nb(dte_data_representation_t data, repeat = data.rep.general_rep->data_representation.data->repeat; repeat_count = data.rep.general_rep->data_representation.data->repeat_count; for (i = 0; i < repeat_count; i++) { - for (j = 0; j < repeat[i].n_builtin_elements; j++) { + for (j = 0; j < repeat[i].n_elements; j++) { char *repeat_unit = (char *) &repeat[i]; buf = (void *) (repeat_unit + repeat[i].elements[j].base_offset); len = repeat[i].elements[j].packed_size; http://git.mpich.org/mpich.git/commitdiff/b6ce8a4cc37d7449708f4a9f080c0b0910... commit b6ce8a4cc37d7449708f4a9f080c0b091011a04d Author: Igor Ivanov <[email protected]> Date: Tue Apr 21 16:38:36 2015 +0300 netmod/mxm: Add barrier before mxm_ep_destroy() call Signed-off-by: Igor Ivanov <[email protected]> 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 4d78565..d7704ca 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/mxm/mxm_init.c @@ -515,6 +515,8 @@ static int _mxm_fini(void) if (_mxm_obj.endpoint) MPIU_Free(_mxm_obj.endpoint); + _mxm_barrier(); + if (_mxm_obj.mxm_ep) mxm_ep_destroy(_mxm_obj.mxm_ep); ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/mxm/mxm_init.c | 2 ++ src/mpid/common/hcoll/hcoll.h | 8 ++++---- src/mpid/common/hcoll/hcoll_ops.c | 16 ++++++++-------- src/mpid/common/hcoll/hcoll_rte.c | 6 +++--- 4 files changed, 17 insertions(+), 15 deletions(-) hooks/post-receive -- MPICH primary repository