Commit c1df83ef authored by Charles J Archer's avatar Charles J Archer
Browse files

Updates to latest OFI api (endpoint attribute location change)

parent f17d0ba5
...@@ -29,6 +29,7 @@ typedef struct fi_info info_t; ...@@ -29,6 +29,7 @@ typedef struct fi_info info_t;
typedef struct fi_cq_attr cq_attr_t; typedef struct fi_cq_attr cq_attr_t;
typedef struct fi_av_attr av_attr_t; typedef struct fi_av_attr av_attr_t;
typedef struct fi_domain_attr domain_attr_t; typedef struct fi_domain_attr domain_attr_t;
typedef struct fi_ep_attr ep_attr_t;
typedef struct fi_tx_attr tx_attr_t; typedef struct fi_tx_attr tx_attr_t;
typedef struct fi_cq_tagged_entry cq_tagged_entry_t; typedef struct fi_cq_tagged_entry cq_tagged_entry_t;
typedef struct fi_cq_err_entry cq_err_entry_t; typedef struct fi_cq_err_entry cq_err_entry_t;
......
...@@ -52,11 +52,11 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ ...@@ -52,11 +52,11 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
/* endpoint, so the netmod requires dynamic memory regions */ /* endpoint, so the netmod requires dynamic memory regions */
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.mode = FI_CONTEXT; hints.mode = FI_CONTEXT;
hints.ep_type = FI_EP_RDM; /* Reliable datagram */ hints.caps = FI_TAGGED; /* Tag matching interface */
hints.caps = FI_TAGGED; /* Tag matching interface */ hints.caps |= FI_CANCEL; /* Support cancel */
hints.caps |= FI_CANCEL; /* Support cancel */ hints.caps |= FI_DYNAMIC_MR; /* Global dynamic mem region */
hints.caps |= FI_DYNAMIC_MR; /* Global dynamic mem region */
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */
/* FI_VERSION provides binary backward and forward compatibility support */ /* FI_VERSION provides binary backward and forward compatibility support */
...@@ -73,14 +73,20 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ ...@@ -73,14 +73,20 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
domain_attr_t domain_attr; domain_attr_t domain_attr;
memset(&domain_attr, 0, sizeof(domain_attr)); memset(&domain_attr, 0, sizeof(domain_attr));
ep_attr_t ep_attr;
memset(&ep_attr, 0, sizeof(ep_attr));
tx_attr_t tx_attr; tx_attr_t tx_attr;
memset(&tx_attr, 0, sizeof(tx_attr)); memset(&tx_attr, 0, sizeof(tx_attr));
domain_attr.threading = FI_THREAD_ENDPOINT; hints.ep_attr = &ep_attr;
domain_attr.control_progress = FI_PROGRESS_AUTO; hints.ep_attr->type = FI_EP_RDM;
domain_attr.data_progress = FI_PROGRESS_AUTO;
hints.domain_attr = &domain_attr; domain_attr.threading = FI_THREAD_ENDPOINT;
hints.tx_attr = &tx_attr; domain_attr.control_progress = FI_PROGRESS_AUTO;
domain_attr.data_progress = FI_PROGRESS_AUTO;
hints.domain_attr = &domain_attr;
hints.tx_attr = &tx_attr;
FI_RC(fi_getinfo(fi_version, /* Interface version requested */ FI_RC(fi_getinfo(fi_version, /* Interface version requested */
NULL, /* Optional name or fabric to resolve */ NULL, /* Optional name or fabric to resolve */
...@@ -285,7 +291,7 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_ ...@@ -285,7 +291,7 @@ int MPID_nem_ofi_init(MPIDI_PG_t * pg_p, int pg_rank, char **bc_val_p, int *val_
int MPID_nem_ofi_finalize(void) int MPID_nem_ofi_finalize(void)
{ {
int mpi_errno = MPI_SUCCESS; int mpi_errno = MPI_SUCCESS;
int ret = 0; mpir_errflag_t ret = MPIR_ERR_NONE;
BEGIN_FUNC(FCNAME); BEGIN_FUNC(FCNAME);
/* --------------------------------------------- */ /* --------------------------------------------- */
......
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