[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2b2-48-g58737d1

[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  58737d1e4590e9752431c57f4b5dd1dab63faabc (commit)
      from  bf3c7d4192c5d0ad3f47e89ad9fadc7c8e8e6bbc (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/58737d1e4590e9752431c57f4b5dd1dab63faabc

commit 58737d1e4590e9752431c57f4b5dd1dab63faabc
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Wed May 27 15:35:39 2015 -0500

    netmod/portals4: ignore reserved tag bits
    
    Two tag bits are reserved for error propagation. We need to make sure
    they are ignored by the network matching capabilities. Refs #2260
    
    No reviewer.

diff --git a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
index b8c633f..30dcde9 100644
--- a/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
+++ b/src/mpid/ch3/channels/nemesis/netmod/portals4/ptl_impl.h
@@ -152,7 +152,7 @@ typedef struct {
 #define NPTL_MATCH(tag_, ctx_, rank_) ((((ptl_match_bits_t)(tag_) << NPTL_MATCH_TAG_OFFSET) & NPTL_MATCH_TAG_MASK) | \
                                        (((ptl_match_bits_t)(ctx_) << NPTL_MATCH_CTX_OFFSET) & NPTL_MATCH_CTX_MASK) | \
                                        ((ptl_match_bits_t)(rank_) & NPTL_MATCH_RANK_MASK))
-#define NPTL_MATCH_IGNORE NPTL_MATCH_RANK_MASK
+#define NPTL_MATCH_IGNORE (NPTL_MATCH_RANK_MASK | (ptl_match_bits_t)(MPIR_TAG_ERROR_BIT | MPIR_TAG_PROC_FAILURE_BIT) << 32)
 #define NPTL_MATCH_IGNORE_ANY_TAG (NPTL_MATCH_IGNORE | NPTL_MATCH_TAG_MASK)
 
 #define NPTL_MATCH_GET_RANK(match_bits_) ((match_bits_) & NPTL_MATCH_RANK_MASK)

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

Summary of changes:
 .../channels/nemesis/netmod/portals4/ptl_impl.h    |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
MPICH primary repository