Skip to content

Commit 46ad7ac

Browse files
lukaszstolarczuklukaszstolarczuk
authored
Merge pull request oneapi-src#755 from ldorau/Make_memspace_hmat_and_memspace_numa_examples_standalone
Make memspace_hmat and memspace_numa examples standalone
2 parents 8b86b9d + b42dd42 commit 46ad7ac

File tree

7 files changed

+147
-2
lines changed

7 files changed

+147
-2
lines changed

‎examples/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ if(LINUX)
210210

211211
add_umf_executable(
212212
NAME ${EXAMPLE_NAME}
213-
SRCS memspace/memspace_numa.c
213+
SRCS memspace_numa/memspace_numa.c
214214
LIBS umf ${LIBHWLOC_LIBRARIES} numa)
215215

216216
target_include_directories(
@@ -233,7 +233,7 @@ if(LINUX)
233233

234234
add_umf_executable(
235235
NAME ${EXAMPLE_NAME}
236-
SRCS memspace/memspace_hmat.c
236+
SRCS memspace_hmat/memspace_hmat.c
237237
LIBS umf ${LIBHWLOC_LIBRARIES} numa)
238238

239239
target_include_directories(

‎examples/cmake/FindLIBNUMA.cmake‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Copyright (C) 2024 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+
message(STATUS "Checking for module 'libnuma' using find_library()")
6+
7+
find_library(LIBNUMA_LIBRARY NAMES libnuma numa)
8+
set(LIBNUMA_LIBRARIES ${LIBNUMA_LIBRARY})
9+
10+
if(LIBNUMA_LIBRARY)
11+
message(STATUS " Found libnuma using find_library()")
12+
else()
13+
set(MSG_NOT_FOUND
14+
"libnuma NOT found (set CMAKE_PREFIX_PATH to point the location)")
15+
if(LIBNUMA_FIND_REQUIRED)
16+
message(FATAL_ERROR ${MSG_NOT_FOUND})
17+
else()
18+
message(WARNING ${MSG_NOT_FOUND})
19+
endif()
20+
endif()

‎examples/memspace_hmat/CMakeLists.txt‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Copyright (C) 2024 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+
cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
6+
project(umf_example_memspace_hmat LANGUAGES C)
7+
enable_testing()
8+
9+
set(UMF_EXAMPLE_DIR "${CMAKE_SOURCE_DIR}/..")
10+
list(APPEND CMAKE_MODULE_PATH "${UMF_EXAMPLE_DIR}/cmake")
11+
message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
12+
13+
find_package(PkgConfig)
14+
pkg_check_modules(LIBUMF libumf)
15+
if(NOT LIBUMF_FOUND)
16+
find_package(LIBUMF REQUIRED libumf)
17+
endif()
18+
19+
pkg_check_modules(LIBHWLOC hwloc>=2.3.0)
20+
if(NOT LIBHWLOC_FOUND)
21+
find_package(LIBHWLOC 2.3.0 REQUIRED hwloc)
22+
endif()
23+
24+
pkg_check_modules(LIBNUMA numa)
25+
if(NOT LIBNUMA_FOUND)
26+
find_package(LIBNUMA REQUIRED numa)
27+
endif()
28+
29+
# build the example
30+
set(EXAMPLE_NAME umf_example_memspace_hmat)
31+
add_executable(${EXAMPLE_NAME} memspace_hmat.c)
32+
target_include_directories(${EXAMPLE_NAME} PRIVATE ${LIBUMF_INCLUDE_DIRS}
33+
../common)
34+
target_link_directories(${EXAMPLE_NAME} PRIVATE ${LIBHWLOC_LIBRARY_DIRS}
35+
${LIBNUMA_LIBRARY_DIRS})
36+
target_link_libraries(
37+
${EXAMPLE_NAME} PRIVATE ${LIBUMF_LIBRARIES} ${LIBHWLOC_LIBRARIES}
38+
${LIBNUMA_LIBRARIES})
39+
40+
add_test(
41+
NAME ${EXAMPLE_NAME}
42+
COMMAND ${EXAMPLE_NAME}
43+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
44+
45+
set(UMF_TEST_SKIP_RETURN_CODE 125)
46+
set_tests_properties(${EXAMPLE_NAME} PROPERTIES LABELS "example-standalone")
47+
set_tests_properties(${EXAMPLE_NAME} PROPERTIES SKIP_RETURN_CODE
48+
${UMF_TEST_SKIP_RETURN_CODE})
49+
50+
if(LINUX)
51+
# set LD_LIBRARY_PATH
52+
set_property(
53+
TEST ${EXAMPLE_NAME}
54+
PROPERTY
55+
ENVIRONMENT_MODIFICATION
56+
"LD_LIBRARY_PATH=path_list_append:${LIBUMF_LIBRARY_DIRS};LD_LIBRARY_PATH=path_list_append:${LIBHWLOC_LIBRARY_DIRS};LD_LIBRARY_PATH=path_list_append:${LIBNUMA_LIBRARY_DIRS}"
57+
)
58+
endif()

‎examples/memspace/memspace_hmat.c‎ renamed to ‎examples/memspace_hmat/memspace_hmat.c‎

File renamed without changes.

‎examples/memspace_numa/CMakeLists.txt‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# Copyright (C) 2024 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+
cmake_minimum_required(VERSION 3.14.0 FATAL_ERROR)
6+
project(umf_example_memspace_numa LANGUAGES C)
7+
enable_testing()
8+
9+
set(UMF_EXAMPLE_DIR "${CMAKE_SOURCE_DIR}/..")
10+
list(APPEND CMAKE_MODULE_PATH "${UMF_EXAMPLE_DIR}/cmake")
11+
message(STATUS "CMAKE_MODULE_PATH=${CMAKE_MODULE_PATH}")
12+
13+
find_package(PkgConfig)
14+
pkg_check_modules(LIBUMF libumf)
15+
if(NOT LIBUMF_FOUND)
16+
find_package(LIBUMF REQUIRED libumf)
17+
endif()
18+
19+
pkg_check_modules(LIBHWLOC hwloc>=2.3.0)
20+
if(NOT LIBHWLOC_FOUND)
21+
find_package(LIBHWLOC 2.3.0 REQUIRED hwloc)
22+
endif()
23+
24+
pkg_check_modules(LIBNUMA numa)
25+
if(NOT LIBNUMA_FOUND)
26+
find_package(LIBNUMA REQUIRED numa)
27+
endif()
28+
29+
# build the example
30+
set(EXAMPLE_NAME umf_example_memspace_numa)
31+
add_executable(${EXAMPLE_NAME} memspace_numa.c)
32+
target_include_directories(${EXAMPLE_NAME} PRIVATE ${LIBUMF_INCLUDE_DIRS}
33+
../common)
34+
target_link_directories(${EXAMPLE_NAME} PRIVATE ${LIBHWLOC_LIBRARY_DIRS}
35+
${LIBNUMA_LIBRARY_DIRS})
36+
target_link_libraries(
37+
${EXAMPLE_NAME} PRIVATE ${LIBUMF_LIBRARIES} ${LIBHWLOC_LIBRARIES}
38+
${LIBNUMA_LIBRARIES})
39+
40+
add_test(
41+
NAME ${EXAMPLE_NAME}
42+
COMMAND ${EXAMPLE_NAME}
43+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
44+
45+
set(UMF_TEST_SKIP_RETURN_CODE 125)
46+
set_tests_properties(${EXAMPLE_NAME} PROPERTIES LABELS "example-standalone")
47+
set_tests_properties(${EXAMPLE_NAME} PROPERTIES SKIP_RETURN_CODE
48+
${UMF_TEST_SKIP_RETURN_CODE})
49+
50+
if(LINUX)
51+
# set LD_LIBRARY_PATH
52+
set_property(
53+
TEST ${EXAMPLE_NAME}
54+
PROPERTY
55+
ENVIRONMENT_MODIFICATION
56+
"LD_LIBRARY_PATH=path_list_append:${LIBUMF_LIBRARY_DIRS};LD_LIBRARY_PATH=path_list_append:${LIBHWLOC_LIBRARY_DIRS};LD_LIBRARY_PATH=path_list_append:${LIBNUMA_LIBRARY_DIRS}"
57+
)
58+
endif()

‎examples/memspace/memspace_numa.c‎ renamed to ‎examples/memspace_numa/memspace_numa.c‎

File renamed without changes.

‎test/CMakeLists.txt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -506,6 +506,15 @@ if(LINUX
506506
)
507507
endif()
508508

509+
if(LIBNUMA_LIBRARIES)
510+
set(EXAMPLES ${EXAMPLES} memspace_hmat memspace_numa)
511+
else()
512+
message(
513+
STATUS
514+
"The memspace_hmat and memspace_numa examples require libnuma to be installed and added to the default library search path - skipping"
515+
)
516+
endif()
517+
509518
if(UMF_BUILD_GPU_EXAMPLES
510519
AND UMF_BUILD_LIBUMF_POOL_DISJOINT
511520
AND UMF_BUILD_LEVEL_ZERO_PROVIDER)

0 commit comments

Comments
 (0)