Skip to content

Commit db6d993

Browse files
committed
Move level_zero_helpers to utils and remove duplicated file
1) Move level_zero_helpers to utils and rename it to utils_level_zero. 2) Remove the examples/common/utils_level_zero.h file (duplicated code) 3) Use new utils_level_zero in examples and benchmarks. Signed-off-by: Lukasz Dorau <[email protected]>
1 parent e01e4e8 commit db6d993

File tree

13 files changed

+27
-440
lines changed

13 files changed

+27
-440
lines changed

benchmark/CMakeLists.txt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ function(add_umf_benchmark)
4646
PRIVATE ${UMF_CMAKE_SOURCE_DIR}/include
4747
${UMF_CMAKE_SOURCE_DIR}/src/utils
4848
${UMF_CMAKE_SOURCE_DIR}/test/common
49-
${UMF_CMAKE_SOURCE_DIR}/examples/common)
49+
${UMF_CMAKE_SOURCE_DIR}/examples/common
50+
${LEVEL_ZERO_INCLUDE_DIRS})
5051

5152
target_link_directories(${BENCH_NAME} PRIVATE ${ARG_LIBDIRS})
5253

@@ -108,6 +109,7 @@ if(LINUX)
108109
set(LIBS_OPTIONAL ${LIBS_OPTIONAL} m)
109110
endif()
110111
if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
112+
set(SRCS_OPTIONAL ${SRCS_OPTIONAL} ../src/utils/utils_level_zero.cpp)
111113
set(LIBS_OPTIONAL ${LIBS_OPTIONAL} ze_loader)
112114
# TODO add CUDA
113115
endif()
@@ -116,7 +118,7 @@ endif()
116118

117119
add_umf_benchmark(
118120
NAME ubench
119-
SRCS ubench.c
121+
SRCS ubench.c ${SRCS_OPTIONAL}
120122
LIBS ${LIBS_OPTIONAL}
121123
LIBDIRS ${LIB_DIRS})
122124

examples/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if(UMF_BUILD_GPU_EXAMPLES
4848

4949
add_umf_executable(
5050
NAME ${EXAMPLE_NAME}
51-
SRCS level_zero_shared_memory/level_zero_shared_memory.c
51+
SRCS level_zero_shared_memory/level_zero_shared_memory.c ${UMF_CMAKE_SOURCE_DIR}/src/utils/utils_level_zero.cpp
5252
LIBS disjoint_pool ze_loader umf)
5353

5454
target_include_directories(
@@ -126,7 +126,7 @@ if(UMF_BUILD_GPU_EXAMPLES
126126

127127
add_umf_executable(
128128
NAME ${EXAMPLE_NAME}
129-
SRCS ipc_level_zero/ipc_level_zero.c
129+
SRCS ipc_level_zero/ipc_level_zero.c ${UMF_CMAKE_SOURCE_DIR}/src/utils/utils_level_zero.cpp
130130
LIBS disjoint_pool ze_loader umf)
131131

132132
target_include_directories(

0 commit comments

Comments
 (0)