|
Lines 151-156
Link Here
|
| 151 |
if (obj->type == HWLOC_OBJ_CORE) |
151 |
if (obj->type == HWLOC_OBJ_CORE) |
| 152 |
return 1; |
152 |
return 1; |
| 153 |
|
153 |
|
|
|
154 |
#if HWLOC_API_VERSION >= 0x00020000 |
| 155 |
if (obj->type == HWLOC_OBJ_NODE) |
| 156 |
if(obj->parent != NULL) |
| 157 |
return _core_child_count(topology, obj->parent); |
| 158 |
#endif |
| 159 |
|
| 154 |
for (i = 0; i < obj->arity; i++) |
160 |
for (i = 0; i < obj->arity; i++) |
| 155 |
count += _core_child_count(topology, obj->children[i]); |
161 |
count += _core_child_count(topology, obj->children[i]); |
| 156 |
return count; |
162 |
return count; |
|
Lines 319-325
Link Here
|
| 319 |
objtype[SOCKET] = HWLOC_OBJ_SOCKET; |
325 |
objtype[SOCKET] = HWLOC_OBJ_SOCKET; |
| 320 |
objtype[CORE] = HWLOC_OBJ_CORE; |
326 |
objtype[CORE] = HWLOC_OBJ_CORE; |
| 321 |
objtype[PU] = HWLOC_OBJ_PU; |
327 |
objtype[PU] = HWLOC_OBJ_PU; |
|
|
328 |
#if HWLOC_API_VERSION >= 0x00020000 |
| 329 |
obj = hwloc_get_next_obj_by_type(topology, HWLOC_OBJ_NODE, NULL); |
| 330 |
|
| 331 |
if(obj != NULL) |
| 332 |
if(obj->parent != NULL) |
| 333 |
if (hwloc_get_type_depth(topology, obj->parent->type) > |
| 334 |
#else |
| 322 |
if (hwloc_get_type_depth(topology, HWLOC_OBJ_NODE) > |
335 |
if (hwloc_get_type_depth(topology, HWLOC_OBJ_NODE) > |
|
|
336 |
#endif |
| 323 |
hwloc_get_type_depth(topology, HWLOC_OBJ_SOCKET)) { |
337 |
hwloc_get_type_depth(topology, HWLOC_OBJ_SOCKET)) { |
| 324 |
if (xstrcasestr(slurm_conf.sched_params, "Ignore_NUMA")) { |
338 |
if (xstrcasestr(slurm_conf.sched_params, "Ignore_NUMA")) { |
| 325 |
info("Ignoring NUMA nodes within a socket"); |
339 |
info("Ignoring NUMA nodes within a socket"); |
