use mpi_launcher.cmake

correct old mistake in TEST_LAUNCHER

Author: scivision

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19...3.28)
+cmake_minimum_required(VERSION 3.19...3.29)
 
 project(FortranMPIexamples
 LANGUAGES C Fortran
@@ -12,6 +12,7 @@ message(STATUS "CMake ${CMAKE_VERSION} Generator ${CMAKE_GENERATOR}  Build type
 
 # this has checks that can be reused in other projects as well
 include(cmake/mpi.cmake)
+include(cmake/mpi_launcher.cmake)
 
 include(cmake/print_target_props.cmake)
 print_target_props(MPI::MPI_Fortran)

cmake/mpi.cmake

@@ -17,7 +17,6 @@ message(STATUS "MPI_Fortran_LINK_FLAGS: ${MPI_Fortran_LINK_FLAGS}")
 
 include(${CMAKE_CURRENT_LIST_DIR}/openmpi.cmake)
 
-
 if(MPI_Fortran_HAVE_F08_MODULE)
   return()
 endif()

cmake/mpi_launcher.cmake

@@ -0,0 +1,23 @@
+function(test_mpi_launcher target test Nworker)
+
+if(NOT (DEFINED MPIEXEC_EXECUTABLE AND DEFINED MPIEXEC_NUMPROC_FLAG))
+  message(FATAL_ERROR "MPIEXEC_EXECUTABLE and MPIEXEC_NUMPROC_FLAG must be defined to use test_mpi_launcher")
+endif()
+
+if(NOT Nworker)
+  message(FATAL_ERROR "Nworker must be defined to use test_mpi_launcher")
+endif()
+
+if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
+  set_property(TARGET ${target} PROPERTY TEST_LAUNCHER ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${Nworker})
+else()
+  set_property(TARGET ${target} PROPERTY CROSSCOMPILING_EMULATOR ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${Nworker})
+endif()
+
+set_property(TEST ${test} PROPERTY PROCESSORS ${Nworker})
+
+if(DEFINED mpi_tmpdir)
+  set_property(TEST ${test} PROPERTY ENVIRONMENT "TMPDIR=${mpi_tmpdir}")
+endif()
+
+endfunction()

cmake/openmpi.cmake

@@ -1,13 +1,16 @@
 # https://github.com/open-mpi/ompi/issues/7393
 # https://github.com/gerlero/openfoam-app/pull/112
 # https://apple.stackexchange.com/a/287710
-# *** OpenMPI workaround
+
+message(VERBOSE "MPI_C_LIBRARY_VERSION_STRING: ${MPI_C_LIBRARY_VERSION_STRING}")
+
 if(UNIX AND MPI_C_LIBRARY_VERSION_STRING MATCHES "Open[ ]?MPI")
   if(NOT DEFINED mpi_tmpdir)
     execute_process(COMMAND mktemp -d /tmp/mpi-XXXXXXXX
     RESULT_VARIABLE ret
     OUTPUT_VARIABLE mpi_tmpdir
     OUTPUT_STRIP_TRAILING_WHITESPACE
+    TIMEOUT 10
     )
     if(NOT ret EQUAL 0)
       message(FATAL_ERROR "could not create MPI working dir via mktemp -d: ${ret}")
@@ -16,4 +19,3 @@ if(UNIX AND MPI_C_LIBRARY_VERSION_STRING MATCHES "Open[ ]?MPI")
     message(STATUS "${ret}: Created MPI working dir ${mpi_tmpdir}")
   endif()
 endif()
-# *** END OpenMPI workaround

test/CMakeLists.txt

@@ -1,27 +1,32 @@
 add_executable(mpi_basic_C basic.c)
 target_link_libraries(mpi_basic_C PRIVATE MPI::MPI_C)
-add_test(NAME mpi_basic_C COMMAND mpi_basic_C)
+add_test(NAME MPIbasicC COMMAND mpi_basic_C)
+test_mpi_launcher(mpi_basic_C MPIbasicC 1)
 
 add_executable(mpi_version_C mpivers.c)
 target_link_libraries(mpi_version_C PRIVATE MPI::MPI_C)
-add_test(NAME mpi_version_C COMMAND mpi_version_C)
+add_test(NAME MPIversionC COMMAND mpi_version_C)
+test_mpi_launcher(mpi_version_C MPIversionC 1)
 
 # --- Fortran MPI-3
 
 add_executable(mpi_basic_Fortran basic.f90)
 target_link_libraries(mpi_basic_Fortran PRIVATE MPI::MPI_Fortran)
-add_test(NAME mpi_basic_Fortran COMMAND mpi_basic_Fortran)
+add_test(NAME MPIbasicFortran COMMAND mpi_basic_Fortran)
+test_mpi_launcher(mpi_basic_Fortran MPIbasicFortran 1)
 
 add_executable(mpi_version_Fortran mpivers.f90)
 target_link_libraries(mpi_version_Fortran PRIVATE MPI::MPI_Fortran)
-add_test(NAME mpi_version_Fortran COMMAND mpi_version_Fortran)
+add_test(NAME MPIversionFortran COMMAND mpi_version_Fortran)
+test_mpi_launcher(mpi_version_Fortran MPIversionFortran 1)
 
 # --- more than one MPI image
 
 add_executable(mpi_hello helloworld.f90)
 target_link_libraries(mpi_hello PRIVATE MPI::MPI_Fortran)
-add_test(NAME mpi_hello COMMAND mpi_hello)
-set_property(TEST mpi_hello PROPERTY FIXTURES_SETUP mpi_fxt)
+add_test(NAME MPIhello COMMAND mpi_hello)
+test_mpi_launcher(mpi_hello MPIhello ${MPIEXEC_MAX_NUMPROCS})
+set_property(TEST MPIhello PROPERTY FIXTURES_SETUP mpi_fxt)
 
 # --- actual message passing
 
@@ -30,37 +35,17 @@ target_link_libraries(mpi_pass PRIVATE MPI::MPI_Fortran)
 
 if(MPIEXEC_MAX_NUMPROCS GREATER_EQUAL 2)
 
-add_test(NAME mpi_pass COMMAND mpi_pass)
-set_property(TEST mpi_pass PROPERTY FIXTURES_REQUIRED mpi_fxt)
+add_test(NAME MPIpass COMMAND mpi_pass)
+test_mpi_launcher(mpi_pass MPIpass 2)
+set_property(TEST MPIpass PROPERTY FIXTURES_REQUIRED mpi_fxt)
 
 endif()
 
 # --- test properties
 
 get_property(tests DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY TESTS)
 
-set_property(TEST ${tests} PROPERTY cpu_mpi)
-
-set_property(TEST ${tests} PROPERTY SKIP_REGULAR_EXPRESSION "No host list provided")
-
-# convenience vars
-set(single mpi_basic_C mpi_version_C mpi_basic_Fortran mpi_version_Fortran)
-set(_m ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG})
-
-if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
-
-set_property(TEST ${single} PROPERTY TEST_LAUNCHER ${_m} 1)
-set_property(TEST mpi_hello PROPERTY TEST_LAUNCHER ${_m} ${MPIEXEC_MAX_NUMPROCS})
-set_property(TEST mpi_pass PROPERTY TEST_LAUNCHER ${_m} 2)
-
-else()
-
-set_property(TARGET ${single} PROPERTY CROSSCOMPILING_EMULATOR ${_m} 1)
-set_property(TARGET mpi_hello PROPERTY CROSSCOMPILING_EMULATOR ${_m} ${MPIEXEC_MAX_NUMPROCS})
-set_property(TARGET mpi_pass PROPERTY CROSSCOMPILING_EMULATOR ${_m} 2)
-
-endif()
-
-if(DEFINED mpi_tmpdir)
-  set_property(TEST ${tests} PROPERTY ENVIRONMENT TMPDIR=${mpi_tmpdir})
-endif()
+set_tests_properties(${tests} PROPERTIES
+RESOURCE_LOCK mpi
+SKIP_REGULAR_EXPRESSION "No host list provided"
+)