[mpich2-commits] r6635 - mpich2/trunk/src/pm/hydra/tools/bind/hwloc

[balaji at mcs.anl.gov]

Author: balaji
Date: 2010-05-10 20:47:33 -0500 (Mon, 10 May 2010)
New Revision: 6635

Modified:
   mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c
Log:
Update hwloc usage in the glue layer to reflect the recent changes in
the API.

Modified: mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c
===================================================================
--- mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c	2010-05-11 01:47:28 UTC (rev 6634)
+++ mpich2/trunk/src/pm/hydra/tools/bind/hwloc/bind_hwloc.c	2010-05-11 01:47:33 UTC (rev 6635)
@@ -34,14 +34,14 @@
     topo_initialized = 1;
 
     /* Get the max number of processing elements */
-    HYDT_bind_info.total_proc_units = hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_PROC);
+    HYDT_bind_info.total_proc_units = hwloc_get_nbobjs_by_type(topology, HWLOC_OBJ_PU);
 
     /* We have qualified for basic binding support level */
     *support_level = HYDT_BIND_BASIC;
 
     /* Setup the machine level */
     /* get the System object */
-    obj_sys = hwloc_get_system_obj(topology);
+    obj_sys = hwloc_get_root_obj(topology);
     /* init Hydra structure */
     HYDT_bind_info.machine.type = HYDT_TOPO_MACHINE;
     HYDT_bind_info.machine.os_index = -1;       /* This is a set, not a single unit */
@@ -117,7 +117,7 @@
                 core_ptr->os_index = obj_core->os_index;
                 core_ptr->num_children =
                     hwloc_get_nbobjs_inside_cpuset_by_type(topology, obj_core->cpuset,
-                                                           HWLOC_OBJ_PROC);
+                                                           HWLOC_OBJ_PU);
 
                 HYDU_MALLOC(core_ptr->children, struct HYDT_topo_obj *,
                             sizeof(struct HYDT_topo_obj) * core_ptr->num_children, status);
@@ -127,7 +127,7 @@
                 for (thread = 0; thread < core_ptr->num_children; thread++) {
                     obj_proc =
                         hwloc_get_obj_inside_cpuset_by_type(topology, obj_core->cpuset,
-                                                            HWLOC_OBJ_PROC, thread);
+                                                            HWLOC_OBJ_PU, thread);
                     thread_ptr = &core_ptr->children[thread];
                     thread_ptr->type = HYDT_TOPO_THREAD;
                     thread_ptr->os_index = obj_proc->os_index;