From 4e6208a93497b114c686cd7da8dcbfce640b1dbf Mon Sep 17 00:00:00 2001
From: Maxence Thevenet <maxence.thevenet@desy.de>
Date: Wed, 10 Mar 2021 14:47:32 +0100
Subject: [PATCH] remove configure_mpiexec from cmake

---
 CMakeLists.txt              |  9 ---------
 cmake/HiPACEFunctions.cmake | 25 -------------------------
 2 files changed, 34 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96cc1085a6..3c55b9fb5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,7 +208,6 @@ if(BUILD_TESTING)
 
     else()
 
-        configure_mpiexec(1)  # one rank in MPI_TEST_EXE
         add_test(NAME blowout_wake.2Rank
                  COMMAND ${HiPACE_SOURCE_DIR}/tests/blowout_wake.2Rank.sh
                          $<TARGET_FILE:HiPACE> ${HiPACE_SOURCE_DIR}
@@ -293,14 +292,6 @@ if(BUILD_TESTING)
                  WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
         )
 
-        # This test is temporarily removed, due to bugs in the parallelization
-        # configure_mpiexec(2)  # two ranks in MPI_TEST_EXE
-        # add_test(NAME blowout_wake.2Rank
-        #         COMMAND ${HiPACE_SOURCE_DIR}/tests/blowout_wake.2Rank.sh
-        #                 $<TARGET_FILE:HiPACE> ${HiPACE_SOURCE_DIR}
-        #         WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
-        #)
-
     endif()
 endif()
 
diff --git a/cmake/HiPACEFunctions.cmake b/cmake/HiPACEFunctions.cmake
index 975d0f6ac1..9ed825093c 100644
--- a/cmake/HiPACEFunctions.cmake
+++ b/cmake/HiPACEFunctions.cmake
@@ -167,31 +167,6 @@ function(set_hipace_binary_name)
 endfunction()
 
 
-# Set an MPI_TEST_EXE variable for test runs which runs num_ranks
-# ranks. On some systems, you might need to use the a specific
-# mpiexec wrapper, e.g. on Summit (ORNL) pass the hint
-# -DMPIEXEC_EXECUTABLE=$(which jsrun) to run ctest.
-#
-function(configure_mpiexec num_ranks)
-    # OpenMPI root guard: https://github.com/open-mpi/ompi/issues/4451
-    if("$ENV{USER}" STREQUAL "root")
-        # calling even --help as root will abort and warn on stderr
-        execute_process(COMMAND ${MPIEXEC_EXECUTABLE} --help
-            ERROR_VARIABLE MPIEXEC_HELP_TEXT
-            OUTPUT_STRIP_TRAILING_WHITESPACE)
-            if(${MPIEXEC_HELP_TEXT} MATCHES "^.*allow-run-as-root.*$")
-                set(MPI_ALLOW_ROOT --allow-run-as-root)
-            endif()
-    endif()
-    set(MPI_TEST_EXE
-        ${MPIEXEC_EXECUTABLE}
-        ${MPI_ALLOW_ROOT}
-        ${MPIEXEC_NUMPROC_FLAG} ${num_ranks}
-        PARENT_SCOPE
-    )
-endfunction()
-
-
 # Prints a summary of HiPACE options at the end of the CMake configuration
 #
 function(hipace_print_summary)