diff --git a/scripts/build_pti_data/CMakeLists.txt b/scripts/build_pti_data/CMakeLists.txt index e2532c78d4..bf7e5bf763 100644 --- a/scripts/build_pti_data/CMakeLists.txt +++ b/scripts/build_pti_data/CMakeLists.txt @@ -14,13 +14,15 @@ else() endif() if(DEFINED ENV{LEVELZERO_INCLUDE_DIR}) - set(LevelZero_INCLUDE_DIR "$ENV{LEVELZERO_INCLUDE_DIR}") + set(LevelZero_INCLUDE_DIR "$ENV{LEVELZERO_INCLUDE_DIR}" CACHE PATH "Path to Level Zero includes") + message(STATUS "Using Level Zero from ENV: ${LevelZero_INCLUDE_DIR}") else() message(STATUS "LEVELZERO_INCLUDE_DIR env var not defined; try to use system version") endif() if(DEFINED ENV{LEVELZERO_LIBRARY}) - set(LevelZero_LIBRARY "$ENV{LEVELZERO_LIBRARY}") + set(LevelZero_LIBRARY "$ENV{LEVELZERO_LIBRARY}" CACHE PATH "Path to Level Zero library") + message(STATUS "Using Level Zero from ENV: ${LevelZero_LIBRARY}") else() message(STATUS "LEVELZERO_LIBRARY env var not defined; try to use system version") endif() diff --git a/scripts/install-pti.sh b/scripts/install-pti.sh index 88f661771a..bb32cfe071 100755 --- a/scripts/install-pti.sh +++ b/scripts/install-pti.sh @@ -51,11 +51,12 @@ function build_level_zero { echo "${LEVEL_ZERO_VERSION}" | awk -F. '{print $3}' > VERSION_PATCH mkdir build cd build - cmake .. -DCMAKE_BUILD_TYPE=Release + L0_INSTALL_PATH="$LEVEL_ZERO_PROJ/level-zero-${LEVEL_ZERO_VERSION}/install" + cmake .. -DCMAKE_INSTALL_PREFIX="$L0_INSTALL_PATH" -DCMAKE_BUILD_TYPE=Release cmake --build . --config Release --parallel "$(nproc)" - # cmake --build . --config Release --target install - export LEVELZERO_INCLUDE_DIR="$LEVEL_ZERO_PROJ/level-zero-${LEVEL_ZERO_VERSION}" - export LEVELZERO_LIBRARY="$LEVEL_ZERO_PROJ/level-zero-${LEVEL_ZERO_VERSION}/build/lib/libze_loader.so" + cmake --build . --config Release --target install + export LEVELZERO_INCLUDE_DIR="$L0_INSTALL_PATH/include" + export LEVELZERO_LIBRARY="$L0_INSTALL_PATH/lib/libze_loader.so" } function build_pti { diff --git a/third_party/proton/proton/profile.py b/third_party/proton/proton/profile.py index 52ca8a87a7..82e778ec19 100644 --- a/third_party/proton/proton/profile.py +++ b/third_party/proton/proton/profile.py @@ -24,12 +24,14 @@ def _select_backend() -> str: elif backend == "xpu": global UTILS_CACHE_PATH UTILS_CACHE_PATH = triton.runtime.driver.active.build_proton_help_lib() - files = importlib.metadata.files('intel-pti') - if files is not None: - for f in files: - if f.name == 'libpti_view.so': - os.environ["TRITON_XPUPTI_LIB_PATH"] = str(pathlib.Path(f.locate()).parent.resolve()) - break + try: + if (files := importlib.metadata.files('intel-pti')) is not None: + for f in files: + if f.name == 'libpti_view.so': + os.environ["TRITON_XPUPTI_LIB_PATH"] = str(pathlib.Path(f.locate()).parent.resolve()) + break + except importlib.metadata.PackageNotFoundError: + pass return "xpupti" else: raise ValueError("No backend is available for the current target.")