Skip to content

Commit 0474e06

Browse files
authored
Merge pull request #695 from bgoglin/l0-byuuid
L0: switch to zesInit() Finally end the mess of forcing ZES_ENABLE_SYSMAN=1 in the environment that caused so many troubles to us and above layers in the last years.
2 parents 9fa2a8c + d3a04a7 commit 0474e06

File tree

11 files changed

+530
-316
lines changed

11 files changed

+530
-316
lines changed

config/hwloc.m4

+2-4
Original file line numberDiff line numberDiff line change
@@ -1410,10 +1410,9 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
14101410
echo
14111411
echo "**** LevelZero configuration"
14121412
1413-
HWLOC_PKG_CHECK_MODULES([LEVELZERO], [libze_loader], [zesDevicePciGetProperties], [level_zero/zes_api.h],
1413+
HWLOC_PKG_CHECK_MODULES([LEVELZERO], [libze_loader], [zesDriverGetDeviceByUuidExp], [level_zero/zes_api.h],
14141414
[hwloc_levelzero_happy=yes
14151415
HWLOC_LEVELZERO_REQUIRES=libze_loader
1416-
AC_CHECK_LIB([ze_loader], [zesInit], [AC_DEFINE(HWLOC_HAVE_ZESINIT, 1, [Define to 1 if zesInit is available])])
14171416
AC_CHECK_LIB([ze_loader], [zeDevicePciGetPropertiesExt], [AC_DEFINE(HWLOC_HAVE_ZEDEVICEPCIGETPROPERTIESEXT, 1, [Define to 1 if zeDevicePciGetPropertiesExt is available])])
14181417
], [hwloc_levelzero_happy=no])
14191418
if test x$hwloc_levelzero_happy = xno; then
@@ -1422,9 +1421,8 @@ return clGetDeviceIDs(0, 0, 0, NULL, NULL);
14221421
AC_CHECK_LIB([ze_loader], [zeInit], [
14231422
AC_CHECK_HEADERS([level_zero/zes_api.h], [
14241423
AC_CHECK_LIB([ze_loader],
1425-
[zesDevicePciGetProperties],
1424+
[zesDriverGetDeviceByUuidExp],
14261425
[HWLOC_LEVELZERO_LIBS="-lze_loader"
1427-
AC_CHECK_LIB([ze_loader], [zesInit], [AC_DEFINE(HWLOC_HAVE_ZESINIT, 1, [Define to 1 if zesInit is available])])
14281426
AC_CHECK_LIB([ze_loader], [zeDevicePciGetPropertiesExt], [AC_DEFINE(HWLOC_HAVE_ZEDEVICEPCIGETPROPERTIESEXT, 1, [Define to 1 if zeDevicePciGetPropertiesExt is available])])
14291427
], [hwloc_levelzero_happy=no])
14301428
], [hwloc_levelzero_happy=no])

doc/Makefile.am

+2
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,9 @@ man3_gpu_DATA = \
771771
$(DOX_MAN_DIR)/man3/hwloc_rsmi_get_device_osdev_by_index.3 \
772772
$(DOX_MAN_DIR)/man3/hwlocality_levelzero.3 \
773773
$(DOX_MAN_DIR)/man3/hwloc_levelzero_get_device_cpuset.3 \
774+
$(DOX_MAN_DIR)/man3/hwloc_levelzero_get_sysman_device_cpuset.3 \
774775
$(DOX_MAN_DIR)/man3/hwloc_levelzero_get_device_osdev.3 \
776+
$(DOX_MAN_DIR)/man3/hwloc_levelzero_get_sysman_device_osdev.3 \
775777
$(DOX_MAN_DIR)/man3/hwlocality_gl.3 \
776778
$(DOX_MAN_DIR)/man3/hwloc_gl_get_display_osdev_by_port_device.3 \
777779
$(DOX_MAN_DIR)/man3/hwloc_gl_get_display_osdev_by_name.3 \

doc/hwloc.doxy

+1
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ The hwloc core may also benefit from the following development packages:
490490
<li>the oneAPI Level Zero library.
491491
The relevant development package is usually <tt>level-zero-dev</tt>
492492
or <tt>level-zero-devel</tt>.
493+
The implementation must be recent enough to support <tt>zesDriverGetDeviceByUuidExp()</tt>
493494
</li>
494495
<li>libxml2 for full XML import/export support (otherwise, the
495496
internal minimalistic parser will only be able to import

0 commit comments

Comments
 (0)