[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.0.4-246-g438a49f

[mysql vizuser]

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  438a49fe9eba9cdb63bc4dc07cef3fc4031afd03 (commit)
       via  f44e3d4a8675182c6e1e21fd3d47c7bcd96af07e (commit)
       via  038aa7cd0f7cda525ed40469bc5f0341822fa152 (commit)
      from  c3a8a817c9611dffc5b4bbdbbe6ad09aa5af6342 (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/438a49fe9eba9cdb63bc4dc07cef3fc4031afd03

commit 438a49fe9eba9cdb63bc4dc07cef3fc4031afd03
Author: Michael Blocksome <blocksom at us.ibm.com>
Date:   Tue May 21 09:01:19 2013 -0500

    better bgq 'is local task' fix.

diff --git a/src/mpid/pamid/src/pamix/pamix.c b/src/mpid/pamid/src/pamix/pamix.c
index e213d3a..ab16295 100644
--- a/src/mpid/pamid/src/pamix/pamix.c
+++ b/src/mpid/pamid/src/pamix/pamix.c
@@ -113,7 +113,9 @@ PAMIX_Initialize(pami_client_t client)
         PAMIX_Extensions.is_local_task.base    = PAMI_EXTENSION_FUNCTION(uint8_t *, "base",    PAMIX_Extensions.is_local_task.extension);
         PAMIX_Extensions.is_local_task.stride  = PAMI_EXTENSION_FUNCTION(uintptr_t, "stride",  PAMIX_Extensions.is_local_task.extension);
         PAMIX_Extensions.is_local_task.bitmask = PAMI_EXTENSION_FUNCTION(uintptr_t, "bitmask", PAMIX_Extensions.is_local_task.extension);
+#if defined(MPID_USE_NODE_IDS)
         PAMIX_Extensions.is_local_task.node_info = PAMI_EXTENSION_FUNCTION(node_info_fn, "get_node_info", PAMIX_Extensions.is_local_task.extension);
+#endif
       }
 
 #if defined(PAMIX_IS_LOCAL_TASK_STRIDE) && defined(PAMIX_IS_LOCAL_TASK_BITMASK)

http://git.mpich.org/mpich.git/commitdiff/f44e3d4a8675182c6e1e21fd3d47c7bcd96af07e

commit f44e3d4a8675182c6e1e21fd3d47c7bcd96af07e
Author: Michael Blocksome <blocksom at us.ibm.com>
Date:   Tue May 21 08:56:07 2013 -0500

    Revert "Do not assert when a pami extension is missing."
    
    This reverts commit e4fa6c06477c329c83d71479b667a70a6ef570dc.

diff --git a/src/mpid/pamid/src/pamix/pamix.c b/src/mpid/pamid/src/pamix/pamix.c
index e274176..e213d3a 100644
--- a/src/mpid/pamid/src/pamix/pamix.c
+++ b/src/mpid/pamid/src/pamix/pamix.c
@@ -81,6 +81,7 @@ pamix_extension_info_t PAMIX_Extensions;
 ({                                                      \
   void* fn;                                             \
   fn = PAMI_Extension_symbol(ext, name);                \
+  PAMIX_assert_always(fn != NULL);                      \
   (type)fn;                                             \
 })
 void

http://git.mpich.org/mpich.git/commitdiff/038aa7cd0f7cda525ed40469bc5f0341822fa152

commit 038aa7cd0f7cda525ed40469bc5f0341822fa152
Author: Michael Blocksome <blocksom at us.ibm.com>
Date:   Tue May 21 08:55:11 2013 -0500

    compile fix for bgq unsupported MPID_Node_id_t

diff --git a/src/mpid/pamid/src/mpidi_util.c b/src/mpid/pamid/src/mpidi_util.c
index 2bd89db..e600dfe 100644
--- a/src/mpid/pamid/src/mpidi_util.c
+++ b/src/mpid/pamid/src/mpidi_util.c
@@ -1907,7 +1907,7 @@ void MPIDI_collsel_pami_tune_cleanup()
   MPIDI_collsel_free_advisor_params(&MPIDI_Collsel_advisor_params);
 }
 
-
+#if defined(MPID_USE_NODE_IDS)
 #undef FUNCNAME
 #define FUNCNAME MPID_Get_node_id
 #undef FCNAME
@@ -1958,4 +1958,5 @@ int MPID_Get_max_node_id(MPID_Comm *comm, MPID_Node_id_t *max_id_p)
   fn_fail:
   return mpi_errno;
 }
+#endif
 #undef FUNCNAME

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

Summary of changes:
 src/mpid/pamid/src/mpidi_util.c  |    3 ++-
 src/mpid/pamid/src/pamix/pamix.c |    3 +++
 2 files changed, 5 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
MPICH primary repository