[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-419-g072a6bf

[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  072a6bf7da26b0fcc7ccbc91cea611eb1ca42a9a (commit)
      from  c5b844ad3397bc654258595dc8bd595b6738296e (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/072a6bf7da26b0fcc7ccbc91cea611eb1ca42a9a

commit 072a6bf7da26b0fcc7ccbc91cea611eb1ca42a9a
Author: Hajime Fujita <hajime.fujita at intel.com>
Date:   Wed Aug 24 10:44:43 2016 -0500

    CH4/OFI: Specify FI_DELIVERY_COMPLETE for RMA
    
    FI_DELIVERY_COMPLETE flag has been missing when setting up TX
    context/issuing fi_*msg functions. This patch makes sure that RMA
    operations are issued with FI_DELIVERY_COMPLETE flag.
    
    Signed-off-by: Ken Raffenetti <raffenet at mcs.anl.gov>

diff --git a/src/mpid/ch4/netmod/ofi/ofi_init.h b/src/mpid/ch4/netmod/ofi/ofi_init.h
index 31eceeb..9ea0a18 100644
--- a/src/mpid/ch4/netmod/ofi/ofi_init.h
+++ b/src/mpid/ch4/netmod/ofi/ofi_init.h
@@ -305,6 +305,7 @@ static inline int MPIDI_OFI_init_generic(int rank,
         int ret;
         struct fi_tx_attr tx_attr;
         memset(&tx_attr, 0, sizeof(tx_attr));
+        tx_attr.op_flags = FI_DELIVERY_COMPLETE | FI_COMPLETION;
         MPIDI_OFI_CALL_RETURN(fi_stx_context(MPIDI_Global.domain,
                                              &tx_attr,
                                              &MPIDI_Global.stx_ctx, NULL /* context */), ret);
diff --git a/src/mpid/ch4/netmod/ofi/ofi_rma.h b/src/mpid/ch4/netmod/ofi/ofi_rma.h
index fda3960..0675b18 100644
--- a/src/mpid/ch4/netmod/ofi/ofi_rma.h
+++ b/src/mpid/ch4/netmod/ofi/ofi_rma.h
@@ -38,12 +38,12 @@
         {                                                               \
             MPIDI_OFI_REQUEST_CREATE((*(sigreq)), MPIR_REQUEST_KIND__RMA); \
             MPIR_cc_set((*(sigreq))->cc_ptr, 0);                        \
-            *(flags)                    = FI_COMPLETION;                \
+            *(flags)                    = FI_COMPLETION | FI_DELIVERY_COMPLETE; \
             *(ep)                       = MPIDI_OFI_WIN(win).ep;        \
         }                                                               \
         else {                                                          \
             *(ep) = MPIDI_OFI_WIN(win).ep_nocmpl;                       \
-            *(flags)                    = 0ULL;                         \
+            *(flags)                    = FI_DELIVERY_COMPLETE;         \
         }                                                               \
     } while (0)
 

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

Summary of changes:
 src/mpid/ch4/netmod/ofi/ofi_init.h |    1 +
 src/mpid/ch4/netmod/ofi/ofi_rma.h  |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
MPICH primary repository