From 93da7edf704fac1390d21a157eb82e8a650e6265 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 23 Oct 2024 15:41:46 -0600 Subject: [PATCH 1/2] cmake: clarify test parallelization --- cmake/heffte_macros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/heffte_macros.cmake b/cmake/heffte_macros.cmake index f67d337..4df7c9d 100644 --- a/cmake/heffte_macros.cmake +++ b/cmake/heffte_macros.cmake @@ -57,7 +57,7 @@ endmacro() macro(heffte_add_mpi_test) cmake_parse_arguments(_heffte "" "NAME;COMMAND;RANKS" "" ${ARGN} ) add_test(${_heffte_NAME} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${_heffte_RANKS} ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${_heffte_COMMAND} ${MPIEXEC_POSTFLAGS}) - set_tests_properties(${_heffte_NAME} PROPERTIES RUN_SERIAL ${Heffte_SEQUENTIAL_TESTING}) + set_tests_properties(${_heffte_NAME} PROPERTIES PROCESSORS ${_heffte_RANKS} RUN_SERIAL ${Heffte_SEQUENTIAL_TESTING}) unset(_heffte_NAME) unset(_heffte_RANKS) unset(_heffte_COMMAND) From bd250fa69c99c59f62d7e2a10ff7cf03c6568703 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Wed, 23 Oct 2024 15:49:46 -0600 Subject: [PATCH 2/2] MakeTest.cmake: set processor property --- cmake/MakeTest.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/MakeTest.cmake b/cmake/MakeTest.cmake index 7a7e6fe..ebc10a1 100644 --- a/cmake/MakeTest.cmake +++ b/cmake/MakeTest.cmake @@ -8,6 +8,7 @@ message(STATUS "heFFTe post-installation testing") macro(heffte_add_mpi_test) cmake_parse_arguments(_heffte "" "NAME;COMMAND;RANKS" "" ${ARGN} ) add_test(${_heffte_NAME} ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${_heffte_RANKS} ${MPIEXEC_PREFLAGS} ${CMAKE_CURRENT_BINARY_DIR}/${_heffte_COMMAND} ${MPIEXEC_POSTFLAGS}) + set_tests_properties(${_heffte_NAME} PROPERTIES PROCESSORS ${_heffte_RANKS}) unset(_heffte_NAME) unset(_heffte_RANKS) unset(_heffte_COMMAND)