[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.2-327-ga145fd7

[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  a145fd73a1bb7dd4f06c8c6b7dff5f6c3695f6f6 (commit)
      from  dc4891a0ee8e9262f4b094871d0e18039b704eae (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/a145fd73a1bb7dd4f06c8c6b7dff5f6c3695f6f6

commit a145fd73a1bb7dd4f06c8c6b7dff5f6c3695f6f6
Author: Ken Raffenetti <raffenet at mcs.anl.gov>
Date:   Tue May 24 13:45:59 2016 -0500

    pm/hydra: do binding with HYDRA_TOPO_DEBUG set
    
    Users were understandably confused that enabling topology debugging
    resulted in processes not actually being bound at launch. This commit
    enables binding when debugging is turned on.
    
    No reviewer.

diff --git a/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c b/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
index 013f1e7..8c97431 100644
--- a/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
+++ b/src/pm/hydra/tools/topo/hwloc/topo_hwloc.c
@@ -455,8 +455,8 @@ HYD_status HYDT_topo_hwloc_bind(int idx)
     if (!HYDT_topo_hwloc_info.user_binding || (idx < HYDT_topo_hwloc_info.num_bitmaps)) {
         id = idx % HYDT_topo_hwloc_info.num_bitmaps;
 
-        /* For debugging, print the binding bitmaps but don't actually bind. */
         if (HYDT_topo_info.debug) {
+            /* Print the binding bitmaps for debugging. */
             int i;
             char *binding;
 
@@ -473,11 +473,9 @@ HYD_status HYDT_topo_hwloc_bind(int idx)
             HYDU_dump_noprefix(stdout, "process %d binding: %s\n", idx, binding);
             MPL_free(binding);
         }
-        else {
-            hwloc_set_cpubind(topology, HYDT_topo_hwloc_info.bitmap[id], 0);
-            hwloc_set_membind(topology, HYDT_topo_hwloc_info.bitmap[id],
-                              HYDT_topo_hwloc_info.membind, 0);
-        }
+        hwloc_set_cpubind(topology, HYDT_topo_hwloc_info.bitmap[id], 0);
+        hwloc_set_membind(topology, HYDT_topo_hwloc_info.bitmap[id],
+                          HYDT_topo_hwloc_info.membind, 0);
     }
 
   fn_exit:

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

Summary of changes:
 src/pm/hydra/tools/topo/hwloc/topo_hwloc.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
MPICH primary repository