From e0062866033ef254b66d88be4c804515cd68eb1d Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 12 Jun 2020 12:05:33 -0400 Subject: [PATCH] rather than forcing tcp communication for OpenMPI, we disable infiniband instead for better stability of tests --- tools/singularity/centos7.def | 4 ++-- tools/singularity/centos8.def | 4 ++-- tools/singularity/fedora32_mingw.def | 4 ++-- tools/singularity/ubuntu16.04.def | 4 ++-- tools/singularity/ubuntu18.04.def | 4 ++-- tools/singularity/ubuntu18.04_amd_rocm.def | 4 ++-- tools/singularity/ubuntu18.04_gpu.def | 4 ++-- tools/singularity/ubuntu18.04_intel_opencl.def | 4 ++-- tools/singularity/ubuntu18.04_nvidia.def | 4 ++-- tools/singularity/ubuntu20.04.def | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tools/singularity/centos7.def b/tools/singularity/centos7.def index 5369c6977b..7cd38af13e 100644 --- a/tools/singularity/centos7.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def index d2eba155ec..930ad5a909 100644 --- a/tools/singularity/centos8.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/fedora32_mingw.def b/tools/singularity/fedora32_mingw.def index 6eb1944ec2..3ddb75e14d 100644 --- a/tools/singularity/fedora32_mingw.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/ubuntu16.04.def b/tools/singularity/ubuntu16.04.def index 7f8e3a6b0d..b6c02f78fa 100644 --- a/tools/singularity/ubuntu16.04.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/ubuntu18.04.def b/tools/singularity/ubuntu18.04.def index bfc598b157..fbff214251 100644 --- a/tools/singularity/ubuntu18.04.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/ubuntu18.04_amd_rocm.def b/tools/singularity/ubuntu18.04_amd_rocm.def index 538d9ee772..df7d5be062 100644 --- a/tools/singularity/ubuntu18.04_amd_rocm.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/ubuntu18.04_gpu.def b/tools/singularity/ubuntu18.04_gpu.def index b06cb08b74..e08e5b5f84 100644 --- a/tools/singularity/ubuntu18.04_gpu.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/ubuntu18.04_intel_opencl.def b/tools/singularity/ubuntu18.04_intel_opencl.def index 39842764c4..b60da61b91 100644 --- a/tools/singularity/ubuntu18.04_intel_opencl.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/ubuntu18.04_nvidia.def b/tools/singularity/ubuntu18.04_nvidia.def index 02162954c3..4356ddf7e1 100644 --- a/tools/singularity/ubuntu18.04_nvidia.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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 diff --git a/tools/singularity/ubuntu20.04.def b/tools/singularity/ubuntu20.04.def index ed7a67bbe0..3b2c19e920 100644 --- a/tools/singularity/ubuntu20.04.def +++ b/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 - OMPI_MCA_btl="tcp,self" + # tell OpenMPI to not try using Infiniband + 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