|
Line
Link Here
|
| 0 |
-- src/slurmd/common/xcpuinfo.c |
0 |
++ src/slurmd/common/xcpuinfo.c |
|
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 329-334
Link Here
|
| 329 |
} |
335 |
} |
| 330 |
} |
336 |
} |
| 331 |
|
337 |
|
|
|
338 |
if (xstrcasestr(slurm_conf.slurmd_params, "numa_as_socket")) { |
| 339 |
objtype[SOCKET] = HWLOC_OBJ_NODE; |
| 340 |
|
| 332 |
if (xstrcasestr(slurm_conf.slurmd_params, "l3cache_as_socket")) { |
341 |
if (xstrcasestr(slurm_conf.slurmd_params, "l3cache_as_socket")) { |
| 333 |
#if HWLOC_API_VERSION >= 0x00020000 |
342 |
#if HWLOC_API_VERSION >= 0x00020000 |
| 334 |
objtype[SOCKET] = HWLOC_OBJ_L3CACHE; |
343 |
objtype[SOCKET] = HWLOC_OBJ_L3CACHE; |
