Skip to content

Commit 9d8c0f6

Browse files
bratpiorkabratpiorka
committed
a
1 parent 4a93eeb commit 9d8c0f6

14 files changed

+149
-195
lines changed

‎cmake/FindCUDA.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ else()
3434
if(CUDA_FIND_REQUIRED)
3535
message(FATAL_ERROR ${MSG_NOT_FOUND})
3636
else()
37-
message(WARNING ${MSG_NOT_FOUND})
37+
message(STATUS ${MSG_NOT_FOUND})
3838
endif()
3939
endif()

‎cmake/FindJEMALLOC.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ else()
2323
if(JEMALLOC_FIND_REQUIRED)
2424
message(FATAL_ERROR ${MSG_NOT_FOUND})
2525
else()
26-
message(WARNING ${MSG_NOT_FOUND})
26+
message(STATUS ${MSG_NOT_FOUND})
2727
endif()
2828
endif()
2929

@@ -41,6 +41,6 @@ else()
4141
if(JEMALLOC_FIND_REQUIRED)
4242
message(FATAL_ERROR ${MSG_NOT_FOUND})
4343
else()
44-
message(WARNING ${MSG_NOT_FOUND})
44+
message(STATUS ${MSG_NOT_FOUND})
4545
endif()
4646
endif()

‎cmake/FindLIBHWLOC.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@ else()
7676
if(LIBHWLOC_FIND_REQUIRED)
7777
message(FATAL_ERROR ${MSG_NOT_FOUND})
7878
else()
79-
message(WARNING ${MSG_NOT_FOUND})
79+
message(STATUS ${MSG_NOT_FOUND})
8080
endif()
8181
endif()

‎cmake/FindLIBNUMA.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ else()
1515
if(LIBNUMA_FIND_REQUIRED)
1616
message(FATAL_ERROR ${MSG_NOT_FOUND})
1717
else()
18-
message(WARNING ${MSG_NOT_FOUND})
18+
message(STATUS ${MSG_NOT_FOUND})
1919
endif()
2020
endif()

‎cmake/FindTBB.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ else()
2121
if(TBB_FIND_REQUIRED)
2222
message(FATAL_ERROR ${MSG_NOT_FOUND})
2323
else()
24-
message(WARNING ${MSG_NOT_FOUND})
24+
message(STATUS ${MSG_NOT_FOUND})
2525
endif()
2626
endif()
2727

‎cmake/FindZE_LOADER.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@ else()
3434
if(ZE_LOADER_FIND_REQUIRED)
3535
message(FATAL_ERROR ${MSG_NOT_FOUND})
3636
else()
37-
message(WARNING ${MSG_NOT_FOUND})
37+
message(STATUS ${MSG_NOT_FOUND})
3838
endif()
3939
endif()

‎cmake/helpers.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,7 @@ function(add_umf_library)
386386
target_include_directories(
387387
${ARG_NAME}
388388
PRIVATE ${UMF_CMAKE_SOURCE_DIR}/include
389+
${UMF_CMAKE_SOURCE_DIR}/src
389390
${UMF_CMAKE_SOURCE_DIR}/src/utils
390391
${UMF_CMAKE_SOURCE_DIR}/src/base_alloc
391392
${UMF_CMAKE_SOURCE_DIR}/src/coarse)

‎src/CMakeLists.txt

Lines changed: 4 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,38 +30,16 @@ set(UMF_COMMON_COMPILE_DEFINITIONS
3030
${UMF_COMMON_COMPILE_DEFINITIONS} UMF_VERSION=${UMF_VERSION}
3131
UMF_ALL_CMAKE_VARIABLES="${UMF_ALL_CMAKE_VARIABLES}")
3232

33-
set(BA_SOURCES
34-
${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc.c
35-
${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_linear.c
36-
${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_global.c)
37-
3833
add_subdirectory(utils)
34+
add_subdirectory(base_alloc)
3935
add_subdirectory(coarse)
4036

41-
set(UMF_LIBS $<BUILD_INTERFACE:umf_utils> $<BUILD_INTERFACE:coarse>)
42-
43-
set(CTL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ctl/ctl.c)
44-
45-
if(LINUX)
46-
set(BA_SOURCES ${BA_SOURCES}
47-
${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_linux.c)
48-
elseif(WINDOWS)
49-
set(BA_SOURCES ${BA_SOURCES}
50-
${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_windows.c)
51-
elseif(MACOSX)
52-
set(BA_SOURCES ${BA_SOURCES}
53-
${CMAKE_CURRENT_SOURCE_DIR}/base_alloc/base_alloc_linux.c)
54-
endif()
55-
56-
set(BA_SOURCES
57-
${BA_SOURCES}
58-
PARENT_SCOPE)
37+
set(UMF_LIBS umf_utils umf_ba coarse)
5938

6039
set(HWLOC_DEPENDENT_SOURCES topology.c)
6140

6241
set(UMF_SOURCES
63-
${BA_SOURCES}
64-
${CTL_SOURCES}
42+
ctl/ctl.c
6543
libumf.c
6644
ipc.c
6745
ipc_cache.c
@@ -179,6 +157,7 @@ target_link_directories(umf PRIVATE ${UMF_PRIVATE_LIBRARY_DIRS})
179157
target_compile_definitions(umf PRIVATE ${UMF_COMMON_COMPILE_DEFINITIONS})
180158

181159
add_dependencies(umf coarse)
160+
add_dependencies(umf umf_ba)
182161

183162
if(UMF_LINK_HWLOC_STATICALLY)
184163
add_dependencies(umf ${UMF_HWLOC_NAME})
@@ -228,8 +207,6 @@ target_include_directories(
228207

229208
install(TARGETS umf EXPORT ${PROJECT_NAME}-targets)
230209

231-
add_subdirectory(pool)
232-
233210
if(UMF_PROXY_LIB_ENABLED)
234211
add_subdirectory(proxy_lib)
235212
endif()

‎src/base_alloc/CMakeLists.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Copyright (C) 2025 Intel Corporation
2+
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
3+
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
4+
5+
include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
6+
7+
set(UMF_BA_SOURCES_COMMON base_alloc_global.c base_alloc.c base_alloc_linear.c)
8+
set(UMF_BA_SOURCES_LINUX base_alloc_linux.c)
9+
set(UMF_BA_SOURCES_WINDOWS base_alloc_windows.c)
10+
11+
if(LINUX OR MACOSX)
12+
set(UMF_BA_SOURCES ${UMF_BA_SOURCES_COMMON} ${UMF_BA_SOURCES_LINUX})
13+
elseif(WINDOWS)
14+
set(UMF_BA_SOURCES ${UMF_BA_SOURCES_COMMON} ${UMF_BA_SOURCES_WINDOWS})
15+
endif()
16+
17+
add_umf_library(
18+
NAME umf_ba
19+
TYPE STATIC
20+
SRCS ${UMF_BA_SOURCES}
21+
LIBS umf_utils)
22+
23+
target_include_directories(umf_ba
24+
PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/base_alloc)

‎src/coarse/CMakeLists.txt

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,17 @@
44

55
include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
66

7-
set(COARSE_SOURCES coarse.c ../ravl/ravl.c)
8-
9-
if(UMF_BUILD_SHARED_LIBRARY AND (NOT WINDOWS))
10-
set(COARSE_EXTRA_SRCS ${BA_SOURCES})
11-
set(COARSE_EXTRA_LIBS $<BUILD_INTERFACE:umf_utils>)
12-
endif()
7+
set(UMF_COARSE_SOURCES coarse.c ${UMF_CMAKE_SOURCE_DIR}/src/ravl/ravl.c)
8+
set(UMF_COARSE_LIBS umf_utils umf_ba)
139

1410
add_umf_library(
1511
NAME coarse
1612
TYPE STATIC
17-
SRCS ${COARSE_SOURCES} ${COARSE_EXTRA_SRCS}
18-
LIBS ${COARSE_EXTRA_LIBS})
13+
SRCS ${UMF_COARSE_SOURCES}
14+
LIBS ${UMF_COARSE_LIBS})
1915

2016
target_include_directories(
2117
coarse
22-
PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
23-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
24-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/ravl>)
25-
26-
add_library(${PROJECT_NAME}::coarse ALIAS coarse)
18+
PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/coarse
19+
${UMF_CMAKE_SOURCE_DIR}/src/base_alloc
20+
${UMF_CMAKE_SOURCE_DIR}/src/ravl)

‎src/pool/CMakeLists.txt

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/proxy_lib/CMakeLists.txt

Lines changed: 20 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,46 @@
1-
# Copyright (C) 2023-2024 Intel Corporation
1+
# Copyright (C) 2023-2025 Intel Corporation
22
# Under the Apache License v2.0 with LLVM Exceptions. See LICENSE.TXT.
33
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
44

55
include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
66

7-
set(PROXY_SOURCES proxy_lib.c)
7+
set(UMF_PROXY_SOURCES_COMMON proxy_lib.c)
8+
set(UMF_PROXY_SOURCES_LINUX proxy_lib_linux.c)
9+
set(UMF_PROXY_SOURCES_WINDOWS proxy_lib_windows.c)
810

9-
set(PROXY_SOURCES_LINUX proxy_lib_linux.c)
10-
11-
set(PROXY_SOURCES_WINDOWS proxy_lib_windows.c)
12-
13-
set(PROXY_SOURCES_MACOSX proxy_lib_linux.c)
14-
15-
if(LINUX)
16-
set(PROXY_SOURCES ${PROXY_SOURCES} ${PROXY_SOURCES_LINUX})
11+
if(LINUX OR MACOSX)
12+
set(UMF_PROXY_SOURCES ${UMF_PROXY_SOURCES_COMMON}
13+
${UMF_PROXY_SOURCES_LINUX})
1714
elseif(WINDOWS)
18-
set(PROXY_SOURCES ${PROXY_SOURCES} ${PROXY_SOURCES_WINDOWS})
19-
15+
set(UMF_PROXY_SOURCES ${UMF_PROXY_SOURCES_COMMON}
16+
${UMF_PROXY_SOURCES_WINDOWS})
2017
# Add resource file needed for Windows to fill metadata in binary files
2118
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/proxy_lib.rc.in"
2219
"${CMAKE_CURRENT_BINARY_DIR}/proxy_lib.rc" IMMEDIATE @ONLY)
23-
set(PROXY_SOURCES ${PROXY_SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/proxy_lib.rc)
24-
elseif(MACOSX)
25-
set(PROXY_SOURCES ${PROXY_SOURCES} ${PROXY_SOURCES_MACOSX})
20+
set(UMF_PROXY_SOURCES ${UMF_PROXY_SOURCES_COMMON}
21+
${CMAKE_CURRENT_BINARY_DIR}/proxy_lib.rc)
2622
endif()
2723

2824
add_umf_library(
2925
NAME umf_proxy
3026
TYPE SHARED
31-
SRCS ${BA_SOURCES} ${PROXY_SOURCES}
32-
LIBS umf_utils ${PROXY_LIBS}
27+
SRCS ${UMF_PROXY_SOURCES}
28+
LIBS umf umf_utils umf_ba
3329
LINUX_MAP_FILE ${CMAKE_CURRENT_SOURCE_DIR}/proxy_lib.map
3430
WINDOWS_DEF_FILE ${CMAKE_CURRENT_SOURCE_DIR}/proxy_lib.def)
35-
set_target_properties(umf_proxy PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR})
36-
37-
add_library(${PROJECT_NAME}::proxy ALIAS umf_proxy)
3831

39-
target_link_directories(umf_proxy PRIVATE ${LIBHWLOC_LIBRARY_DIRS})
40-
41-
target_compile_definitions(umf_proxy PRIVATE ${UMF_COMMON_COMPILE_DEFINITIONS})
32+
set_target_properties(umf_proxy PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR})
4233

4334
if(PROXY_LIB_USES_SCALABLE_POOL)
44-
target_compile_definitions(umf_proxy PRIVATE PROXY_LIB_USES_SCALABLE_POOL=1)
35+
target_compile_definitions(umf_proxy
36+
PRIVATE "PROXY_LIB_USES_SCALABLE_POOL=1")
4537
elseif(PROXY_LIB_USES_JEMALLOC_POOL)
46-
target_compile_definitions(umf_proxy PRIVATE PROXY_LIB_USES_JEMALLOC_POOL=1)
38+
target_compile_definitions(umf_proxy
39+
PRIVATE "PROXY_LIB_USES_JEMALLOC_POOL=1")
4740
endif()
4841

4942
target_include_directories(
50-
umf_proxy
51-
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
52-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src/utils>
53-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
54-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
43+
umf_proxy PRIVATE ${UMF_CMAKE_SOURCE_DIR}/src/base_alloc
44+
${UMF_CMAKE_SOURCE_DIR}/src/ravl)
5545

5646
install(TARGETS umf_proxy EXPORT ${PROJECT_NAME}-targets)

‎src/utils/CMakeLists.txt

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,9 @@ include(${UMF_CMAKE_SOURCE_DIR}/cmake/helpers.cmake)
66
include(FindThreads)
77

88
set(UMF_UTILS_SOURCES_COMMON utils_common.c utils_log.c utils_load_library.c)
9-
109
set(UMF_UTILS_SOURCES_POSIX utils_posix_common.c utils_posix_concurrency.c)
11-
1210
set(UMF_UTILS_SOURCES_LINUX utils_linux_common.c)
13-
1411
set(UMF_UTILS_SOURCES_MACOSX utils_macosx_common.c)
15-
1612
set(UMF_UTILS_SOURCES_WINDOWS utils_windows_common.c
1713
utils_windows_concurrency.c)
1814

@@ -48,24 +44,18 @@ elseif(WINDOWS)
4844
${UMF_UTILS_SOURCES_WINDOWS})
4945
endif()
5046

51-
add_library(umf_utils INTERFACE)
52-
add_library(${PROJECT_NAME}::utils ALIAS umf_utils)
53-
54-
target_sources(umf_utils INTERFACE ${UMF_UTILS_SOURCES})
55-
target_link_libraries(umf_utils INTERFACE ${CMAKE_THREAD_LIBS_INIT}
56-
${UMF_UTILS_LIBS})
47+
add_umf_library(
48+
NAME umf_utils
49+
TYPE STATIC
50+
SRCS ${UMF_UTILS_SOURCES}
51+
LIBS ${UMF_UTILS_LIBS})
5752

58-
target_include_directories(
59-
umf_utils
60-
INTERFACE ${VALGRIND_INCLUDE_DIRS}
61-
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
62-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
53+
target_include_directories(umf_utils PRIVATE ${VALGRIND_INCLUDE_DIRS})
6354

6455
if(UMF_USE_VALGRIND)
65-
set(UMF_UTILS_INTERFACE_DEFS "UMF_VG_ENABLED=1")
56+
set(UMF_UTILS_DEFS "UMF_VG_ENABLED=1")
6657
endif()
6758

68-
set(UMF_UTILS_INTERFACE_DEFS ${UMF_UTILS_INTERFACE_DEFS}
69-
${UMF_COMMON_COMPILE_DEFINITIONS})
59+
set(UMF_UTILS_DEFS ${UMF_UTILS_DEFS} ${UMF_COMMON_COMPILE_DEFINITIONS})
7060

71-
target_compile_definitions(umf_utils INTERFACE ${UMF_UTILS_INTERFACE_DEFS})
61+
target_compile_definitions(umf_utils PRIVATE ${UMF_UTILS_DEFS})

0 commit comments

Comments
 (0)