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 1a6eb4d6026a2999403d9731ceb1c8b357fab476 (commit) from c352addda5ac6f9857788b7140e1e917d7cecb0d (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/1a6eb4d6026a2999403d9731ceb1c8b357... commit 1a6eb4d6026a2999403d9731ceb1c8b357fab476 Author: Ken Raffenetti <[email protected]> Date: Fri Nov 13 14:20:52 2015 -0600 ch3/netmod/ofi: use MPI_Aint for count The type for count in netmod send operations was promoted to handle values larger than INT_MAX. Other netmods had already been updated, but not OFI. No reviewer. diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h index 390f2ec..c780bc0 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -265,16 +265,16 @@ static inline int MPID_nem_ofi_create_req(MPID_Request ** request, int refcnt) DECLARE_TWO_API_SETS(int, MPID_nem_ofi_recv_posted, struct MPIDI_VC *vc, struct MPID_Request *req); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_send, struct MPIDI_VC *vc, const void *buf, int count,\ +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_send, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm,\ int context_offset, struct MPID_Request **request); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_isend, struct MPIDI_VC *vc, const void *buf, int count,\ +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_isend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm,\ int context_offset, struct MPID_Request **request); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_ssend, struct MPIDI_VC *vc, const void *buf, int count,\ +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_ssend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm, int context_offset, struct MPID_Request **request); -DECLARE_TWO_API_SETS(int, MPID_nem_ofi_issend, struct MPIDI_VC *vc, const void *buf, int count,\ +DECLARE_TWO_API_SETS(int, MPID_nem_ofi_issend, struct MPIDI_VC *vc, const void *buf, MPI_Aint count,\ MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm,\ int context_offset, struct MPID_Request **request); int MPID_nem_ofi_cancel_send(struct MPIDI_VC *vc, struct MPID_Request *sreq); diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c index 20db939..5b2ce15 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_tagged_template.c @@ -101,7 +101,7 @@ int ADD_SUFFIX(MPID_nem_ofi_recv_callback)(cq_tagged_entry_t * wc, MPID_Request static inline int ADD_SUFFIX(do_isend)(struct MPIDI_VC *vc, const void *buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int dest, int tag, @@ -199,7 +199,7 @@ ADD_SUFFIX(do_isend)(struct MPIDI_VC *vc, #define FCNAME DECL_FUNC(MPID_nem_ofi_send) int ADD_SUFFIX(MPID_nem_ofi_send)(struct MPIDI_VC *vc, const void *buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm, int context_offset, struct MPID_Request **request) @@ -217,7 +217,7 @@ int ADD_SUFFIX(MPID_nem_ofi_send)(struct MPIDI_VC *vc, #define FCNAME DECL_FUNC(MPID_nem_ofi_isend) int ADD_SUFFIX(MPID_nem_ofi_isend)(struct MPIDI_VC *vc, const void *buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm, int context_offset, struct MPID_Request **request) @@ -234,7 +234,7 @@ int ADD_SUFFIX(MPID_nem_ofi_isend)(struct MPIDI_VC *vc, #define FCNAME DECL_FUNC(MPID_nem_ofi_ssend) int ADD_SUFFIX(MPID_nem_ofi_ssend)(struct MPIDI_VC *vc, const void *buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int dest, int tag, MPID_Comm * comm, int context_offset, struct MPID_Request **request) @@ -251,7 +251,7 @@ int ADD_SUFFIX(MPID_nem_ofi_ssend)(struct MPIDI_VC *vc, #define FCNAME DECL_FUNC(MPID_nem_ofi_issend) int ADD_SUFFIX(MPID_nem_ofi_issend)(struct MPIDI_VC *vc, const void *buf, - int count, + MPI_Aint count, MPI_Datatype datatype, int dest, int tag, ----------------------------------------------------------------------- Summary of changes: .../ch3/channels/nemesis/netmod/ofi/ofi_impl.h | 8 ++++---- .../nemesis/netmod/ofi/ofi_tagged_template.c | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- MPICH primary repository