Skip to content

Commit 3bcb4e1

Browse files
committedOct 10, 2024
fixup: unify test subpackage naming
1 parent e1bd563 commit 3bcb4e1

File tree

38 files changed

+63
-67
lines changed

38 files changed

+63
-67
lines changed
 

‎benchmark/core/CMakeLists.txt

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ target_link_libraries(CommPerformance Cabana::Core)
2929
endif()
3030

3131
if(Cabana_ENABLE_TESTING)
32-
add_test(NAME Cabana_Performance_BinSort COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:BinSortPerformance> sort_output.txt)
32+
add_test(NAME Cabana_Core_Performance_BinSort COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:BinSortPerformance> sort_output.txt)
3333

34-
add_test(NAME Cabana_Performance_NeighborVerlet COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:NeighborVerletPerformance> verlet_output.txt)
34+
add_test(NAME Cabana_Core_Performance_NeighborVerlet COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:NeighborVerletPerformance> verlet_output.txt)
3535

3636
if(Cabana_ENABLE_ARBORX)
37-
add_test(NAME Cabana_Performance_NeighborArborX COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:NeighborArborXPerformance> arborx_output.txt)
37+
add_test(NAME Cabana_Core_Performance_NeighborArborX COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:NeighborArborXPerformance> arborx_output.txt)
3838
endif()
3939

40-
add_test(NAME Cabana_Performance_LinkedCell COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:LinkedCellPerformance> lcl_output.txt)
40+
add_test(NAME Cabana_Core_Performance_LinkedCell COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:LinkedCellPerformance> lcl_output.txt)
4141

4242
if(Cabana_ENABLE_MPI)
43-
add_test(NAME Cabana_Performance_Comm COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:CommPerformance> comm_output.txt)
43+
add_test(NAME Cabana_Core_Performance_Comm COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:CommPerformance> comm_output.txt)
4444
endif()
4545
endif()

‎cmake/test_harness/test_harness.cmake

+4-8
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ endif()
2222
macro(Cabana_add_tests_nobackend)
2323
cmake_parse_arguments(CABANA_UNIT_TEST "" "PACKAGE" "NAMES" ${ARGN})
2424
foreach(_test ${CABANA_UNIT_TEST_NAMES})
25-
set(_target Cabana_${_test}_test)
25+
set(_target Cabana_${CABANA_UNIT_TEST_PACKAGE}_${_test}_test)
2626
add_executable(${_target} tst${_test}.cpp ${TEST_HARNESS_DIR}/unit_test_main.cpp)
2727
target_link_libraries(${_target} PRIVATE ${CABANA_UNIT_TEST_PACKAGE} ${gtest_target})
2828
add_test(NAME ${_target} COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:${_target}> ${gtest_args})
@@ -78,14 +78,10 @@ macro(Cabana_add_tests)
7878
"#include <Test${_device}_Category.hpp>\n"
7979
"#include <tst${_test}.hpp>\n"
8080
)
81-
if(${CABANA_UNIT_TEST_PACKAGE} STREQUAL Core)
82-
if(CABANA_UNIT_TEST_MPI)
83-
set(_target Cabana_${_test}_MPI_test_${_device})
84-
else()
85-
set(_target Cabana_${_test}_test_${_device})
86-
endif()
81+
if(CABANA_UNIT_TEST_MPI)
82+
set(_target Cabana_${CABANA_UNIT_TEST_PACKAGE}_Test_${_test}_MPI_${_device})
8783
else()
88-
set(_target ${CABANA_UNIT_TEST_PACKAGE}_${_test}_MPI_test_${_device})
84+
set(_target Cabana_${CABANA_UNIT_TEST_PACKAGE}_Test_${_test}_${_device})
8985
endif()
9086
add_executable(${_target} ${_file} ${CABANA_UNIT_TEST_MAIN})
9187
target_include_directories(${_target} PRIVATE ${_dir}

‎example/core_tutorial/01_hello_world/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ endif()
1919

2020
add_executable(HelloWorld hello_world.cpp)
2121
target_link_libraries(HelloWorld Cabana::Core)
22-
add_test(NAME Core_tutorial_01 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:HelloWorld>)
22+
add_test(NAME Cabana_Core_Tutorial_01 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:HelloWorld>)

‎example/core_tutorial/02_tuple/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(Tuple tuple_example.cpp)
1313
target_link_libraries(Tuple Cabana::Core)
14-
add_test(NAME Core_tutorial_02 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:Tuple>)
14+
add_test(NAME Cabana_Core_Tutorial_02 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:Tuple>)

‎example/core_tutorial/03_struct_of_arrays/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(StructOfArrays soa_example.cpp)
1313
target_link_libraries(StructOfArrays Cabana::Core)
14-
add_test(NAME Core_tutorial_03 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:StructOfArrays>)
14+
add_test(NAME Cabana_Core_Tutorial_03 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:StructOfArrays>)

‎example/core_tutorial/04_aosoa/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(ArrayOfStructsOfArrays aosoa_example.cpp)
1313
target_link_libraries(ArrayOfStructsOfArrays Cabana::Core)
14-
add_test(NAME Core_tutorial_04 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:ArrayOfStructsOfArrays>)
14+
add_test(NAME Cabana_Core_Tutorial_04 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:ArrayOfStructsOfArrays>)

‎example/core_tutorial/04_aosoa_advanced_unmanaged/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(AdvancedUnmanagedAoSoA advanced_aosoa_unmanaged.cpp)
1313
target_link_libraries(AdvancedUnmanagedAoSoA Cabana::Core)
14-
add_test(NAME Core_tutorial_04_unmanaged COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:AdvancedUnmanagedAoSoA>)
14+
add_test(NAME Cabana_Core_Tutorial_04_unmanaged COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:AdvancedUnmanagedAoSoA>)

‎example/core_tutorial/05_slice/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(Slice slice_example.cpp)
1313
target_link_libraries(Slice Cabana::Core)
14-
add_test(NAME Core_tutorial_05 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:Slice>)
14+
add_test(NAME Cabana_Core_Tutorial_05 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:Slice>)

‎example/core_tutorial/05_slice_advanced_cuda/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(AdvancedCudaSlice advanced_slice_cuda.cpp)
1313
target_link_libraries(AdvancedCudaSlice Cabana::Core)
14-
add_test(NAME Core_tutorial_05_cuda COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:AdvancedCudaSlice>)
14+
add_test(NAME Cabana_Core_Tutorial_05_cuda COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:AdvancedCudaSlice>)

‎example/core_tutorial/05_slice_advanced_openmp/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(AdvancedOpenMPSlice advanced_slice_openmp.cpp)
1313
target_link_libraries(AdvancedOpenMPSlice Cabana::Core)
14-
add_test(NAME Core_tutorial_05_openmp COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:AdvancedOpenMPSlice>)
14+
add_test(NAME Cabana_Core_Tutorial_05_openmp COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:AdvancedOpenMPSlice>)

‎example/core_tutorial/06_deep_copy/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(DeepCopy deep_copy_example.cpp)
1313
target_link_libraries(DeepCopy Cabana::Core)
14-
add_test(NAME Core_tutorial_06 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:DeepCopy>)
14+
add_test(NAME Cabana_Core_Tutorial_06 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:DeepCopy>)

‎example/core_tutorial/07_sorting/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(Sorting sorting_example.cpp)
1313
target_link_libraries(Sorting Cabana::Core)
14-
add_test(NAME Core_tutorial_07 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:Sorting>)
14+
add_test(NAME Cabana_Core_Tutorial_07 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:Sorting>)

‎example/core_tutorial/08_linked_cell_list/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(LinkedCellList linked_cell_list_example.cpp)
1313
target_link_libraries(LinkedCellList Cabana::Core)
14-
add_test(NAME Core_tutorial_08 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:LinkedCellList>)
14+
add_test(NAME Cabana_Core_Tutorial_08 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:LinkedCellList>)

‎example/core_tutorial/09_neighbor_list/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(VerletList verlet_list_example.cpp)
1313
target_link_libraries(VerletList Cabana::Core)
14-
add_test(NAME Core_tutorial_09 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:VerletList>)
14+
add_test(NAME Cabana_Core_Tutorial_09 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:VerletList>)

‎example/core_tutorial/09_neighbor_list_arborx/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(ArborXList arborx_neighborlist_example.cpp)
1313
target_link_libraries(ArborXList Cabana::Core)
14-
add_test(NAME Core_tutorial_09_arborx COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:ArborXList>)
14+
add_test(NAME Cabana_Core_Tutorial_09_arborx COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:ArborXList>)

‎example/core_tutorial/10_neighbor_parallel_for/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(NeighParallelFor neighbor_parallel_for_example.cpp)
1313
target_link_libraries(NeighParallelFor Cabana::Core)
14-
add_test(NAME Core_tutorial_10_neighbor COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:NeighParallelFor>)
14+
add_test(NAME Cabana_Core_Tutorial_10_neighbor COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:NeighParallelFor>)

‎example/core_tutorial/10_simd_parallel_for/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(SimdParallelFor simd_parallel_for_example.cpp)
1313
target_link_libraries(SimdParallelFor Cabana::Core)
14-
add_test(NAME Core_tutorial_10_simd COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:SimdParallelFor>)
14+
add_test(NAME Cabana_Core_Tutorial_10_simd COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:SimdParallelFor>)

‎example/core_tutorial/11_migration/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
add_executable(Migration migration_example.cpp)
1313
target_link_libraries(Migration Cabana::Core)
14-
add_test(NAME Core_tutorial_11 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
14+
add_test(NAME Cabana_Core_Tutorial_11 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
1515
${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Migration> ${MPIEXEC_POSTFLAGS})
16-
set_tests_properties(Core_tutorial_11 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
16+
set_tests_properties(Cabana_Core_Tutorial_11 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/core_tutorial/12_halo_exchange/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
add_executable(HaloExchange halo_exchange_example.cpp)
1313
target_link_libraries(HaloExchange Cabana::Core)
14-
add_test(NAME Core_tutorial_12 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
14+
add_test(NAME Cabana_Core_Tutorial_12 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
1515
${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:HaloExchange> ${MPIEXEC_POSTFLAGS})
16-
set_tests_properties(Core_tutorial_12 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
16+
set_tests_properties(Cabana_Core_Tutorial_12 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/core_tutorial/13_hdf5_output/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111

1212
add_executable(HDF5Output hdf5_output_example.cpp)
1313
target_link_libraries(HDF5Output Cabana::Core)
14-
add_test(NAME Core_tutorial_13 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
14+
add_test(NAME Cabana_Core_Tutorial_13 COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
1515
${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:HDF5Output> ${MPIEXEC_POSTFLAGS})
16-
set_tests_properties(Core_tutorial_13 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
16+
set_tests_properties(Cabana_Core_Tutorial_13 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/core_tutorial/13_hdf5_output_advanced/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ if(EXISTS ${HDF5_BIN_DIR}/h5fuse.sh)
1717
elseif(EXISTS ${HDF5_BIN_DIR}/h5fuse)
1818
file(COPY ${HDF5_BIN_DIR}/h5fuse DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
1919
endif()
20-
add_test(NAME Core_tutorial_13_subfiling COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
20+
add_test(NAME Cabana_Core_Tutorial_13_subfiling COMMAND ${MPIEXEC} ${MPIEXEC_NUMPROC_FLAG}
2121
${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:AdvancedHDF5Output> ${MPIEXEC_POSTFLAGS})
22-
set_tests_properties(Core_tutorial_13_subfiling PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
22+
set_tests_properties(Cabana_Core_Tutorial_13_subfiling PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/01_types/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(MeshTypes types_example.cpp)
1313
target_link_libraries(MeshTypes Cabana::Grid)
14-
add_test(NAME Grid_tutorial_01 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:MeshTypes>)
14+
add_test(NAME Cabana_Grid_Tutorial_01 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:MeshTypes>)

‎example/grid_tutorial/02_global_mesh/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(GlobalMesh global_mesh_example.cpp)
1313
target_link_libraries(GlobalMesh Cabana::Grid)
14-
add_test(NAME Grid_tutorial_02 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:GlobalMesh>)
14+
add_test(NAME Cabana_Grid_Tutorial_02 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:GlobalMesh>)

‎example/grid_tutorial/03_partitioner/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(Partitioner partitioner_example.cpp)
1313
target_link_libraries(Partitioner Cabana::Grid)
14-
add_test(NAME Grid_tutorial_03 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Partitioner> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_03 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_03 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Partitioner> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_03 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/04_global_grid/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(GlobalGrid global_grid_example.cpp)
1313
target_link_libraries(GlobalGrid Cabana::Grid)
14-
add_test(NAME Grid_tutorial_04 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:GlobalGrid> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_04 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_04 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:GlobalGrid> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_04 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/05_index_space/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111

1212
add_executable(IndexSpace index_space_example.cpp)
1313
target_link_libraries(IndexSpace Cabana::Grid)
14-
add_test(NAME Grid_tutorial_05 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:IndexSpace>)
14+
add_test(NAME Cabana_Grid_Tutorial_05 COMMAND ${NONMPI_PRECOMMAND} $<TARGET_FILE:IndexSpace>)

‎example/grid_tutorial/06_local_grid/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(LocalGrid local_grid_example.cpp)
1313
target_link_libraries(LocalGrid Cabana::Grid)
14-
add_test(NAME Grid_tutorial_06 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:LocalGrid> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_06 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_06 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:LocalGrid> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_06 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/07_local_mesh/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(LocalMesh local_mesh_example.cpp)
1313
target_link_libraries(LocalMesh Cabana::Grid)
14-
add_test(NAME Grid_tutorial_07 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:LocalMesh> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_07 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_07 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:LocalMesh> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_07 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/08_array/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(Array array_example.cpp)
1313
target_link_libraries(Array Cabana::Grid)
14-
add_test(NAME Grid_tutorial_08 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Array> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_08 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_08 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Array> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_08 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/09_grid_parallel/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(GridParallel grid_parallel_example.cpp)
1313
target_link_libraries(GridParallel Cabana::Grid)
14-
add_test(NAME Grid_tutorial_09 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:GridParallel> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_09 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_09 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:GridParallel> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_09 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/10_fft_heffte/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(HeffteFFT heffte_fast_fourier_transform_example.cpp)
1313
target_link_libraries(HeffteFFT Cabana::Grid)
14-
add_test(NAME Grid_tutorial_10 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:HeffteFFT> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_10 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_10 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:HeffteFFT> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_10 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/11_semi_structured_solver_multi_variate/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(HypreSemiStructuredSolverMulti hypre_semi_structured_solver_multi_example.cpp)
1313
target_link_libraries(HypreSemiStructuredSolverMulti Cabana::Grid)
14-
add_test(NAME Grid_tutorial_11_hypre_SS COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:HypreSemiStructuredSolverMulti> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_11_hypre_SS PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_11_hypre_SS COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:HypreSemiStructuredSolverMulti> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_11_hypre_SS PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/11_structured_solver/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(StructuredSolver structured_solver_example.cpp)
1313
target_link_libraries(StructuredSolver Cabana::Grid)
14-
add_test(NAME Grid_tutorial_11 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:StructuredSolver> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_11 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_11 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:StructuredSolver> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_11 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/11_structured_solver_hypre/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(HypreStructuredSolver hypre_structured_solver_example.cpp)
1313
target_link_libraries(HypreStructuredSolver Cabana::Grid)
14-
add_test(NAME Grid_tutorial_11_hypre COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:HypreStructuredSolver> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_11_hypre PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_11_hypre COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:HypreStructuredSolver> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_11_hypre PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/12_halo/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(Halo halo_example.cpp)
1313
target_link_libraries(Halo Cabana::Grid)
14-
add_test(NAME Grid_tutorial_12 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Halo> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_12 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_12 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Halo> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_12 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/13_all_loadbalancer/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(Loadbalancer loadbalancer_example.cpp)
1313
target_link_libraries(Loadbalancer Cabana::Grid)
14-
add_test(NAME Grid_tutorial_13 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Loadbalancer> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_13 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_13 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Loadbalancer> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_13 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/14_spline/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(Spline spline_example.cpp)
1313
target_link_libraries(Spline Cabana::Grid)
14-
add_test(NAME Grid_tutorial_14 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Spline> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_14 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_14 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Spline> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_14 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

‎example/grid_tutorial/15_interpolation/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@
1111

1212
add_executable(Interpolation interpolation_example.cpp)
1313
target_link_libraries(Interpolation Cabana::Grid)
14-
add_test(NAME Grid_tutorial_15 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Interpolation> ${MPIEXEC_POSTFLAGS})
15-
set_tests_properties(Grid_tutorial_15 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})
14+
add_test(NAME Cabana_Grid_Tutorial_15 COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:Interpolation> ${MPIEXEC_POSTFLAGS})
15+
set_tests_properties(Cabana_Grid_Tutorial_15 PROPERTIES PROCESSORS ${MPIEXEC_MAX_NUMPROCS})

0 commit comments

Comments
 (0)
Please sign in to comment.