levelzero: remove Device in some info attr name

Signed-off-by: Brice Goglin <Brice.Goglin@inria.fr>
open-mpi · Dec 3, 2021 · 116de93 · 116de93
1 parent 3bd2984
commit 116de93
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/doc/hwloc.doxy b/doc/hwloc.doxy
@@ -1994,7 +1994,8 @@ and SectorSize (in bytes).
 <dt>LevelZeroDeviceType (LevelZero OS devices or subdevices)</dt>
 <dd>A string describing the type of device, for instance "GPU", "CPU", "FPGA", etc.
 </dd>
-<dt>LevelZeroDeviceNumSlices, LevelZeroDeviceNumSubslicesPerSlice, LevelZeroDeviceNumEUsPerSubslice, LevelZeroDeviceNumThreadsPerEU  (LevelZero OS devices or subdevices)</dt>
+<dt>LevelZeroNumSlices, LevelZeroNumSubslicesPerSlice,</dt>
+<dt>LevelZeroNumEUsPerSubslice, LevelZeroNumThreadsPerEU (LevelZero OS devices or subdevices)</dt>
 <dd>The number of slices in the devices, of subslices per slice,
  of execution units (EU) per subslice, and of threads per EU.
 </dd>

diff --git a/hwloc/topology-levelzero.c b/hwloc/topology-levelzero.c
@@ -44,13 +44,13 @@ hwloc__levelzero_properties_get(ze_device_handle_t h, hwloc_obj_t osdev,
     }
     hwloc_obj_add_info(osdev, "LevelZeroDeviceType", type);
     snprintf(tmp, sizeof(tmp), "%u", prop.numSlices);
-    hwloc_obj_add_info(osdev, "LevelZeroDeviceNumSlices", tmp);
+    hwloc_obj_add_info(osdev, "LevelZeroNumSlices", tmp);
     snprintf(tmp, sizeof(tmp), "%u", prop.numSubslicesPerSlice);
-    hwloc_obj_add_info(osdev, "LevelZeroDeviceNumSubslicesPerSlice", tmp);
+    hwloc_obj_add_info(osdev, "LevelZeroNumSubslicesPerSlice", tmp);
     snprintf(tmp, sizeof(tmp), "%u", prop.numEUsPerSubslice);
-    hwloc_obj_add_info(osdev, "LevelZeroDeviceNumEUsPerSubslice", tmp);
+    hwloc_obj_add_info(osdev, "LevelZeroNumEUsPerSubslice", tmp);
     snprintf(tmp, sizeof(tmp), "%u", prop.numThreadsPerEU);
-    hwloc_obj_add_info(osdev, "LevelZeroDeviceNumThreadsPerEU", tmp);
+    hwloc_obj_add_info(osdev, "LevelZeroNumThreadsPerEU", tmp);
 
     if (prop.flags & ZE_DEVICE_PROPERTY_FLAG_SUBDEVICE)
       is_subdevice = 1;