hwloc: do not count not allowed cores in df_search_cores

ggouaillardet · ggouaillardet · commit a4646489e3b2 · 2015-09-18T15:40:05.000+09:00
(cherry picked from commit open-mpi/ompi@975b6fd)
diff --git a/opal/mca/hwloc/base/hwloc_base_util.c b/opal/mca/hwloc/base/hwloc_base_util.c
@@ -492,6 +492,10 @@ static void df_search_cores(hwloc_obj_t obj, unsigned int *cnt)
             obj->userdata = (void*)data;
         }
         if (NULL == opal_hwloc_base_cpu_set) {
+            if (!hwloc_bitmap_isincluded(obj->cpuset, obj->allowed_cpuset)) {
+                /* do not count not allowed cores */
+                return;
+            }
             data->npus = 1;
         }
         *cnt += data->npus;

Original file line number	Diff line number	Diff line change
`@@ -492,6 +492,10 @@ static void df_search_cores(hwloc_obj_t obj, unsigned int *cnt)`
`492`	`492`	`obj->userdata = (void*)data;`
`493`	`493`	`}`
`494`	`494`	`if (NULL == opal_hwloc_base_cpu_set) {`
	`495`	`+ if (!hwloc_bitmap_isincluded(obj->cpuset, obj->allowed_cpuset)) {`
	`496`	`+ /* do not count not allowed cores */`
	`497`	`+ return;`
	`498`	`+ }`
`495`	`499`	`data->npus = 1;`
`496`	`500`	`}`
`497`	`501`	`*cnt += data->npus;`