From fa0cc2c217ef68bef03b781082fc23d6fb543a8a Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Sat, 11 Apr 2020 21:36:08 -0400 Subject: [PATCH] update singularity definition files --- tools/singularity/README.md | 3 ++ tools/singularity/centos7.def | 6 +++- tools/singularity/centos8.def | 4 +++ tools/singularity/fedora30_mingw.def | 6 ++++ tools/singularity/fedora32_mingw.def | 47 ++++++++++++++++++++++++++++ tools/singularity/ubuntu20.04.def | 2 +- 6 files changed, 66 insertions(+), 2 deletions(-) create mode 100644 tools/singularity/fedora32_mingw.def diff --git a/tools/singularity/README.md b/tools/singularity/README.md index 9bd0c2fdcc..a01b1688b8 100644 --- a/tools/singularity/README.md +++ b/tools/singularity/README.md @@ -49,8 +49,11 @@ 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 | | ubuntu18.04_amd_rocm.def | Ubuntu 18.04LTS with AMD ROCm toolkit | +| ubuntu18.04_amd_rocm_cuda.def | Ubuntu 18.04LTS with -"- plus Nvidia CUDA 10.2 | | 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 e1ae6e6373..028823bc49 100644 --- a/tools/singularity/centos7.def +++ b/tools/singularity/centos7.def @@ -6,13 +6,17 @@ From: centos:7 yum -y update yum -y install vim-enhanced \ ccache gcc-c++ gcc-gfortran clang gdb valgrind-openmpi \ - make cmake cmake3 ninja-build patch which file git \ + make cmake cmake3 ninja-build patch which file git Lmod \ libpng-devel libjpeg-devel openmpi-devel mpich-devel python-devel \ python-virtualenv fftw-devel voro++-devel eigen3-devel gsl-devel openblas-devel enchant %environment LC_ALL=C export LC_ALL + unset LOADEDMODULES + . /etc/profile.d/z00_lmod.sh + module purge + module load mpi %labels Author akohlmey diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def index 77a8964abb..fff96c5c4a 100644 --- a/tools/singularity/centos8.def +++ b/tools/singularity/centos8.def @@ -19,6 +19,10 @@ From: centos:8 %environment LC_ALL=C export LC_ALL + unset LOADEDMODULES + . /etc/profile.d/modules.sh + module purge + module load mpi %labels Author akohlmey diff --git a/tools/singularity/fedora30_mingw.def b/tools/singularity/fedora30_mingw.def index 2df658676c..ef83d8f0a7 100644 --- a/tools/singularity/fedora30_mingw.def +++ b/tools/singularity/fedora30_mingw.def @@ -36,6 +36,12 @@ From: fedora:30 %environment LC_ALL=C export LC_ALL + # we need to reset any module variables + # inherited from the host. + unset LOADEDMODULES + source /etc/profile.d/modules.sh + module purge + module load mpi %labels Author akohlmey diff --git a/tools/singularity/fedora32_mingw.def b/tools/singularity/fedora32_mingw.def new file mode 100644 index 0000000000..43d5659a19 --- /dev/null +++ b/tools/singularity/fedora32_mingw.def @@ -0,0 +1,47 @@ +BootStrap: docker +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 \ + 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 \ + 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 + +%environment + LC_ALL=C + export LC_ALL + unset LOADEDMODULES + . /etc/profile.d/modules.sh + module purge + module load mpi + +%labels + Author akohlmey diff --git a/tools/singularity/ubuntu20.04.def b/tools/singularity/ubuntu20.04.def index 4ebc88447d..37c67b9373 100644 --- a/tools/singularity/ubuntu20.04.def +++ b/tools/singularity/ubuntu20.04.def @@ -29,6 +29,7 @@ From: ubuntu:20.04 libjpeg-dev \ liblapack-dev \ libopenblas-dev \ + libomp-dev \ libpng-dev \ libproj-dev \ libvtk6-dev \ @@ -45,7 +46,6 @@ From: ubuntu:20.04 ssh \ texlive \ texlive-latex-recommended \ - texlive-latex-extra \ texlive-pictures \ texlive-publishers \ texlive-science \