From: David Wells <drwells@email.unc.edu>
Date: Mon, 25 Mar 2024 17:23:54 +0000 (-0400)
Subject: Fix test environment variables for OpenMPI 5.
X-Git-Tag: v9.6.0-rc1~452^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a13d4323da686072446f132f76de4f83bd2ca759;p=dealii.git

Fix test environment variables for OpenMPI 5.
---

diff --git a/cmake/scripts/run_test.sh b/cmake/scripts/run_test.sh
index bdee6ec40a..4552c2f136 100644
--- a/cmake/scripts/run_test.sh
+++ b/cmake/scripts/run_test.sh
@@ -95,9 +95,15 @@ case $STAGE in
     #    policies. This is important to ensure that performance tests are
     #    scheduled properly.
     #
+    # for OpenMPI 4 and older:
     export OMPI_MCA_rmaps_base_oversubscribe=1
+    # for OpenMPI 5:
+    export PRTE_MCA_rmaps_default_mapping_policy=:oversubscribe
     if [ -z "${TEST_IS_EXCLUSIVE+x}" ]; then
+      # for OpenMPI 4 and older:
       export OMPI_MCA_hwloc_base_binding_policy=none
+      # for OpenMPI 5:
+      export PRTE_MCA_hwloc_default_binding_policy=none
     fi
 
     #