Skip to content

Commit adbb2f3

Browse files
authored
shorter cmake lists of arguments (#395)
1 parent 771d218 commit adbb2f3

File tree

5 files changed

+37
-114
lines changed

5 files changed

+37
-114
lines changed

.cmake-format.py

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# SPDX-FileCopyrightText: Intel Corporation
2+
#
3+
# SPDX-License-Identifier: BSD-3-Clause
4+
5+
# Useful links about creating this config file:
6+
# https://cmake-format.readthedocs.io/en/latest/configuration.html
7+
# https://cmake-format.readthedocs.io/en/latest/configopts.html?highlight=layout_passes
8+
# https://cmake-format.readthedocs.io/en/latest/format-algorithm.html
9+
10+
with section("format"): # noqa: F821
11+
layout_passes = {"PargGroupNode": [(0, False)]}

benchmarks/gbench/mhp/CMakeLists.txt

+6-32
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
66

77
add_executable(
88
mhp-bench
9-
mhp-bench.cpp
10-
../common/distributed_vector.cpp
11-
../common/dot_product.cpp
12-
../common/stream.cpp
13-
../common/black_scholes.cpp
14-
rooted.cpp
15-
stencil_1d.cpp
16-
stencil_2d.cpp
17-
chunk.cpp
18-
mdspan.cpp
19-
mpi.cpp)
9+
mhp-bench.cpp ../common/distributed_vector.cpp ../common/dot_product.cpp
10+
../common/stream.cpp ../common/black_scholes.cpp rooted.cpp stencil_1d.cpp
11+
stencil_2d.cpp chunk.cpp mdspan.cpp mpi.cpp)
2012
target_compile_definitions(mhp-bench PRIVATE BENCH_MHP)
2113
target_link_libraries(mhp-bench benchmark::benchmark cxxopts DR::mpi)
2214

@@ -36,30 +28,12 @@ if(NOT MPI_IMPL STREQUAL "openmpi")
3628
# intermittent fails with: ONEAPI_DEVICE_SELECTOR=opencl:cpu mpirun -n 1
3729
# ./mhp-bench --vector-size 30000 --rows 100 --columns 100 --check
3830
add_mpi_test(
39-
mhp-bench-1
40-
mhp-bench
41-
1
42-
--vector-size
43-
30000
44-
--rows
45-
100
46-
--columns
47-
100
31+
mhp-bench-1 mhp-bench 1 --vector-size 30000 --rows 100 --columns 100
4832
--check)
4933
if(ENABLE_SYCL)
5034
add_mpi_test(
51-
mhp-bench-1-sycl
52-
mhp-bench
53-
1
54-
--vector-size
55-
30000
56-
--rows
57-
100
58-
--columns
59-
100
60-
--check
61-
--benchmark_filter=-.*DPL.*
62-
--sycl)
35+
mhp-bench-1-sycl mhp-bench 1 --vector-size 30000 --rows 100 --columns 100
36+
--check --benchmark_filter=-.*DPL.* --sycl)
6337
endif()
6438
endif()
6539

test/fuzz/cpu/CMakeLists.txt

+5-30
Original file line numberDiff line numberDiff line change
@@ -18,43 +18,18 @@ function(add_long_fuzz_mpi_test test_name name processes)
1818
endfunction()
1919

2020
add_mpi_test(
21-
cpu-fuzz-commit
22-
cpu-fuzz
23-
1
24-
-max_len=16
25-
-runs=1000000
26-
-ignore_remaining_args=1
21+
cpu-fuzz-commit cpu-fuzz 1 -max_len=16 -runs=1000000 -ignore_remaining_args=1
2722
-controller=1)
2823

2924
add_long_fuzz_mpi_test(
30-
cpu-fuzz-4-0
31-
cpu-fuzz
32-
4
33-
-max_len=16
34-
-runs=10000000
35-
-ignore_remaining_args=1
25+
cpu-fuzz-4-0 cpu-fuzz 4 -max_len=16 -runs=10000000 -ignore_remaining_args=1
3626
-controller=0)
3727
add_long_fuzz_mpi_test(
38-
cpu-fuzz-4-1
39-
cpu-fuzz
40-
4
41-
-max_len=16
42-
-runs=10000000
43-
-ignore_remaining_args=1
28+
cpu-fuzz-4-1 cpu-fuzz 4 -max_len=16 -runs=10000000 -ignore_remaining_args=1
4429
-controller=1)
4530
add_long_fuzz_mpi_test(
46-
cpu-fuzz-4-2
47-
cpu-fuzz
48-
4
49-
-max_len=16
50-
-runs=10000000
51-
-ignore_remaining_args=1
31+
cpu-fuzz-4-2 cpu-fuzz 4 -max_len=16 -runs=10000000 -ignore_remaining_args=1
5232
-controller=2)
5333
add_long_fuzz_mpi_test(
54-
cpu-fuzz-4-3
55-
cpu-fuzz
56-
4
57-
-max_len=16
58-
-runs=10000000
59-
-ignore_remaining_args=1
34+
cpu-fuzz-4-3 cpu-fuzz 4 -max_len=16 -runs=10000000 -ignore_remaining_args=1
6035
-controller=3)

test/gtest/mhp/CMakeLists.txt

+8-29
Original file line numberDiff line numberDiff line change
@@ -7,35 +7,14 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
77
# tested with a variable number of ranks
88
add_executable(
99
mhp-tests
10-
mhp-tests.cpp
11-
../common/all.cpp
12-
../common/copy.cpp
13-
../common/counted.cpp
14-
../common/distributed_vector.cpp
15-
../common/drop.cpp
16-
../common/enumerate.cpp
17-
../common/fill.cpp
18-
../common/for_each.cpp
19-
../common/inclusive_scan.cpp
20-
../common/iota.cpp
21-
../common/iota_view.cpp
22-
../common/reduce.cpp
23-
../common/subrange.cpp
24-
../common/take.cpp
25-
../common/transform.cpp
26-
../common/transform_view.cpp
27-
../common/zip.cpp
28-
../common/zip_local.cpp
29-
alignment.cpp
30-
copy.cpp
31-
distributed_vector.cpp
32-
distributed_dense_matrix.cpp
33-
halo.cpp
34-
mdstar.cpp
35-
reduce.cpp
36-
stencil.cpp
37-
segments.cpp
38-
slide_view.cpp)
10+
mhp-tests.cpp ../common/all.cpp ../common/copy.cpp ../common/counted.cpp
11+
../common/distributed_vector.cpp ../common/drop.cpp ../common/enumerate.cpp
12+
../common/fill.cpp ../common/for_each.cpp ../common/inclusive_scan.cpp
13+
../common/iota.cpp ../common/iota_view.cpp ../common/reduce.cpp
14+
../common/subrange.cpp ../common/take.cpp ../common/transform.cpp
15+
../common/transform_view.cpp ../common/zip.cpp ../common/zip_local.cpp
16+
alignment.cpp copy.cpp distributed_vector.cpp distributed_dense_matrix.cpp
17+
halo.cpp mdstar.cpp reduce.cpp stencil.cpp segments.cpp slide_view.cpp)
3918

4019
add_executable(mhp-tests-3 mhp-tests.cpp halo-3.cpp slide_view-3.cpp
4120
distributed_dense_matrix3.cpp)

test/gtest/shp/CMakeLists.txt

+7-23
Original file line numberDiff line numberDiff line change
@@ -6,30 +6,14 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
66

77
add_executable(
88
shp-tests
9-
shp-tests.cpp
10-
../common/all.cpp
11-
../common/copy.cpp
12-
../common/counted.cpp
13-
../common/distributed_vector.cpp
14-
../common/drop.cpp
15-
../common/enumerate.cpp
16-
../common/fill.cpp
17-
../common/for_each.cpp
18-
../common/iota.cpp
9+
shp-tests.cpp ../common/all.cpp ../common/copy.cpp ../common/counted.cpp
10+
../common/distributed_vector.cpp ../common/drop.cpp ../common/enumerate.cpp
11+
../common/fill.cpp ../common/for_each.cpp ../common/iota.cpp
1912
# ../common/iota_view.cpp
20-
../common/reduce.cpp
21-
../common/subrange.cpp
22-
../common/take.cpp
23-
../common/transform.cpp
24-
../common/transform_view.cpp
25-
../common/zip.cpp
26-
../common/zip_local.cpp
27-
containers.cpp
28-
algorithms.cpp
29-
copy.cpp
30-
fill.cpp
31-
gemv.cpp
32-
transform.cpp)
13+
../common/reduce.cpp ../common/subrange.cpp ../common/take.cpp
14+
../common/transform.cpp ../common/transform_view.cpp ../common/zip.cpp
15+
../common/zip_local.cpp containers.cpp algorithms.cpp copy.cpp fill.cpp
16+
gemv.cpp transform.cpp)
3317

3418
add_executable(shp-tests-3 shp-tests.cpp containers-3.cpp copy-3.cpp)
3519

0 commit comments

Comments
 (0)