Skip to content

Commit e74209c

Browse files
committed
fix formatting
1 parent 00dea91 commit e74209c

File tree

5 files changed

+11
-22
lines changed

5 files changed

+11
-22
lines changed

benchmark/multithread.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@ int main() {
133133
mt_alloc_free(poolCreateExtParams{umfDisjointPoolOps(), hDisjointParams,
134134
umfOsMemoryProviderOps(), osParams});
135135

136-
137136
// ctest looks for "PASSED" in the output
138137
std::cout << "PASSED" << std::endl;
139138

benchmark/ubench.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,12 @@
1515

1616
#include <umf/ipc.h>
1717
#include <umf/memory_pool.h>
18+
#include <umf/pools/pool_disjoint.h>
1819
#include <umf/pools/pool_proxy.h>
1920
#include <umf/pools/pool_scalable.h>
20-
#include <umf/pools/pool_disjoint.h>
2121
#include <umf/providers/provider_level_zero.h>
2222
#include <umf/providers/provider_os_memory.h>
2323

24-
2524
#ifdef UMF_BUILD_LIBUMF_POOL_JEMALLOC
2625
#include <umf/pools/pool_jemalloc.h>
2726
#endif

examples/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ if(UMF_POOL_SCALABLE_ENABLED)
4141
endif()
4242
endif()
4343

44-
if(UMF_BUILD_GPU_EXAMPLES
45-
AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
44+
if(UMF_BUILD_GPU_EXAMPLES AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
4645
set(EXAMPLE_NAME umf_example_level_zero_shared_memory)
4746

4847
add_umf_executable(
@@ -118,7 +117,6 @@ endif()
118117
# TODO: it looks like there is some problem with IPC implementation in Level
119118
# Zero on windows
120119
if(UMF_BUILD_GPU_EXAMPLES
121-
122120
AND UMF_BUILD_LEVEL_ZERO_PROVIDER
123121
AND LINUX)
124122
set(EXAMPLE_NAME umf_example_ipc_level_zero)

src/pool/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@ add_umf_library(
1616
SRCS pool_disjoint.c ../critnib/critnib.c ${POOL_EXTRA_SRCS}
1717
LIBS ${POOL_EXTRA_LIBS})
1818

19-
target_compile_definitions(disjoint_pool
20-
PRIVATE ${POOL_COMPILE_DEFINITIONS})
19+
target_compile_definitions(disjoint_pool PRIVATE ${POOL_COMPILE_DEFINITIONS})
2120

2221
if(WINDOWS)
2322
target_compile_options(disjoint_pool PRIVATE /DWIN32_LEAN_AND_MEAN
24-
/DNOMINMAX)
23+
/DNOMINMAX)
2524
endif()
2625

2726
add_library(${PROJECT_NAME}::disjoint_pool ALIAS disjoint_pool)
@@ -33,7 +32,7 @@ target_link_libraries(disjoint_pool PRIVATE umf)
3332
target_include_directories(
3433
disjoint_pool
3534
PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/umf/pools>
36-
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
35+
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
3736

3837
install(TARGETS disjoint_pool EXPORT ${PROJECT_NAME}-targets)
3938

test/CMakeLists.txt

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -570,8 +570,7 @@ if(LINUX)
570570

571571
# TODO add IPC tests for CUDA
572572

573-
if(UMF_BUILD_GPU_TESTS
574-
AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
573+
if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
575574
build_umf_test(
576575
NAME
577576
ipc_level_zero_prov_consumer
@@ -599,8 +598,7 @@ if(LINUX)
599598
add_umf_ipc_test(TEST ipc_level_zero_prov SRC_DIR providers)
600599
endif()
601600

602-
if(UMF_BUILD_GPU_TESTS
603-
AND UMF_BUILD_CUDA_PROVIDER)
601+
if(UMF_BUILD_GPU_TESTS AND UMF_BUILD_CUDA_PROVIDER)
604602
build_umf_test(
605603
NAME
606604
ipc_cuda_prov_consumer
@@ -677,8 +675,7 @@ if(LINUX
677675
)
678676
endif()
679677

680-
if(UMF_BUILD_GPU_EXAMPLES
681-
AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
678+
if(UMF_BUILD_GPU_EXAMPLES AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
682679
set(EXAMPLES ${EXAMPLES} level_zero_shared_memory)
683680
else()
684681
message(
@@ -700,15 +697,12 @@ if(LINUX
700697
endif()
701698

702699
# TODO add IPC examples for CUDA
703-
if(UMF_BUILD_GPU_EXAMPLES
704-
AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
700+
if(UMF_BUILD_GPU_EXAMPLES AND UMF_BUILD_LEVEL_ZERO_PROVIDER)
705701
set(EXAMPLES ${EXAMPLES} ipc_level_zero)
706702
else()
707703
message(
708-
STATUS
709-
"IPC Level 0 example requires UMF_BUILD_GPU_EXAMPLES and "
710-
"UMF_BUILD_LEVEL_ZERO_PROVIDER to be turned ON - skipping"
711-
)
704+
STATUS "IPC Level 0 example requires UMF_BUILD_GPU_EXAMPLES and "
705+
"UMF_BUILD_LEVEL_ZERO_PROVIDER to be turned ON - skipping")
712706
endif()
713707

714708
if(UMF_POOL_SCALABLE_ENABLED)

0 commit comments

Comments
 (0)