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 85727524ca0fc264a455627e293f758f5c2a7708 (commit) from 31628e6d2ac43f3dded92df936788eafc5cda3bf (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/85727524ca0fc264a455627e293f758f5c... commit 85727524ca0fc264a455627e293f758f5c2a7708 Author: Jithin Jose <[email protected]> Date: Tue Jan 27 13:22:53 2015 -0800 Updates for latest OFI-libfabric API Signed-off-by: Charles J Archer <[email protected]> diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c index 31b38fc..c38968c 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c @@ -105,7 +105,7 @@ static inline int MPID_nem_ofi_conn_req_callback(cq_tagged_entry_t * wc, MPID_Re gl_data.conn_req->dev.user_buf, OFI_KVSAPPSTRLEN, gl_data.mr, - 0, + FI_ADDR_UNSPEC, MPID_CONN_REQ, ~MPID_PROTOCOL_MASK, (void *) &(REQ_OFI(gl_data.conn_req)->ofi_context)), trecv); @@ -246,7 +246,7 @@ static inline int MPID_nem_ofi_preposted_callback(cq_tagged_entry_t * wc, MPID_R &rreq->dev.user_count, sizeof rreq->dev.user_count, gl_data.mr, - 0, + FI_ADDR_UNSPEC, MPID_MSG_RTS, ~MPID_PROTOCOL_MASK, &(REQ_OFI(rreq)->ofi_context)), trecv); END_FUNC_RC(FCNAME); @@ -307,7 +307,7 @@ int MPID_nem_ofi_cm_init(MPIDI_PG_t * pg_p, int pg_rank ATTRIBUTE((unused))) &persistent_req->dev.user_count, sizeof persistent_req->dev.user_count, gl_data.mr, - 0, + FI_ADDR_UNSPEC, MPID_MSG_RTS, ~MPID_PROTOCOL_MASK, (void *) &(REQ_OFI(persistent_req)->ofi_context)), trecv); @@ -326,7 +326,7 @@ int MPID_nem_ofi_cm_init(MPIDI_PG_t * pg_p, int pg_rank ATTRIBUTE((unused))) conn_req->dev.user_buf, OFI_KVSAPPSTRLEN, gl_data.mr, - 0, + FI_ADDR_UNSPEC, MPID_CONN_REQ, ~MPID_PROTOCOL_MASK, (void *) &(REQ_OFI(conn_req)->ofi_context)), trecv); gl_data.conn_req = conn_req; 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 9e5f048..07b119c 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h @@ -40,7 +40,7 @@ typedef int (*req_fn) (MPIDI_VC_t *, MPID_Request *, int *); /* Global Object for state tracking */ /* ******************************** */ typedef struct { - fi_addr_t bound_addr; /* This ranks bound address */ + char bound_addr[128]; /* This ranks bound address */ fi_addr_t any_addr; /* Specifies any source */ size_t bound_addrlen; /* length of the bound address */ struct fid_fabric *fabric; /* fabric object */ diff --git a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c index cefa87d..2fd7c87 100644 --- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c +++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c @@ -56,7 +56,6 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ hints.ep_type = FI_EP_RDM; /* Reliable datagram */ hints.caps = FI_TAGGED; /* Tag matching interface */ hints.caps |= FI_BUFFERED_RECV; /* Buffered receives */ - hints.caps |= FI_REMOTE_COMPLETE; /* Remote completion */ hints.caps |= FI_CANCEL; /* Support cancel */ hints.caps |= FI_DYNAMIC_MR; /* Global dynamic mem region */ @@ -80,7 +79,7 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ domain_attr.threading = FI_THREAD_ENDPOINT; domain_attr.control_progress = FI_PROGRESS_AUTO; - tx_attr.op_flags = FI_REMOTE_COMPLETE; + domain_attr.data_progress = FI_PROGRESS_AUTO; hints.domain_attr = &domain_attr; hints.tx_attr = &tx_attr; @@ -250,10 +249,8 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ /* ---------------------------------------------------- */ /* Insert the ANY_SRC address */ /* ---------------------------------------------------- */ - MPIU_CHKLMEM_MALLOC(null_addr, char *, 1 * gl_data.bound_addrlen, mpi_errno, "null_addr"); - memset(null_addr, 0, gl_data.bound_addrlen); - FI_RC(fi_av_insert(gl_data.av, null_addr, 1, &gl_data.any_addr, 0ULL, NULL), avmap); + gl_data.any_addr = FI_ADDR_UNSPEC; /* --------------------------------- */ /* Store the direct addresses in */ ----------------------------------------------------------------------- Summary of changes: src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_cm.c | 8 ++++---- .../ch3/channels/nemesis/netmod/ofi/ofi_impl.h | 2 +- .../ch3/channels/nemesis/netmod/ofi/ofi_init.c | 7 ++----- 3 files changed, 7 insertions(+), 10 deletions(-) hooks/post-receive -- MPICH primary repository