allow using mpirun to run tests

quokka-astro · Sep 27, 2024 · d385838 · d385838
1 parent f42de31
commit d385838
Show file tree

Hide file tree

Showing 50 changed files with 59 additions and 53 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -34,6 +34,7 @@ option(ENABLE_HWASAN "Enable HWAddressSanitizer" OFF)
 option(ENABLE_TESTS_FPE "Enable floating-point exceptions when running tests" ON)
 option(WARNINGS_AS_ERRORS "Treat compiler warnings as errors" OFF)
 option(QUOKKA_OPENPMD "Enable OpenPMD output (on/off)" OFF)
+option(USE_MPIRUN_FOR_TESTS "Use 'mpirun' to run tests" OFF)
 
 if(AMReX_GPU_BACKEND MATCHES "CUDA")
   enable_language(CUDA)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -128,6 +128,11 @@ link_libraries(yaml-cpp::yaml-cpp)
 
 include(CTest)
 
+# Run each test with "mpirun". This is required for NVIDIA's HPC-X MPI.
+if (USE_MPIRUN_FOR_TESTS)
+  set (MPI_RUNNER "mpirun")
+endif(USE_MPIRUN_FOR_TESTS)
+
 set (QuokkaSourcesNoEOS "${CMAKE_CURRENT_SOURCE_DIR}/main.cpp"
                         "${CMAKE_CURRENT_SOURCE_DIR}/io/DiagBase.cpp" 
                         "${CMAKE_CURRENT_SOURCE_DIR}/io/DiagFilter.cpp" 

diff --git a/src/problems/Advection/CMakeLists.txt b/src/problems/Advection/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_advection)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME ScalarAdvection COMMAND test_advection advection_sawtooth.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME ScalarAdvection COMMAND ${MPI_RUNNER} test_advection advection_sawtooth.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/Advection2D/CMakeLists.txt b/src/problems/Advection2D/CMakeLists.txt
@@ -4,5 +4,5 @@ if (AMReX_SPACEDIM GREATER_EQUAL 2)
         setup_target_for_cuda_compilation(test_advection2d)
     endif()
 
-    add_test(NAME Advection2D COMMAND test_advection2d advection2d_amr.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+    add_test(NAME Advection2D COMMAND ${MPI_RUNNER} test_advection2d advection2d_amr.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()
diff --git a/src/problems/AdvectionSemiellipse/CMakeLists.txt b/src/problems/AdvectionSemiellipse/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_advection_se)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME ScalarAdvectionSemiEllipse COMMAND test_advection_se advection_semiellipse.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME ScalarAdvectionSemiEllipse COMMAND ${MPI_RUNNER} test_advection_se advection_semiellipse.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/BinaryOrbitCIC/CMakeLists.txt b/src/problems/BinaryOrbitCIC/CMakeLists.txt
@@ -4,5 +4,5 @@ if (AMReX_SPACEDIM EQUAL 3)
         setup_target_for_cuda_compilation(binary_orbit)
     endif()
 
-    add_test(NAME BinaryOrbitCIC COMMAND binary_orbit BinaryOrbit.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+    add_test(NAME BinaryOrbitCIC COMMAND ${MPI_RUNNER} binary_orbit BinaryOrbit.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()
diff --git a/src/problems/FCQuantities/CMakeLists.txt b/src/problems/FCQuantities/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_fc_quantities)
 endif()
 
-add_test(NAME FCQuantities COMMAND test_fc_quantities fc_hydro_wave.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME FCQuantities COMMAND ${MPI_RUNNER} test_fc_quantities fc_hydro_wave.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroBlast3D/CMakeLists.txt b/src/problems/HydroBlast3D/CMakeLists.txt
@@ -4,5 +4,5 @@ if (AMReX_SPACEDIM EQUAL 3)
         setup_target_for_cuda_compilation(test_hydro3d_blast)
     endif()
 
-    add_test(NAME HydroBlast3D COMMAND test_hydro3d_blast blast_unigrid_128.in ${QuokkaTestParams} ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+    add_test(NAME HydroBlast3D COMMAND ${MPI_RUNNER} test_hydro3d_blast blast_unigrid_128.in ${QuokkaTestParams} ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()
diff --git a/src/problems/HydroContact/CMakeLists.txt b/src/problems/HydroContact/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_contact)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME HydroContact COMMAND test_hydro_contact contact_wave.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME HydroContact COMMAND ${MPI_RUNNER} test_hydro_contact contact_wave.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroHighMach/CMakeLists.txt b/src/problems/HydroHighMach/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_highmach)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME HydroHighMach COMMAND test_hydro_highmach HighMach.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME HydroHighMach COMMAND ${MPI_RUNNER} test_hydro_highmach HighMach.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroLeblanc/CMakeLists.txt b/src/problems/HydroLeblanc/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_leblanc)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME HydroLeblanc COMMAND test_hydro_leblanc leblanc.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME HydroLeblanc COMMAND ${MPI_RUNNER} test_hydro_leblanc leblanc.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroQuirk/CMakeLists.txt b/src/problems/HydroQuirk/CMakeLists.txt
@@ -4,5 +4,5 @@ if (AMReX_SPACEDIM GREATER_EQUAL 2)
         setup_target_for_cuda_compilation(test_quirk)
     endif()
 
-    add_test(NAME HydroQuirk COMMAND test_quirk quirk.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+    add_test(NAME HydroQuirk COMMAND ${MPI_RUNNER} test_quirk quirk.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()
diff --git a/src/problems/HydroSMS/CMakeLists.txt b/src/problems/HydroSMS/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_sms)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME HydroSlowMovingShock COMMAND test_hydro_sms SlowMovingShock.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME HydroSlowMovingShock COMMAND ${MPI_RUNNER} test_hydro_sms SlowMovingShock.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroShocktube/CMakeLists.txt b/src/problems/HydroShocktube/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_shocktube)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME HydroShocktube COMMAND test_hydro_shocktube shocktube.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME HydroShocktube COMMAND ${MPI_RUNNER} test_hydro_shocktube shocktube.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroShocktubeCMA/CMakeLists.txt b/src/problems/HydroShocktubeCMA/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_shocktube_cma)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME HydroShocktubeCMA COMMAND test_hydro_shocktube_cma shocktube_cma.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME HydroShocktubeCMA COMMAND ${MPI_RUNNER} test_hydro_shocktube_cma shocktube_cma.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroShuOsher/CMakeLists.txt b/src/problems/HydroShuOsher/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_shuosher)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME ShuOsher COMMAND test_hydro_shuosher ShuOsher.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME ShuOsher COMMAND ${MPI_RUNNER} test_hydro_shuosher ShuOsher.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroVacuum/CMakeLists.txt b/src/problems/HydroVacuum/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_vacuum)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME HydroVacuum COMMAND test_hydro_vacuum vacuum.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME HydroVacuum COMMAND ${MPI_RUNNER} test_hydro_vacuum vacuum.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/HydroWave/CMakeLists.txt b/src/problems/HydroWave/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_hydro_wave)
 endif()
 
-add_test(NAME HydroWave COMMAND test_hydro_wave hydro_wave.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME HydroWave COMMAND ${MPI_RUNNER} test_hydro_wave hydro_wave.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/NSCBC/CMakeLists.txt b/src/problems/NSCBC/CMakeLists.txt
@@ -4,7 +4,7 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_channel_flow)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME ChannelFlow COMMAND test_channel_flow NSCBC_Channel.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME ChannelFlow COMMAND ${MPI_RUNNER} test_channel_flow NSCBC_Channel.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 
 if (AMReX_SPACEDIM GREATER_EQUAL 2)
     add_executable(test_vortex vortex.cpp ${QuokkaObjSources})

diff --git a/src/problems/ODEIntegration/CMakeLists.txt b/src/problems/ODEIntegration/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_ode)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME ODEIntegration COMMAND test_ode ODE.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME ODEIntegration COMMAND ${MPI_RUNNER} test_ode ODE.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/PassiveScalar/CMakeLists.txt b/src/problems/PassiveScalar/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_scalars)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME PassiveScalar COMMAND test_scalars PassiveScalar.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME PassiveScalar COMMAND ${MPI_RUNNER} test_scalars PassiveScalar.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/PopIII/CMakeLists.txt b/src/problems/PopIII/CMakeLists.txt
@@ -68,11 +68,11 @@ if (AMReX_SPACEDIM EQUAL 3)
     endif()
 
 
-    add_test(NAME ComputePerturbations COMMAND python3 ${CMAKE_SOURCE_DIR}/src/turbulence/perturbation.py --kmin=2 --kmax=${result} --size=${first_digits} --alpha=1.8 --f_solenoidal=0.66667 ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
-    add_test(NAME PopIII COMMAND popiii PopIII.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+    add_test(NAME ComputePerturbations COMMAND ${MPI_RUNNER} python3 ${CMAKE_SOURCE_DIR}/src/turbulence/perturbation.py --kmin=2 --kmax=${result} --size=${first_digits} --alpha=1.8 --f_solenoidal=0.66667 ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+    add_test(NAME PopIII COMMAND ${MPI_RUNNER} popiii PopIII.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
     set_tests_properties(ComputePerturbations PROPERTIES FIXTURES_SETUP PopIII_fixture)
     set_tests_properties(PopIII PROPERTIES FIXTURES_REQUIRED PopIII_fixture)
 
     # AMR test only works on Setonix because Gadi and avatar do not have enough memory per GPU
-    # add_test(NAME PopIIIAMR COMMAND popiii popiii_AMR.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+    # add_test(NAME PopIIIAMR COMMAND ${MPI_RUNNER} popiii popiii_AMR.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()
diff --git a/src/problems/PrimordialChem/CMakeLists.txt b/src/problems/PrimordialChem/CMakeLists.txt
@@ -14,4 +14,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_primordial_chem)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME PrimordialChem COMMAND test_primordial_chem primordial_chem.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME PrimordialChem COMMAND ${MPI_RUNNER} test_primordial_chem primordial_chem.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadDust/CMakeLists.txt b/src/problems/RadDust/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_rad_dust)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME RadDust COMMAND test_rad_dust RadDust.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME RadDust COMMAND ${MPI_RUNNER} test_rad_dust RadDust.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadDustMG/CMakeLists.txt b/src/problems/RadDustMG/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_rad_dust_MG)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME RadDustMG COMMAND test_rad_dust_MG RadDust.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME RadDustMG COMMAND ${MPI_RUNNER} test_rad_dust_MG RadDust.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadForce/CMakeLists.txt b/src/problems/RadForce/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_force)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME RadForce COMMAND test_radiation_force RadForce.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME RadForce COMMAND ${MPI_RUNNER} test_radiation_force RadForce.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadMarshak/CMakeLists.txt b/src/problems/RadMarshak/CMakeLists.txt
@@ -5,4 +5,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_marshak)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME MarshakWave COMMAND test_radiation_marshak Marshak.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME MarshakWave COMMAND ${MPI_RUNNER} test_radiation_marshak Marshak.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadMarshakAsymptotic/CMakeLists.txt b/src/problems/RadMarshakAsymptotic/CMakeLists.txt
@@ -4,6 +4,6 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_marshak_asymptotic)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME MarshakWaveAsymptoticDiffusion COMMAND test_radiation_marshak_asymptotic MarshakAsymptotic.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME MarshakWaveAsymptoticDiffusion COMMAND ${MPI_RUNNER} test_radiation_marshak_asymptotic MarshakAsymptotic.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 
-add_test(NAME MarshakWaveAsymptoticCorr COMMAND test_radiation_marshak_asymptotic MarshakAsymptoticCorr.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME MarshakWaveAsymptoticCorr COMMAND ${MPI_RUNNER} test_radiation_marshak_asymptotic MarshakAsymptoticCorr.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadMarshakCGS/CMakeLists.txt b/src/problems/RadMarshakCGS/CMakeLists.txt
@@ -5,4 +5,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_marshak_cgs)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME MarshakWaveCGS COMMAND test_radiation_marshak_cgs MarshakCGS.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME MarshakWaveCGS COMMAND ${MPI_RUNNER} test_radiation_marshak_cgs MarshakCGS.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadMarshakDust/CMakeLists.txt b/src/problems/RadMarshakDust/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_marshak_dust)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME RadiationMarshakDust COMMAND test_radiation_marshak_dust RadMarshakDust.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME RadiationMarshakDust COMMAND ${MPI_RUNNER} test_radiation_marshak_dust RadMarshakDust.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadMarshakVaytet/CMakeLists.txt b/src/problems/RadMarshakVaytet/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_marshak_Vaytet)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME MarshakWaveVaytet COMMAND test_radiation_marshak_Vaytet MarshakVaytet.in WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME MarshakWaveVaytet COMMAND ${MPI_RUNNER} test_radiation_marshak_Vaytet MarshakVaytet.in WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadMatterCoupling/CMakeLists.txt b/src/problems/RadMatterCoupling/CMakeLists.txt
@@ -5,4 +5,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_matter_coupling)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME MatterEnergyExchange COMMAND test_radiation_matter_coupling energyexchange.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME MatterEnergyExchange COMMAND ${MPI_RUNNER} test_radiation_matter_coupling energyexchange.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadMatterCouplingRSLA/CMakeLists.txt b/src/problems/RadMatterCouplingRSLA/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_matter_coupling_rsla)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME MatterEnergyExchangeRSLA COMMAND test_radiation_matter_coupling_rsla MatterEnergyExchangeRSLA.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME MatterEnergyExchangeRSLA COMMAND ${MPI_RUNNER} test_radiation_matter_coupling_rsla MatterEnergyExchangeRSLA.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadPulse/CMakeLists.txt b/src/problems/RadPulse/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_pulse)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME RadiationPulse COMMAND test_radiation_pulse RadPulse.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME RadiationPulse COMMAND ${MPI_RUNNER} test_radiation_pulse RadPulse.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadStreaming/CMakeLists.txt b/src/problems/RadStreaming/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_streaming)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME RadiationStreaming COMMAND test_radiation_streaming RadStreaming.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME RadiationStreaming COMMAND ${MPI_RUNNER} test_radiation_streaming RadStreaming.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadStreamingY/CMakeLists.txt b/src/problems/RadStreamingY/CMakeLists.txt
@@ -5,5 +5,5 @@ if (AMReX_SPACEDIM GREATER_EQUAL 2)
 			setup_target_for_cuda_compilation(test_radiation_streaming_y)
 	endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-	add_test(NAME RadiationStreamingY COMMAND test_radiation_streaming_y RadStreamingY.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+	add_test(NAME RadiationStreamingY COMMAND ${MPI_RUNNER} test_radiation_streaming_y RadStreamingY.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()
diff --git a/src/problems/RadSuOlson/CMakeLists.txt b/src/problems/RadSuOlson/CMakeLists.txt
@@ -5,4 +5,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_SuOlson)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME SuOlsonTest COMMAND test_radiation_SuOlson SuOlson.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME SuOlsonTest COMMAND ${MPI_RUNNER} test_radiation_SuOlson SuOlson.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadTube/CMakeLists.txt b/src/problems/RadTube/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radiation_tube)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME RadiationPressureTube COMMAND test_radiation_tube RadTube.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME RadiationPressureTube COMMAND ${MPI_RUNNER} test_radiation_tube RadTube.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadhydroBB/CMakeLists.txt b/src/problems/RadhydroBB/CMakeLists.txt
@@ -4,4 +4,4 @@ if(AMReX_GPU_BACKEND MATCHES "CUDA")
     setup_target_for_cuda_compilation(test_radhydro_bb)
 endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-add_test(NAME RadhydroBB COMMAND test_radhydro_bb RadhydroBB.in WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+add_test(NAME RadhydroBB COMMAND ${MPI_RUNNER} test_radhydro_bb RadhydroBB.in WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
diff --git a/src/problems/RadhydroPulse/CMakeLists.txt b/src/problems/RadhydroPulse/CMakeLists.txt
@@ -5,5 +5,5 @@ if (AMReX_SPACEDIM EQUAL 1)
       setup_target_for_cuda_compilation(test_radhydro_pulse)
   endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-  add_test(NAME RadhydroPulse COMMAND test_radhydro_pulse RadhydroPulse.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+  add_test(NAME RadhydroPulse COMMAND ${MPI_RUNNER} test_radhydro_pulse RadhydroPulse.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()
diff --git a/src/problems/RadhydroPulseDyn/CMakeLists.txt b/src/problems/RadhydroPulseDyn/CMakeLists.txt
@@ -5,5 +5,5 @@ if (AMReX_SPACEDIM EQUAL 1)
       setup_target_for_cuda_compilation(test_radhydro_pulse_dyn)
   endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-  add_test(NAME RadhydroPulseDyn COMMAND test_radhydro_pulse_dyn RadhydroPulseDyn.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+  add_test(NAME RadhydroPulseDyn COMMAND ${MPI_RUNNER} test_radhydro_pulse_dyn RadhydroPulseDyn.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()
diff --git a/src/problems/RadhydroPulseGrey/CMakeLists.txt b/src/problems/RadhydroPulseGrey/CMakeLists.txt
@@ -5,5 +5,5 @@ if (AMReX_SPACEDIM EQUAL 1)
       setup_target_for_cuda_compilation(test_radhydro_pulse_grey)
   endif(AMReX_GPU_BACKEND MATCHES "CUDA")
 
-  add_test(NAME RadhydroPulseGrey COMMAND test_radhydro_pulse_grey RadhydroPulseGrey.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
+  add_test(NAME RadhydroPulseGrey COMMAND ${MPI_RUNNER} test_radhydro_pulse_grey RadhydroPulseGrey.in ${QuokkaTestParams} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 endif()