Skip to content

Commit 1456b85

Browse files
committed
[PROTON][PTI] Avoid using L0 system headers if using a custom L0 build version
Signed-off-by: Anatoly Myachev <[email protected]>
1 parent ef7d239 commit 1456b85

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

scripts/build_pti_data/CMakeLists.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,23 @@ else()
1414
endif()
1515

1616
if(DEFINED ENV{LEVELZERO_INCLUDE_DIR})
17-
set(LevelZero_INCLUDE_DIR "$ENV{LEVELZERO_INCLUDE_DIR}")
17+
set(LevelZero_INCLUDE_DIR "$ENV{LEVELZERO_INCLUDE_DIR}" CACHE PATH "Path to Level Zero includes")
18+
message(STATUS "Using Level Zero from ENV: ${LevelZero_INCLUDE_DIR}")
19+
else()
20+
message(STATUS "LEVELZERO_INCLUDE_DIR env var not defined; try to use system version")
21+
endif()
22+
23+
if(DEFINED ENV{LEVELZERO_INCLUDE_DIR})
24+
# When defining `L0_INC_PATH` variable inside PTI, the following is not used: `PATH_SUFFIXES include`
25+
set(L0_INC_PATH "$ENV{LEVELZERO_INCLUDE_DIR}/include/" CACHE PATH "Path to Level Zero includes")
26+
message(STATUS "Using Level Zero from ENV to define L0_INC_PATH: ${L0_INC_PATH}")
1827
else()
1928
message(STATUS "LEVELZERO_INCLUDE_DIR env var not defined; try to use system version")
2029
endif()
2130

2231
if(DEFINED ENV{LEVELZERO_LIBRARY})
23-
set(LevelZero_LIBRARY "$ENV{LEVELZERO_LIBRARY}")
32+
set(LevelZero_LIBRARY "$ENV{LEVELZERO_LIBRARY}" CACHE PATH "Path to Level Zero library")
33+
message(STATUS "Using Level Zero from ENV: ${LevelZero_LIBRARY}")
2434
else()
2535
message(STATUS "LEVELZERO_LIBRARY env var not defined; try to use system version")
2636
endif()

scripts/install-pti.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,12 @@ function build_level_zero {
5151
echo "${LEVEL_ZERO_VERSION}" | awk -F. '{print $3}' > VERSION_PATCH
5252
mkdir build
5353
cd build
54-
cmake .. -DCMAKE_BUILD_TYPE=Release
54+
L0_INSTALL_PATH="$LEVEL_ZERO_PROJ/level-zero-${LEVEL_ZERO_VERSION}/install"
55+
cmake .. -DCMAKE_INSTALL_PREFIX="$L0_INSTALL_PATH" -DCMAKE_BUILD_TYPE=Release
5556
cmake --build . --config Release --parallel "$(nproc)"
56-
# cmake --build . --config Release --target install
57-
export LEVELZERO_INCLUDE_DIR="$LEVEL_ZERO_PROJ/level-zero-${LEVEL_ZERO_VERSION}"
58-
export LEVELZERO_LIBRARY="$LEVEL_ZERO_PROJ/level-zero-${LEVEL_ZERO_VERSION}/build/lib/libze_loader.so"
57+
cmake --build . --config Release --target install
58+
export LEVELZERO_INCLUDE_DIR="$L0_INSTALL_PATH"
59+
export LEVELZERO_LIBRARY="$L0_INSTALL_PATH/lib/libze_loader.so"
5960
}
6061

6162
function build_pti {

0 commit comments

Comments
 (0)