Skip to content

Commit 55777ab

Browse files
committed
[UR][L0] Fix runtime library linkage failure
Fix failure of mismatching runtime library types when linking ur_adapter_level_zero.dll with ze_loader.lib.
1 parent 2054243 commit 55777ab

File tree

2 files changed

+30
-0
lines changed

2 files changed

+30
-0
lines changed

cmake/level_zero_runtime_lib.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 75ee7e9..e9ed3e7 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -127,9 +127,6 @@ endif()
6+
7+
#MSVC compile flags
8+
if(MSVC)
9+
- string(REPLACE "/MDd" "/MTd" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
10+
- string(REPLACE "/MD" "/MT" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
11+
-
12+
if(NOT CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM)
13+
# treat warnings as errors
14+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX /W3")

unified-runtime/cmake/FetchLevelZero.cmake

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,22 @@ if (NOT DEFINED LEVEL_ZERO_LIBRARY OR NOT DEFINED LEVEL_ZERO_INCLUDE_DIR)
6363
FetchContent_MakeAvailable(level-zero-loader)
6464
FetchContent_GetProperties(level-zero-loader)
6565

66+
if(WIN32 AND level-zero-loader_SOURCE_DIR)
67+
# apply runtime library patch
68+
execute_process(
69+
COMMAND git apply ${PROJECT_SOURCE_DIR}/cmake/level_zero_runtime_lib.patch
70+
WORKING_DIRECTORY ${level-zero-loader_SOURCE_DIR}
71+
OUTPUT_VARIABLE UR_RUNTIME_LIB_PATCH_OUTPUT
72+
ERROR_VARIABLE UR_RUNTIME_LIB_PATCH_ERROR)
73+
74+
if(UR_RUNTIME_LIB_PATCH_OUTPUT)
75+
message(STATUS "Level Zero patch command output:\n${UR_RUNTIME_LIB_PATCH_OUTPUT}")
76+
endif()
77+
if(UR_RUNTIME_LIB_PATCH_ERROR)
78+
message(WARNING "Level Zero patch command failed with output:\n${UR_RUNTIME_LIB_PATCH_ERROR}")
79+
endif()
80+
endif()
81+
6682
# Restore original flags
6783
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_BAK}")
6884

0 commit comments

Comments
 (0)