[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2a2-180-gc1df83e

[Service Account]

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  c1df83ef4c7a47cfe4738a48044b00c56deb9761 (commit)
      from  f17d0ba5d9fa3147913ca0dc8d87847ecb5bb485 (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/c1df83ef4c7a47cfe4738a48044b00c56deb9761

commit c1df83ef4c7a47cfe4738a48044b00c56deb9761
Author: Charles J Archer <charles.j.archer at intel.com>
Date:   Fri Feb 27 10:18:27 2015 -0800

    Updates to latest OFI api (endpoint attribute location change)

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 07b119c..652cea6 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_impl.h
@@ -29,6 +29,7 @@ typedef struct fi_info info_t;
 typedef struct fi_cq_attr cq_attr_t;
 typedef struct fi_av_attr av_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_cq_tagged_entry cq_tagged_entry_t;
 typedef struct fi_cq_err_entry cq_err_entry_t;
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 150f5a2..7e51a58 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c
+++ b/src/mpid/ch3/channels/nemesis/netmod/ofi/ofi_init.c
@@ -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        */
     /* ------------------------------------------------------------------------ */
     memset(&hints, 0, sizeof(hints));
-    hints.mode    = FI_CONTEXT;
-    hints.ep_type = FI_EP_RDM;     /* Reliable datagram         */
-    hints.caps    = FI_TAGGED;     /* Tag matching interface    */
-    hints.caps   |= FI_CANCEL;     /* Support cancel            */
-    hints.caps   |= FI_DYNAMIC_MR; /* Global dynamic mem region */
+    hints.mode         = FI_CONTEXT;
+    hints.caps         = FI_TAGGED;     /* Tag matching interface    */
+    hints.caps        |= FI_CANCEL;     /* Support cancel            */
+    hints.caps        |= FI_DYNAMIC_MR; /* Global dynamic mem region */
+
 
     /* ------------------------------------------------------------------------ */
     /* 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_
     domain_attr_t 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;
     memset(&tx_attr, 0, sizeof(tx_attr));
 
-    domain_attr.threading = FI_THREAD_ENDPOINT;
-    domain_attr.control_progress = FI_PROGRESS_AUTO;
-    domain_attr.data_progress = FI_PROGRESS_AUTO;
-    hints.domain_attr = &domain_attr;
-    hints.tx_attr = &tx_attr;
+    hints.ep_attr       = &ep_attr;
+    hints.ep_attr->type =  FI_EP_RDM;
+
+    domain_attr.threading        =  FI_THREAD_ENDPOINT;
+    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               */
                      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_
 int MPID_nem_ofi_finalize(void)
 {
     int mpi_errno = MPI_SUCCESS;
-    int ret = 0;
+    mpir_errflag_t ret = MPIR_ERR_NONE;
     BEGIN_FUNC(FCNAME);
 
     /* --------------------------------------------- */

-----------------------------------------------------------------------

Summary of changes:
 .../ch3/channels/nemesis/netmod/ofi/ofi_impl.h     |    1 +
 .../ch3/channels/nemesis/netmod/ofi/ofi_init.c     |   28 ++++++++++++--------
 2 files changed, 18 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
MPICH primary repository