[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-412-gac947d5

[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  ac947d5c4576ff9683eb945c823c0974173a7b4b (commit)
      from  1e51b91103ffb101586135c3ac49d4c0b53b6c2d (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/ac947d5c4576ff9683eb945c823c0974173a7b4b

commit ac947d5c4576ff9683eb945c823c0974173a7b4b
Author: Wesley Bland <wesley.bland at intel.com>
Date:   Tue Jul 26 09:08:23 2016 -0500

    CH4/OFI: Fix AV_TABLE mode
    
    Fixes csr/mpich-opa#387
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpid/ch4/netmod/ofi/ofi_impl.h b/src/mpid/ch4/netmod/ofi/ofi_impl.h
index cd80910..79aec52 100644
--- a/src/mpid/ch4/netmod/ofi/ofi_impl.h
+++ b/src/mpid/ch4/netmod/ofi/ofi_impl.h
@@ -22,16 +22,10 @@
 #define MPIDI_OFI_COMM(comm)     ((comm)->dev.ch4.netmod.ofi)
 #define MPIDI_OFI_COMM_TO_INDEX(comm,rank) \
     MPIDIU_comm_rank_to_pid(comm, rank, NULL, NULL)
-#ifdef MPIDI_OFI_CONFIG_USE_AV_TABLE
-#define MPIDI_OFI_COMM_TO_PHYS(comm,rank) \
-    ((fi_addr_t)MPIDI_OFI_COMM_TO_INDEX(comm,rank))
-#define MPIDI_OFI_TO_PHYS(avtid, rank)            ((fi_addr_t)rank)
-#else
 #define MPIDI_OFI_COMM_TO_PHYS(comm,rank)                       \
     MPIDI_OFI_AV(MPIDIU_comm_rank_to_av((comm), (rank))).dest
 #define MPIDI_OFI_TO_PHYS(avtid, lpid)                                 \
     MPIDI_OFI_AV(&MPIDIU_get_av((avtid), (lpid))).dest
-#endif
 
 #define MPIDI_OFI_WIN(win)     ((win)->dev.netmod.ofi)
 /*
diff --git a/src/mpid/ch4/netmod/ofi/ofi_init.h b/src/mpid/ch4/netmod/ofi/ofi_init.h
index d8a9579..31eceeb 100644
--- a/src/mpid/ch4/netmod/ofi/ofi_init.h
+++ b/src/mpid/ch4/netmod/ofi/ofi_init.h
@@ -285,12 +285,11 @@ static inline int MPIDI_OFI_init_generic(int rank,
 
     if (do_av_table) {
         av_attr.type = FI_AV_TABLE;
-        mapped_table = NULL;
     }
     else {
         av_attr.type = FI_AV_MAP;
-        mapped_table = (fi_addr_t *) MPL_malloc(size * sizeof(fi_addr_t));
     }
+    mapped_table           = (fi_addr_t *) MPL_malloc(size * sizeof(fi_addr_t));
 
     av_attr.rx_ctx_bits = MPIDI_OFI_MAX_ENDPOINTS_BITS;
 
@@ -373,12 +372,10 @@ static inline int MPIDI_OFI_init_generic(int rank,
     /* Table is constructed.  Map it    */
     /* -------------------------------- */
     MPIDI_OFI_CALL(fi_av_insert(MPIDI_Global.av, table, size, mapped_table, 0ULL, NULL), avmap);
-    if (!do_av_table) { /* AV_MAP */
-        for (i = 0; i < size; i++) {
-            MPIDI_OFI_AV(&MPIDIU_get_av(0, i)).dest = mapped_table[i];
-        }
-        MPL_free(mapped_table);
+    for (i = 0; i < size; i++) {
+        MPIDI_OFI_AV(&MPIDIU_get_av(0, i)).dest = mapped_table[i];
     }
+    MPL_free(mapped_table);
 
     /* -------------------------------- */
     /* Create the id to object maps     */
diff --git a/src/mpid/ch4/netmod/ofi/ofi_pre.h b/src/mpid/ch4/netmod/ofi/ofi_pre.h
index 5e2e966..8d3d690 100644
--- a/src/mpid/ch4/netmod/ofi/ofi_pre.h
+++ b/src/mpid/ch4/netmod/ofi/ofi_pre.h
@@ -179,9 +179,7 @@ typedef struct {
 } MPIDI_OFI_gpid_t;
 
 typedef struct {
-#ifndef MPIDI_OFI_CONFIG_USE_AV_TABLE
     fi_addr_t dest;
-#endif
 #ifdef MPIDI_OFI_CONFIG_USE_SCALABLE_ENDPOINTS
     unsigned ep_idx:MPIDI_OFI_MAX_ENDPOINTS_BITS;
 #endif

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

Summary of changes:
 src/mpid/ch4/netmod/ofi/ofi_impl.h |    6 ------
 src/mpid/ch4/netmod/ofi/ofi_init.h |   11 ++++-------
 src/mpid/ch4/netmod/ofi/ofi_pre.h  |    2 --
 3 files changed, 4 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
MPICH primary repository