Commit 85727524 authored by Jithin Jose's avatar Jithin Jose Committed by Charles J Archer
Browse files

Updates for latest OFI-libfabric API


Signed-off-by: default avatarCharles J Archer <charles.j.archer@intel.com>
parent 31628e6d
......@@ -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;
......
......@@ -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 */
......
......@@ -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 */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment