Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions unified-runtime/cmake/FetchLevelZero.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ find_package(PkgConfig QUIET)
# so try using that to find the install and if it's not available
# just try to search for the path.
if(PkgConfig_FOUND)
pkg_check_modules(level-zero level-zero>=1.22.3)
pkg_check_modules(level-zero level-zero>=1.24.1)
if(level-zero_FOUND)
set(LEVEL_ZERO_INCLUDE_DIR "${level-zero_INCLUDEDIR}/level_zero")
set(LEVEL_ZERO_LIBRARY_SRC "${level-zero_LIBDIR}")
Expand Down Expand Up @@ -50,7 +50,7 @@ if(NOT LEVEL_ZERO_LIB_NAME AND NOT LEVEL_ZERO_LIBRARY)
set(UR_LEVEL_ZERO_LOADER_REPO "https://github.com/oneapi-src/level-zero.git")
# Remember to update the pkg_check_modules minimum version above when updating the
# clone tag
set(UR_LEVEL_ZERO_LOADER_TAG 35c037cdf4aa9a2e6df34b6f1ce1bdc86ac5422f)
set(UR_LEVEL_ZERO_LOADER_TAG 2e212f73c493bfab0e52381b175131a373db0ca5)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
set(UR_LEVEL_ZERO_LOADER_TAG 2e212f73c493bfab0e52381b175131a373db0ca5)
set(UR_LEVEL_ZERO_LOADER_TAG v1.24.1)

https://github.com/oneapi-src/level-zero/releases/tag/v1.24.1

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, that is not correct, my fix is merged later that 1.24.1 is created. how should I update pkg_check_modules properly then? I set the last version, but it seems to be not the right way

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, we'd need a new tag if we want those to match. @nrspruit ping.

But I don't think this failure: https://github.com/intel/llvm/actions/runs/17152112326/job/48661284629?pr=19851#step:8:112 is related to mismatch between this tag and the pkg config one. It looks like targets changed in level-zero, and we will need to change them as well in UR cmakes.

Copy link
Contributor Author

@KseniyaTikhomirova KseniyaTikhomirova Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this UR commit caused this regression, it works fine if I revert it 8959a5e
maybe clean build has never been done after? my changes prevent usage of prebuilt l0 adapter version since I request a newer one
I've created draft PR with revert and update to double check: #19853

Copy link
Contributor

@pbalcer pbalcer Aug 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe clean build has never been done after? my changes prevent usage of prebuilt l0 adapter version since I request a newer one

Seems likely. 8959a5e#diff-e83af30e7502eb85108ac495d4a4d50775e6b0eba4e27e8b682c797f8b8a168fR67-R74 looking at this, it seems that we no longer install ze_loader target. @sarnex Is this intentional?

old:
install(TARGETS ur_umf LevelZeroLoader LevelZeroLoader-Headers ComputeRuntimeLevelZero-Headers ze_loader level_zero_utils

new:
set(ADAPTER_L0_TARGETS_TO_INSTALL ur_umf LevelZeroLoader LevelZeroLoader-Headers ComputeRuntimeLevelZero-Headers)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merged it in 7b17ee3

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works for me locally. The target is defined here.

I meant that I don't see "ze-loader" version.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah right, yeah it was a typo :P

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

L0 tag will be added soon oneapi-src/level-zero#369

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


# Disable due to a bug https://github.com/oneapi-src/level-zero/issues/104
set(CMAKE_INCLUDE_CURRENT_DIR OFF)
Expand Down
Loading