Skip to content

Commit d4de3be

Browse files
pratikvnpratikvn
committed
[cmake] format all cmake files
1 parent 0dde907 commit d4de3be

File tree

104 files changed

+3036
-1558
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+3036
-1558
lines changed

‎CMakeLists.txt

+315-146
Large diffs are not rendered by default.

‎benchmark/CMakeLists.txt

+81-38
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,88 @@
1-
if (NOT CMAKE_BUILD_TYPE STREQUAL "Release")
2-
message(WARNING
1+
if(NOT CMAKE_BUILD_TYPE STREQUAL "Release")
2+
message(
3+
WARNING
34
"Ginkgo is not being built in \"Release\" mode, benchmark performance "
4-
"will be affected")
5+
"will be affected"
6+
)
57
endif()
68

79
function(ginkgo_benchmark_add_tuning_maybe name)
810
if(GINKGO_BENCHMARK_ENABLE_TUNING)
9-
target_sources(${name} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../utils/tuning_variables.cpp)
11+
target_sources(
12+
${name}
13+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../utils/tuning_variables.cpp
14+
)
1015
endif()
1116
endfunction()
1217

1318
function(ginkgo_benchmark_cusparse_linops type def)
1419
add_library(cusparse_linops_${type} utils/cuda_linops.cpp)
1520
if(CMAKE_CUDA_COMPILER_ID STREQUAL "NVIDIA")
1621
# remove false positive CUDA warnings when calling one<T>() and zero<T>()
17-
target_compile_options(cusparse_linops_${type}
18-
PRIVATE
19-
$<$<COMPILE_LANGUAGE:CUDA>:--expt-relaxed-constexpr>)
22+
target_compile_options(
23+
cusparse_linops_${type}
24+
PRIVATE $<$<COMPILE_LANGUAGE:CUDA>:--expt-relaxed-constexpr>
25+
)
2026
endif()
2127
if(GINKGO_CUDA_CUSTOM_THRUST_NAMESPACE)
22-
target_compile_definitions(cusparse_linops_${type} PRIVATE THRUST_CUB_WRAPPED_NAMESPACE=gko)
28+
target_compile_definitions(
29+
cusparse_linops_${type}
30+
PRIVATE THRUST_CUB_WRAPPED_NAMESPACE=gko
31+
)
2332
endif()
2433
# make the dependency public to catch issues
2534
target_compile_definitions(cusparse_linops_${type} PUBLIC ${def})
26-
target_compile_definitions(cusparse_linops_${type} PRIVATE GKO_COMPILING_CUDA)
27-
target_link_libraries(cusparse_linops_${type} PRIVATE Ginkgo::ginkgo CUDA::cudart CUDA::cublas CUDA::cusparse)
35+
target_compile_definitions(
36+
cusparse_linops_${type}
37+
PRIVATE GKO_COMPILING_CUDA
38+
)
39+
target_link_libraries(
40+
cusparse_linops_${type}
41+
PRIVATE Ginkgo::ginkgo CUDA::cudart CUDA::cublas CUDA::cusparse
42+
)
2843
ginkgo_compile_features(cusparse_linops_${type})
2944
endfunction()
3045

3146
function(ginkgo_benchmark_hipsparse_linops type def)
3247
add_library(hipsparse_linops_${type} utils/hip_linops.hip.cpp)
33-
set_source_files_properties(utils/hip_linops.hip.cpp PROPERTIES LANGUAGE HIP)
48+
set_source_files_properties(
49+
utils/hip_linops.hip.cpp
50+
PROPERTIES LANGUAGE HIP
51+
)
3452
if(GINKGO_CUDA_CUSTOM_THRUST_NAMESPACE)
35-
target_compile_definitions(hipsparse_linops_${type} PRIVATE THRUST_CUB_WRAPPED_NAMESPACE=gko)
53+
target_compile_definitions(
54+
hipsparse_linops_${type}
55+
PRIVATE THRUST_CUB_WRAPPED_NAMESPACE=gko
56+
)
3657
endif()
3758
target_compile_definitions(hipsparse_linops_${type} PUBLIC ${def})
38-
target_compile_definitions(hipsparse_linops_${type} PRIVATE GKO_COMPILING_HIP)
39-
target_include_directories(hipsparse_linops_${type} SYSTEM PRIVATE ${HIPBLAS_INCLUDE_DIRS} ${HIPSPARSE_INCLUDE_DIRS})
40-
target_link_libraries(hipsparse_linops_${type} PRIVATE Ginkgo::ginkgo ${HIPSPARSE_LIBRARIES})
59+
target_compile_definitions(
60+
hipsparse_linops_${type}
61+
PRIVATE GKO_COMPILING_HIP
62+
)
63+
target_include_directories(
64+
hipsparse_linops_${type}
65+
SYSTEM
66+
PRIVATE ${HIPBLAS_INCLUDE_DIRS} ${HIPSPARSE_INCLUDE_DIRS}
67+
)
68+
target_link_libraries(
69+
hipsparse_linops_${type}
70+
PRIVATE Ginkgo::ginkgo ${HIPSPARSE_LIBRARIES}
71+
)
4172
ginkgo_compile_features(hipsparse_linops_${type})
4273
endfunction()
4374

4475
function(ginkgo_benchmark_onemkl_linops type def)
4576
add_library(onemkl_linops_${type} utils/dpcpp_linops.dp.cpp)
4677
# make the dependency public to catch issues
4778
target_compile_definitions(onemkl_linops_${type} PUBLIC ${def})
48-
target_link_libraries(onemkl_linops_${type} PRIVATE Ginkgo::ginkgo MKL::MKL_DPCPP)
79+
target_link_libraries(
80+
onemkl_linops_${type}
81+
PRIVATE Ginkgo::ginkgo MKL::MKL_DPCPP
82+
)
4983
ginkgo_compile_features(onemkl_linops_${type})
5084
endfunction()
5185

52-
5386
# gersemi: off
5487
# Generates an executable for one precision. Each executable will be linked to
5588
# `ginkgo`, `gflags` and `nlohmann-json`.
@@ -62,45 +95,50 @@ endfunction()
6295
# building (to compile for a specific type)
6396
# All remaining arguments will be treated as source files
6497
# gersemi: on
65-
function(ginkgo_add_single_benchmark_executable name use_lib_linops macro_def type)
98+
function(
99+
ginkgo_add_single_benchmark_executable
100+
name
101+
use_lib_linops
102+
macro_def
103+
type
104+
)
66105
add_executable("${name}" ${ARGN})
67106
target_link_libraries("${name}" ginkgo gflags nlohmann_json::nlohmann_json)
68107
# always include the device timer
69-
if (GINKGO_BUILD_CUDA)
108+
if(GINKGO_BUILD_CUDA)
70109
target_compile_definitions("${name}" PRIVATE HAS_CUDA_TIMER=1)
71110
target_link_libraries("${name}" cuda_timer)
72111
endif()
73-
if (GINKGO_BUILD_HIP)
112+
if(GINKGO_BUILD_HIP)
74113
target_compile_definitions("${name}" PRIVATE HAS_HIP_TIMER=1)
75114
target_link_libraries("${name}" hip_timer)
76115
endif()
77-
if (GINKGO_BUILD_SYCL)
116+
if(GINKGO_BUILD_SYCL)
78117
target_compile_definitions("${name}" PRIVATE HAS_DPCPP_TIMER=1)
79118
target_link_libraries("${name}" dpcpp_timer)
80119
endif()
81-
if (GINKGO_BUILD_MPI)
120+
if(GINKGO_BUILD_MPI)
82121
target_compile_definitions(${name} PRIVATE HAS_MPI_TIMER=1)
83122
target_link_libraries(${name} mpi_timer)
84123
endif()
85124
target_compile_definitions("${name}" PRIVATE "${macro_def}")
86125
ginkgo_benchmark_add_tuning_maybe("${name}")
87126
if("${use_lib_linops}")
88-
if (GINKGO_BUILD_CUDA)
127+
if(GINKGO_BUILD_CUDA)
89128
target_compile_definitions("${name}" PRIVATE HAS_CUDA=1)
90129
target_link_libraries("${name}" cusparse_linops_${type})
91130
endif()
92-
if (GINKGO_BUILD_HIP)
131+
if(GINKGO_BUILD_HIP)
93132
target_compile_definitions("${name}" PRIVATE HAS_HIP=1)
94133
target_link_libraries("${name}" hipsparse_linops_${type})
95134
endif()
96-
if (GINKGO_BUILD_SYCL)
135+
if(GINKGO_BUILD_SYCL)
97136
target_compile_definitions("${name}" PRIVATE HAS_DPCPP=1)
98137
target_link_libraries("${name}" onemkl_linops_${type})
99138
endif()
100139
endif()
101140
endfunction(ginkgo_add_single_benchmark_executable)
102141

103-
104142
# gersemi: off
105143
# Generates an executable for each supported precision. Each executable will be
106144
# linked to `ginkgo`, `gflags` and `nlohmann-json`.
@@ -112,17 +150,20 @@ endfunction(ginkgo_add_single_benchmark_executable)
112150
# gersemi: on
113151
function(ginkgo_add_typed_benchmark_executables name use_lib_linops)
114152
ginkgo_add_single_benchmark_executable(
115-
"${name}" "${use_lib_linops}" "GKO_BENCHMARK_USE_DOUBLE_PRECISION" "d" ${ARGN})
153+
"${name}" "${use_lib_linops}" "GKO_BENCHMARK_USE_DOUBLE_PRECISION" "d" ${ARGN}
154+
)
116155
ginkgo_add_single_benchmark_executable(
117-
"${name}_single" "${use_lib_linops}" "GKO_BENCHMARK_USE_SINGLE_PRECISION" "s" ${ARGN})
156+
"${name}_single" "${use_lib_linops}" "GKO_BENCHMARK_USE_SINGLE_PRECISION" "s" ${ARGN}
157+
)
118158
ginkgo_add_single_benchmark_executable(
119-
"${name}_dcomplex" "${use_lib_linops}" "GKO_BENCHMARK_USE_DOUBLE_COMPLEX_PRECISION" "z" ${ARGN})
159+
"${name}_dcomplex" "${use_lib_linops}" "GKO_BENCHMARK_USE_DOUBLE_COMPLEX_PRECISION" "z" ${ARGN}
160+
)
120161
ginkgo_add_single_benchmark_executable(
121-
"${name}_scomplex" "${use_lib_linops}" "GKO_BENCHMARK_USE_SINGLE_COMPLEX_PRECISION" "c" ${ARGN})
162+
"${name}_scomplex" "${use_lib_linops}" "GKO_BENCHMARK_USE_SINGLE_COMPLEX_PRECISION" "c" ${ARGN}
163+
)
122164
endfunction(ginkgo_add_typed_benchmark_executables)
123165

124-
125-
if (GINKGO_BUILD_CUDA)
166+
if(GINKGO_BUILD_CUDA)
126167
ginkgo_benchmark_cusparse_linops(d GKO_BENCHMARK_USE_DOUBLE_PRECISION)
127168
ginkgo_benchmark_cusparse_linops(s GKO_BENCHMARK_USE_SINGLE_PRECISION)
128169
ginkgo_benchmark_cusparse_linops(z GKO_BENCHMARK_USE_DOUBLE_COMPLEX_PRECISION)
@@ -131,7 +172,7 @@ if (GINKGO_BUILD_CUDA)
131172
target_link_libraries(cuda_timer PRIVATE ginkgo CUDA::cudart)
132173
ginkgo_compile_features(cuda_timer)
133174
endif()
134-
if (GINKGO_BUILD_HIP)
175+
if(GINKGO_BUILD_HIP)
135176
ginkgo_benchmark_hipsparse_linops(d GKO_BENCHMARK_USE_DOUBLE_PRECISION)
136177
ginkgo_benchmark_hipsparse_linops(s GKO_BENCHMARK_USE_SINGLE_PRECISION)
137178
ginkgo_benchmark_hipsparse_linops(z GKO_BENCHMARK_USE_DOUBLE_COMPLEX_PRECISION)
@@ -142,7 +183,7 @@ if (GINKGO_BUILD_HIP)
142183
ginkgo_compile_features(hip_timer)
143184
endif()
144185

145-
if (GINKGO_BUILD_SYCL)
186+
if(GINKGO_BUILD_SYCL)
146187
ginkgo_benchmark_onemkl_linops(d GKO_BENCHMARK_USE_DOUBLE_PRECISION)
147188
ginkgo_benchmark_onemkl_linops(s GKO_BENCHMARK_USE_SINGLE_PRECISION)
148189
ginkgo_benchmark_onemkl_linops(z GKO_BENCHMARK_USE_DOUBLE_COMPLEX_PRECISION)
@@ -154,7 +195,7 @@ if (GINKGO_BUILD_SYCL)
154195
ginkgo_compile_features(dpcpp_timer)
155196
endif()
156197

157-
if (GINKGO_BUILD_MPI)
198+
if(GINKGO_BUILD_MPI)
158199
add_library(mpi_timer ${Ginkgo_SOURCE_DIR}/benchmark/utils/mpi_timer.cpp)
159200
target_link_libraries(mpi_timer PRIVATE ginkgo)
160201
ginkgo_compile_features(mpi_timer)
@@ -169,14 +210,16 @@ add_subdirectory(solver)
169210
add_subdirectory(sparse_blas)
170211
add_subdirectory(spmv)
171212
add_subdirectory(tools)
172-
if (GINKGO_BUILD_TESTS)
213+
if(GINKGO_BUILD_TESTS)
173214
add_subdirectory(test)
174215
endif()
175216

176217
configure_file(run_all_benchmarks.sh run_all_benchmarks.sh COPYONLY)
177218

178219
add_custom_target(benchmark)
179220
add_custom_command(
180-
TARGET benchmark POST_BUILD
221+
TARGET benchmark
222+
POST_BUILD
181223
COMMAND bash run_all_benchmarks.sh >/dev/null
182-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
224+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
225+
)

‎benchmark/test/CMakeLists.txt

+16-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,22 @@
11
find_package(Python3 COMPONENTS Interpreter REQUIRED)
22
function(add_benchmark_test test_name)
33
configure_file(${test_name}.py ${test_name}.py COPYONLY)
4-
add_test(NAME benchmark_${test_name}
5-
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/${test_name}.py $<TARGET_FILE:${test_name}>
6-
WORKING_DIRECTORY "$<TARGET_FILE_DIR:ginkgo>")
4+
add_test(
5+
NAME benchmark_${test_name}
6+
COMMAND
7+
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/${test_name}.py
8+
$<TARGET_FILE:${test_name}>
9+
WORKING_DIRECTORY "$<TARGET_FILE_DIR:ginkgo>"
10+
)
711
set(regenerate_target benchmark_test_${test_name}_regenerate)
8-
add_custom_target(${regenerate_target}
9-
COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/${test_name}.py $<TARGET_FILE:${test_name}> --generate
10-
COMMENT "Regenerating reference output for ${test_name}"
11-
WORKING_DIRECTORY "$<TARGET_FILE_DIR:ginkgo>")
12+
add_custom_target(
13+
${regenerate_target}
14+
COMMAND
15+
${Python3_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/${test_name}.py
16+
$<TARGET_FILE:${test_name}> --generate
17+
COMMENT "Regenerating reference output for ${test_name}"
18+
WORKING_DIRECTORY "$<TARGET_FILE_DIR:ginkgo>"
19+
)
1220
add_dependencies(${regenerate_target} ${test_name} ${test_name}_dcomplex)
1321
add_dependencies(benchmark_test_regenerate ${regenerate_target})
1422
endfunction()
@@ -21,7 +29,7 @@ add_benchmark_test(preconditioner)
2129
add_benchmark_test(solver)
2230
add_benchmark_test(sparse_blas)
2331
add_benchmark_test(spmv)
24-
if (GINKGO_BUILD_MPI)
32+
if(GINKGO_BUILD_MPI)
2533
add_benchmark_test(multi_vector_distributed)
2634
add_benchmark_test(spmv_distributed)
2735
add_benchmark_test(solver_distributed)

0 commit comments

Comments
 (0)