rather than forcing tcp communication for OpenMPI, we disable infiniband instead for better stability of tests

tools/singularity/centos7.def

@@ -79,8 +79,8 @@ EOF
         # load MPI by default
         . /etc/profile
         module load mpi
-        # restrict OpenMPI to shared memory comm by default
+        # tell OpenMPI to not try using Infiniband
-        OMPI_MCA_btl="tcp,self"
+        OMPI_MCA_btl="^openib"
         # do not warn about unused components as this messes up testing
         OMPI_MCA_btl_base_warn_component_unused="0"
         export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/centos8.def

@@ -84,8 +84,8 @@ EOF
         # load MPI by default
         . /etc/profile
         module load mpi
-        # restrict OpenMPI to shared memory comm by default
+        # tell OpenMPI to not try using Infiniband
-        OMPI_MCA_btl="tcp,self"
+        OMPI_MCA_btl="^openib"
         # do not warn about unused components as this messes up testing
         OMPI_MCA_btl_base_warn_component_unused="0"
         export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/fedora32_mingw.def

@@ -85,8 +85,8 @@ EOF
         # load MPI by default
         . /etc/profile
         module load mpi
-        # restrict OpenMPI to shared memory comm by default
+        # tell OpenMPI to not try using Infiniband
-        OMPI_MCA_btl="tcp,self"
+        OMPI_MCA_btl="^openib"
         # do not warn about unused components as this messes up testing
         OMPI_MCA_btl_base_warn_component_unused="0"
         export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu16.04.def

@@ -28,8 +28,8 @@ EOF
 %environment
         LC_ALL=C
         export LC_ALL
-        # restrict OpenMPI to shared memory comm by default
+        # tell OpenMPI to not try using Infiniband
-        OMPI_MCA_btl="tcp,self"
+        OMPI_MCA_btl="^openib"
         # do not warn about unused components as this messes up testing
         OMPI_MCA_btl_base_warn_component_unused="0"
         export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu18.04.def

@@ -103,8 +103,8 @@ EOF
     LC_ALL=C
     export LC_ALL
     export PATH=/usr/lib/ccache:$PATH
-    # restrict OpenMPI to shared memory comm by default
+    # tell OpenMPI to not try using Infiniband
-    OMPI_MCA_btl="tcp,self"
+    OMPI_MCA_btl="^openib"
     # do not warn about unused components as this messes up testing
     OMPI_MCA_btl_base_warn_component_unused="0"
     export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu18.04_amd_rocm.def

@@ -89,8 +89,8 @@ EOF
 %environment
     LC_ALL=C
     export LC_ALL
-    # restrict OpenMPI to shared memory comm by default
+    # tell OpenMPI to not try using Infiniband
-    OMPI_MCA_btl="tcp,self"
+    OMPI_MCA_btl="^openib"
     # do not warn about unused components as this messes up testing
     OMPI_MCA_btl_base_warn_component_unused="0"
     export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu18.04_gpu.def

@@ -116,8 +116,8 @@ EOF
 %environment
     LC_ALL=C
     export LC_ALL
-    # restrict OpenMPI to shared memory comm by default
+    # tell OpenMPI to not try using Infiniband
-    OMPI_MCA_btl="tcp,self"
+    OMPI_MCA_btl="^openib"
     # do not warn about unused components as this messes up testing
     OMPI_MCA_btl_base_warn_component_unused="0"
     export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu18.04_intel_opencl.def

@@ -82,8 +82,8 @@ EOF
 %environment
     LC_ALL=C
     export LC_ALL
-    # restrict OpenMPI to shared memory comm by default
+    # tell OpenMPI to not try using Infiniband
-    OMPI_MCA_btl="tcp,self"
+    OMPI_MCA_btl="^openib"
     # do not warn about unused components as this messes up testing
     OMPI_MCA_btl_base_warn_component_unused="0"
     export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu18.04_nvidia.def

@@ -81,8 +81,8 @@ EOF
 %environment
     LC_ALL=C
     export LC_ALL
-    # restrict OpenMPI to shared memory comm by default
+    # tell OpenMPI to not try using Infiniband
-    OMPI_MCA_btl="tcp,self"
+    OMPI_MCA_btl="^openib"
     # do not warn about unused components as this messes up testing
     OMPI_MCA_btl_base_warn_component_unused="0"
     export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused

tools/singularity/ubuntu20.04.def

@@ -99,8 +99,8 @@ EOF
     LC_ALL=C
     export LC_ALL
     export PATH=/usr/lib/ccache:$PATH
-    # restrict OpenMPI to shared memory comm by default
+    # tell OpenMPI to not try using Infiniband
-    OMPI_MCA_btl="tcp,self"
+    OMPI_MCA_btl="^openib"
     # do not warn about unused components as this messes up testing
     OMPI_MCA_btl_base_warn_component_unused="0"
     export OMPI_MCA_btl OMPI_MCA_btl_base_warn_component_unused