diff --git a/tools/singularity/centos7.def b/tools/singularity/centos7.def index 861703f93f..0051f4cee2 100644 --- a/tools/singularity/centos7.def +++ b/tools/singularity/centos7.def @@ -45,6 +45,11 @@ EOF # load MPI by default . /etc/profile module load mpi + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author akohlmey, rbberger diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def index 701059b288..75162a17af 100644 --- a/tools/singularity/centos8.def +++ b/tools/singularity/centos8.def @@ -50,6 +50,11 @@ EOF # load MPI by default . /etc/profile module load mpi + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author akohlmey, rbberger diff --git a/tools/singularity/fedora32_mingw.def b/tools/singularity/fedora32_mingw.def index fa3e59d540..5e6d987c92 100644 --- a/tools/singularity/fedora32_mingw.def +++ b/tools/singularity/fedora32_mingw.def @@ -65,6 +65,11 @@ EOF # load MPI by default . /etc/profile module load mpi + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author akohlmey, rbberger diff --git a/tools/singularity/ubuntu16.04.def b/tools/singularity/ubuntu16.04.def index 2b9e30ec42..0152c8bf44 100644 --- a/tools/singularity/ubuntu16.04.def +++ b/tools/singularity/ubuntu16.04.def @@ -28,6 +28,11 @@ EOF %environment LC_ALL=C export LC_ALL + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author akohlmey, rbberger diff --git a/tools/singularity/ubuntu18.04.def b/tools/singularity/ubuntu18.04.def index a4183bd7cc..7713c650ca 100644 --- a/tools/singularity/ubuntu18.04.def +++ b/tools/singularity/ubuntu18.04.def @@ -83,6 +83,11 @@ EOF LC_ALL=C export LC_ALL export PATH=/usr/lib/ccache:$PATH + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author akohlmey, rbberger diff --git a/tools/singularity/ubuntu18.04_amd_rocm.def b/tools/singularity/ubuntu18.04_amd_rocm.def index 3001c1a4e3..4705739093 100644 --- a/tools/singularity/ubuntu18.04_amd_rocm.def +++ b/tools/singularity/ubuntu18.04_amd_rocm.def @@ -89,6 +89,11 @@ EOF %environment LC_ALL=C export LC_ALL + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author rbberger, akohlmey diff --git a/tools/singularity/ubuntu18.04_gpu.def b/tools/singularity/ubuntu18.04_gpu.def index e5fe8b37bc..e55a3522da 100644 --- a/tools/singularity/ubuntu18.04_gpu.def +++ b/tools/singularity/ubuntu18.04_gpu.def @@ -116,6 +116,11 @@ EOF %environment LC_ALL=C export LC_ALL + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author rbberger, akohlmey diff --git a/tools/singularity/ubuntu18.04_intel_opencl.def b/tools/singularity/ubuntu18.04_intel_opencl.def index 297b54c861..20239c417e 100644 --- a/tools/singularity/ubuntu18.04_intel_opencl.def +++ b/tools/singularity/ubuntu18.04_intel_opencl.def @@ -80,8 +80,13 @@ EOF %environment - LC_ALL=C - export LC_ALL + LC_ALL=C + export LC_ALL + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author rbberger, akohlmey diff --git a/tools/singularity/ubuntu18.04_nvidia.def b/tools/singularity/ubuntu18.04_nvidia.def index 5ab7c038f3..c673f9cd30 100644 --- a/tools/singularity/ubuntu18.04_nvidia.def +++ b/tools/singularity/ubuntu18.04_nvidia.def @@ -79,8 +79,13 @@ EOF %environment - LC_ALL=C - export LC_ALL + LC_ALL=C + export LC_ALL + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author rbberger, akohlmey diff --git a/tools/singularity/ubuntu20.04.def b/tools/singularity/ubuntu20.04.def index 7db6c57b88..8074dddc8a 100644 --- a/tools/singularity/ubuntu20.04.def +++ b/tools/singularity/ubuntu20.04.def @@ -79,6 +79,11 @@ EOF %environment LC_ALL=C export LC_ALL + # restrict OpenMPI to shared memory comm by default + OMPI_MCA_btl="sm,self" + # 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 %labels Author akohlmey, rbberger