From db71b3b9944f4ff8415b56df3eb69f39be4922f9 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 6 May 2020 00:02:04 -0400 Subject: [PATCH 1/5] update singularity image defitions to include gtest and libyaml. drop f30 --- tools/singularity/README.md | 1 - tools/singularity/centos7.def | 4 +- tools/singularity/centos8.def | 4 +- tools/singularity/fedora30_mingw.def | 65 ---------------------------- tools/singularity/fedora32_mingw.def | 4 +- tools/singularity/ubuntu18.04.def | 2 + tools/singularity/ubuntu20.04.def | 2 + 7 files changed, 10 insertions(+), 72 deletions(-) delete mode 100644 tools/singularity/fedora30_mingw.def diff --git a/tools/singularity/README.md b/tools/singularity/README.md index abef8b2886..c49b39cd72 100644 --- a/tools/singularity/README.md +++ b/tools/singularity/README.md @@ -48,7 +48,6 @@ make | ------------------------------ | ---------------------------------------------- | | centos7.def | CentOS 7.x with EPEL enabled, no LaTeX | | centos8.def | CentOS 8.x with EPEL enabled | -| fedora30_mingw.def | Fedora 30 with MinGW cross-compiler toolchain | | fedora32_mingw.def | Fedora 32 with MinGW cross-compiler toolchain | | ubuntu16.04.def | Ubuntu 16.04LTS with MPI == OpenMPI, no LaTeX | | ubuntu18.04.def | Ubuntu 18.04LTS with MPI == OpenMPI | diff --git a/tools/singularity/centos7.def b/tools/singularity/centos7.def index b273610065..1c5aa6e17c 100644 --- a/tools/singularity/centos7.def +++ b/tools/singularity/centos7.def @@ -4,14 +4,14 @@ From: centos:7 %post yum -y install epel-release yum -y update - yum -y install vim-enhanced \ + yum -y install vim-enhanced diffutils \ ccache gcc-c++ gcc-gfortran clang gdb valgrind-openmpi \ make cmake cmake3 ninja-build patch which file git Lmod \ libpng-devel libjpeg-devel openmpi-devel mpich-devel python-devel python36-devel \ hdf5-devel python36-virtualenv python36-pip python-pip \ netcdf-devel netcdf-cxx-devel netcdf-mpich-devel netcdf-openmpi-devel \ python-virtualenv fftw-devel voro++-devel eigen3-devel gsl-devel openblas-devel enchant \ - blas-devel lapack-devel + blas-devel lapack-devel gtest-devel libyaml-devel yum clean all %environment diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def index d35aafe845..f9a1f2619c 100644 --- a/tools/singularity/centos8.def +++ b/tools/singularity/centos8.def @@ -10,13 +10,13 @@ From: centos:8 eigen3-devel openblas-devel libpng-devel libjpeg-devel platform-python-devel \ openmpi-devel mpich-devel fftw-devel voro++-devel gsl-devel hdf5-devel \ netcdf-devel netcdf-cxx-devel netcdf-mpich-devel netcdf-openmpi-devel \ - enchant python3-virtualenv doxygen \ + enchant python3-virtualenv doxygen diffutils \ texlive-latex-fonts texlive-pslatex texlive-collection-latexrecommended \ texlive-latex texlive-latexconfig doxygen-latex texlive-collection-latex \ texlive-latex-bin texlive-lualatex-math texlive-fncychap texlive-tabulary \ texlive-framed texlive-wrapfig texlive-upquote texlive-capt-of \ texlive-needspace texlive-titlesec texlive-anysize texlive-dvipng \ - blas-devel lapack-devel + blas-devel lapack-devel gtest-devel libyaml-devel dnf clean all %environment diff --git a/tools/singularity/fedora30_mingw.def b/tools/singularity/fedora30_mingw.def deleted file mode 100644 index d61fe34cf7..0000000000 --- a/tools/singularity/fedora30_mingw.def +++ /dev/null @@ -1,65 +0,0 @@ -BootStrap: docker -From: fedora:30 - -%post - dnf -y update - dnf -y install vim-enhanced git file make cmake patch which file Lmod \ - ninja-build clang libomp-devel libubsan libasan libtsan \ - dos2unix findutils rsync python-devel libjpeg-devel libpng-devel \ - ccache gcc-c++ gcc-gfortran gdb valgrind eigen3-devel openblas-devel \ - openmpi-devel mpich-devel fftw-devel voro++-devel gsl-devel hdf5-devel \ - netcdf-devel netcdf-cxx-devel netcdf-mpich-devel netcdf-openmpi-devel \ - mingw-filesystem-base mingw32-nsis mingw-binutils-generic \ - mingw32-filesystem mingw32-pkg-config \ - mingw64-filesystem mingw64-pkg-config \ - mingw32-crt mingw32-headers mingw32-binutils \ - mingw64-crt mingw64-headers mingw64-binutils \ - mingw32-cpp mingw32-gcc mingw32-gcc-gfortran mingw32-gcc-c++ \ - mingw64-cpp mingw64-gcc mingw64-gcc-gfortran mingw64-gcc-c++ \ - mingw32-libgomp mingw64-libgomp \ - mingw32-winpthreads mingw64-winpthreads \ - mingw32-winpthreads-static mingw64-winpthreads-static \ - mingw32-eigen3 mingw64-eigen3 \ - mingw32-libjpeg-turbo mingw64-libjpeg-turbo \ - mingw32-libjpeg-turbo-static mingw64-libjpeg-turbo-static \ - mingw32-libpng mingw64-libpng \ - mingw32-libpng-static mingw64-libpng-static \ - mingw32-zlib mingw64-zlib \ - mingw32-zlib-static mingw64-zlib-static \ - mingw32-expat mingw64-expat \ - mingw64-expat-static mingw32-expat-static \ - mingw32-sqlite-static mingw64-sqlite-static \ - enchant python3-virtualenv doxygen \ - texlive-latex-fonts texlive-pslatex texlive-collection-latexrecommended \ - texlive-latex texlive-latexconfig doxygen-latex texlive-collection-latex \ - texlive-latex-bin texlive-lualatex-math texlive-fncychap texlive-tabulary \ - texlive-framed texlive-wrapfig texlive-upquote texlive-capt-of \ - texlive-needspace texlive-titlesec texlive-anysize texlive-dvipng \ - blas-devel lapack-devel - dnf clean all - -%environment - LC_ALL=C - export LC_ALL - - # we need to reset any module variables - # inherited from the host. - unset __LMOD_REF_COUNT__LMFILES_ - unset __LMOD_REF_COUNT_PATH - unset __LMOD_REF_COUNT_LD_LIBRARY_PATH - unset __LMOD_REF_COUNT_MANPATH - unset __LMOD_REF_COUNT_MODULEPATH - unset __LMOD_REF_COUNT_LOADEDMODULES - unset _LMFILES_ - unset MODULEPATH - unset MODULESHOME - unset MODULEPATH_ROOT - unset LOADEDMODULES - unset LMOD_SYSTEM_DEFAULT_MODULES - - # load MPI by default - . /etc/profile - module load mpi - -%labels - Author akohlmey, rbberger diff --git a/tools/singularity/fedora32_mingw.def b/tools/singularity/fedora32_mingw.def index 736dd64585..b73fc2f6a1 100644 --- a/tools/singularity/fedora32_mingw.def +++ b/tools/singularity/fedora32_mingw.def @@ -4,7 +4,7 @@ From: fedora:32 %post dnf -y update dnf -y install vim-enhanced git file make cmake patch which file Lmod \ - ninja-build clang libomp-devel libubsan libasan libtsan \ + ninja-build clang libomp-devel libubsan libasan libtsan diffutils \ dos2unix findutils rsync python-devel libjpeg-devel libpng-devel \ ccache gcc-c++ gcc-gfortran gdb valgrind eigen3-devel openblas-devel \ openmpi-devel mpich-devel fftw-devel voro++-devel gsl-devel hdf5-devel \ @@ -35,7 +35,7 @@ From: fedora:32 texlive-latex-bin texlive-lualatex-math texlive-fncychap texlive-tabulary \ texlive-framed texlive-wrapfig texlive-upquote texlive-capt-of \ texlive-needspace texlive-titlesec texlive-anysize texlive-dvipng \ - blas-devel lapack-devel diffutils + blas-devel lapack-devel gtest-devel libyaml-devel dnf clean all %environment diff --git a/tools/singularity/ubuntu18.04.def b/tools/singularity/ubuntu18.04.def index 5ec5874655..3ec2d4deaf 100644 --- a/tools/singularity/ubuntu18.04.def +++ b/tools/singularity/ubuntu18.04.def @@ -26,6 +26,7 @@ From: ubuntu:18.04 libenchant-dev \ libfftw3-dev \ libgsl-dev \ + libgtest-dev \ libhdf5-serial-dev \ libhwloc-dev \ libjpeg-dev \ @@ -37,6 +38,7 @@ From: ubuntu:18.04 libpng-dev \ libproj-dev \ libvtk6-dev \ + libyaml-dev \ make \ mpi-default-bin \ mpi-default-dev \ diff --git a/tools/singularity/ubuntu20.04.def b/tools/singularity/ubuntu20.04.def index 024debed91..91697da5f7 100644 --- a/tools/singularity/ubuntu20.04.def +++ b/tools/singularity/ubuntu20.04.def @@ -26,6 +26,7 @@ From: ubuntu:20.04 libenchant-dev \ libfftw3-dev \ libgsl-dev \ + libgtest-dev \ libhdf5-serial-dev \ libhwloc-dev \ libjpeg-dev \ @@ -37,6 +38,7 @@ From: ubuntu:20.04 libpng-dev \ libproj-dev \ libvtk6-dev \ + libyaml-dev \ make \ mpi-default-bin \ mpi-default-dev \ From 4dce25d89e964b269d4cc37e2c83f17796454785 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Wed, 6 May 2020 15:07:02 -0400 Subject: [PATCH 2/5] update some defitions files and also include hack to indicate image type in prompt --- tools/singularity/README.md | 1 + tools/singularity/centos7.def | 11 +++++- tools/singularity/centos8.def | 9 +++++ tools/singularity/fedora32_mingw.def | 8 ++++ tools/singularity/ubuntu16.04.def | 10 ++++- tools/singularity/ubuntu18.04.def | 9 +++++ tools/singularity/ubuntu18.04_amd_rocm.def | 11 +++++- .../singularity/ubuntu18.04_amd_rocm_cuda.def | 38 ------------------- tools/singularity/ubuntu18.04_gpu.def | 11 +++++- .../singularity/ubuntu18.04_intel_opencl.def | 11 +++++- tools/singularity/ubuntu18.04_nvidia.def | 11 +++++- tools/singularity/ubuntu20.04.def | 10 +++++ 12 files changed, 96 insertions(+), 44 deletions(-) delete mode 100644 tools/singularity/ubuntu18.04_amd_rocm_cuda.def diff --git a/tools/singularity/README.md b/tools/singularity/README.md index c49b39cd72..7374beb898 100644 --- a/tools/singularity/README.md +++ b/tools/singularity/README.md @@ -56,3 +56,4 @@ make | ubuntu18.04_nvidia.def | Ubuntu 18.04LTS with Nvidia CUDA 10.2 toolkit | | ubuntu18.04_intel_opencl.def | Ubuntu 18.04LTS with Intel OpenCL runtime | | ubuntu20.04.def | Ubuntu 20.04LTS with MPI == OpenMPI | +| ------------------------------ | ---------------------------------------------- | diff --git a/tools/singularity/centos7.def b/tools/singularity/centos7.def index 1c5aa6e17c..c37d504b61 100644 --- a/tools/singularity/centos7.def +++ b/tools/singularity/centos7.def @@ -4,7 +4,7 @@ From: centos:7 %post yum -y install epel-release yum -y update - yum -y install vim-enhanced diffutils \ + yum -y install vim-enhanced \ ccache gcc-c++ gcc-gfortran clang gdb valgrind-openmpi \ make cmake cmake3 ninja-build patch which file git Lmod \ libpng-devel libjpeg-devel openmpi-devel mpich-devel python-devel python36-devel \ @@ -14,6 +14,15 @@ From: centos:7 blas-devel lapack-devel gtest-devel libyaml-devel yum clean all + # set custom prompt indicating the container name + CUSTOM_PROMPT_ENV=/.singularity.d/env/99-zz_custom_prompt.sh + cat >$CUSTOM_PROMPT_ENV <$CUSTOM_PROMPT_ENV <$CUSTOM_PROMPT_ENV <$CUSTOM_PROMPT_ENV <$CUSTOM_PROMPT_ENV <$CUSTOM_PROMPT_ENV <> /etc/ld.so.conf.d/nvidia.conf - echo "/usr/local/nvidia/lib64" >> /etc/ld.so.conf.d/nvidia.conf - - # clean cache - rm -rf /var/lib/apt/lists/* - -%labels - Author rbberger diff --git a/tools/singularity/ubuntu18.04_gpu.def b/tools/singularity/ubuntu18.04_gpu.def index 861b45dd3c..e5fe8b37bc 100644 --- a/tools/singularity/ubuntu18.04_gpu.def +++ b/tools/singularity/ubuntu18.04_gpu.def @@ -104,9 +104,18 @@ From: rocm/dev-ubuntu-18.04 ln -s /usr/local/cuda-10.2 /usr/local/cuda ln -s /usr/local/cuda-10.2/lib64/stubs/libcuda.so /usr/local/cuda-10.2/lib64/stubs/libcuda.so.1 + # set custom prompt indicating the container name + CUSTOM_PROMPT_ENV=/.singularity.d/env/99-zz_custom_prompt.sh + cat >$CUSTOM_PROMPT_ENV <$CUSTOM_PROMPT_ENV <$CUSTOM_PROMPT_ENV <$CUSTOM_PROMPT_ENV < Date: Wed, 6 May 2020 15:16:21 -0400 Subject: [PATCH 3/5] make rbberger and akohlmey owner of the singularity defition files --- .github/CODEOWNERS | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 87f3dd1f22..aa3b27a513 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -115,6 +115,7 @@ src/min* @sjplimp @stanmoore1 # tools tools/msi2lmp/* @akohlmey tools/emacs/* @HaoZeke +tools/singularity/* @akohlmey @rbberger # cmake cmake/* @junghans @rbberger From d7650e8e02e1ec87b3cad297b750e10ab5459e89 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 7 May 2020 17:02:04 -0400 Subject: [PATCH 4/5] no need to include googletest libs, we download and compile internally --- tools/singularity/centos7.def | 2 +- tools/singularity/centos8.def | 2 +- tools/singularity/fedora32_mingw.def | 2 +- tools/singularity/ubuntu18.04.def | 1 - tools/singularity/ubuntu20.04.def | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/singularity/centos7.def b/tools/singularity/centos7.def index c37d504b61..861703f93f 100644 --- a/tools/singularity/centos7.def +++ b/tools/singularity/centos7.def @@ -11,7 +11,7 @@ From: centos:7 hdf5-devel python36-virtualenv python36-pip python-pip \ netcdf-devel netcdf-cxx-devel netcdf-mpich-devel netcdf-openmpi-devel \ python-virtualenv fftw-devel voro++-devel eigen3-devel gsl-devel openblas-devel enchant \ - blas-devel lapack-devel gtest-devel libyaml-devel + blas-devel lapack-devel libyaml-devel yum clean all # set custom prompt indicating the container name diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def index 62dad91eb4..701059b288 100644 --- a/tools/singularity/centos8.def +++ b/tools/singularity/centos8.def @@ -16,7 +16,7 @@ From: centos:8 texlive-latex-bin texlive-lualatex-math texlive-fncychap texlive-tabulary \ texlive-framed texlive-wrapfig texlive-upquote texlive-capt-of \ texlive-needspace texlive-titlesec texlive-anysize texlive-dvipng \ - blas-devel lapack-devel gtest-devel libyaml-devel + blas-devel lapack-devel libyaml-devel dnf clean all # set custom prompt indicating the container name diff --git a/tools/singularity/fedora32_mingw.def b/tools/singularity/fedora32_mingw.def index fb66daff84..fa3e59d540 100644 --- a/tools/singularity/fedora32_mingw.def +++ b/tools/singularity/fedora32_mingw.def @@ -35,7 +35,7 @@ From: fedora:32 texlive-latex-bin texlive-lualatex-math texlive-fncychap texlive-tabulary \ texlive-framed texlive-wrapfig texlive-upquote texlive-capt-of \ texlive-needspace texlive-titlesec texlive-anysize texlive-dvipng \ - blas-devel lapack-devel gtest-devel libyaml-devel + blas-devel lapack-devel libyaml-devel dnf clean all # set custom prompt indicating the container name diff --git a/tools/singularity/ubuntu18.04.def b/tools/singularity/ubuntu18.04.def index c658e4fd30..a4183bd7cc 100644 --- a/tools/singularity/ubuntu18.04.def +++ b/tools/singularity/ubuntu18.04.def @@ -26,7 +26,6 @@ From: ubuntu:18.04 libenchant-dev \ libfftw3-dev \ libgsl-dev \ - libgtest-dev \ libhdf5-serial-dev \ libhwloc-dev \ libjpeg-dev \ diff --git a/tools/singularity/ubuntu20.04.def b/tools/singularity/ubuntu20.04.def index fe31f1c148..7db6c57b88 100644 --- a/tools/singularity/ubuntu20.04.def +++ b/tools/singularity/ubuntu20.04.def @@ -26,7 +26,6 @@ From: ubuntu:20.04 libenchant-dev \ libfftw3-dev \ libgsl-dev \ - libgtest-dev \ libhdf5-serial-dev \ libhwloc-dev \ libjpeg-dev \ From eefeaf4d254b5593cbcaa7700c50f6082a25ceb9 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 7 May 2020 18:15:57 -0400 Subject: [PATCH 5/5] make OpenMPI only use shared memory comm by default and silence some warnings --- tools/singularity/centos7.def | 5 +++++ tools/singularity/centos8.def | 5 +++++ tools/singularity/fedora32_mingw.def | 5 +++++ tools/singularity/ubuntu16.04.def | 5 +++++ tools/singularity/ubuntu18.04.def | 5 +++++ tools/singularity/ubuntu18.04_amd_rocm.def | 5 +++++ tools/singularity/ubuntu18.04_gpu.def | 5 +++++ tools/singularity/ubuntu18.04_intel_opencl.def | 9 +++++++-- tools/singularity/ubuntu18.04_nvidia.def | 9 +++++++-- tools/singularity/ubuntu20.04.def | 5 +++++ 10 files changed, 54 insertions(+), 4 deletions(-) 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