From 2ef4c4166d5bb14052e223999a536328518ac331 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Thu, 2 Apr 2020 17:48:17 -0400 Subject: [PATCH] update container definitions for building documentation --- tools/singularity/README.md | 4 +-- tools/singularity/centos7.def | 14 ++++++++--- tools/singularity/centos8.def | 15 +++++++++-- tools/singularity/fedora30_mingw.def | 37 +++++++++++++++++++++++++--- tools/singularity/ubuntu16.04.def | 22 ++++++++++++++--- 5 files changed, 79 insertions(+), 13 deletions(-) diff --git a/tools/singularity/README.md b/tools/singularity/README.md index 14f73f8060..9bd0c2fdcc 100644 --- a/tools/singularity/README.md +++ b/tools/singularity/README.md @@ -49,8 +49,8 @@ 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 | -| ubuntu16.04.def | Ubuntu 16.04LTS with default MPI == OpenMPI | -| ubuntu18.04.def | Ubuntu 18.04LTS with default MPI == OpenMPI | +| 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_nvidia.def | Ubuntu 18.04LTS with Nvidia CUDA 10.2 toolkit | | ubuntu18.04_intel_opencl.def | Ubuntu 18.04LTS with Intel OpenCL runtime | diff --git a/tools/singularity/centos7.def b/tools/singularity/centos7.def index 8160105524..e1ae6e6373 100644 --- a/tools/singularity/centos7.def +++ b/tools/singularity/centos7.def @@ -2,9 +2,17 @@ BootStrap: library From: centos:7 %post - yum -y install epel-release + yum -y install epel-release 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 libpng-devel libjpeg-devel openmpi-devel mpich-devel python-devel python-virtualenv fftw-devel voro++-devel eigen3-devel gsl-devel openblas-devel enchant + yum -y install vim-enhanced \ + ccache gcc-c++ gcc-gfortran clang gdb valgrind-openmpi \ + make cmake cmake3 ninja-build patch which file git \ + 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 %labels - Author akohlmey + Author akohlmey diff --git a/tools/singularity/centos8.def b/tools/singularity/centos8.def index e0a14c4156..77a8964abb 100644 --- a/tools/singularity/centos8.def +++ b/tools/singularity/centos8.def @@ -5,9 +5,20 @@ From: centos:8 dnf -y install epel-release dnf-utils dnf config-manager --set-enabled PowerTools dnf -y update - dnf -y install vim-enhanced ccache gcc-c++ gcc-gfortran clang gdb make cmake patch which file git libpng-devel libjpeg-devel openmpi-devel mpich-devel fftw-devel voro++-devel gsl-devel enchant platform-python-devel python3-virtualenv valgrind openblas ninja-build eigen3-devel libubsan libasan libtsan + dnf -y install vim-enhanced git file make cmake patch which file ninja-build \ + ccache gcc-c++ gcc-gfortran clang gdb valgrind libubsan libasan libtsan \ + eigen3-devel openblas-devel libpng-devel libjpeg-devel platform-python-devel \ + openmpi-devel mpich-devel fftw-devel voro++-devel gsl-devel \ + 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 -#No match for argument: valgrind-openmpi +%environment + LC_ALL=C + export LC_ALL %labels Author akohlmey diff --git a/tools/singularity/fedora30_mingw.def b/tools/singularity/fedora30_mingw.def index 7d8d3daed8..2df658676c 100644 --- a/tools/singularity/fedora30_mingw.def +++ b/tools/singularity/fedora30_mingw.def @@ -2,9 +2,40 @@ BootStrap: docker From: fedora:30 %post - dnf -y update - dnf -y install vim-enhanced ccache gcc-c++ gdb make cmake patch which file git enchant python3-virtualenv valgrind eigen3-devel mingw64-binutils mingw32-crt mingw32-gcc mingw32-libgomp mingw64-filesystem mingw64-libjpeg-turbo mingw32-libjpeg-turbo mingw32-nsis mingw32-libpng mingw64-sqlite-static mingw64-libpng-static mingw32-pkg-config mingw64-crt mingw32-cpp mingw64-expat-static mingw64-libpng mingw32-expat mingw64-winpthreads-static mingw64-zlib-static mingw32-gcc-gfortran mingw64-gcc mingw32-binutils mingw32-expat-static mingw64-gcc-gfortran mingw64-headers mingw-filesystem-base mingw32-libjpeg-turbo-static mingw64-gcc-c++ mingw64-pkg-config mingw64-libjpeg-turbo-static mingw32-winpthreads mingw32-filesystem mingw32-zlib-static mingw64-expat mingw32-gcc-c++ mingw64-zlib mingw32-sqlite-static mingw64-cpp mingw32-libpng-static mingw-binutils-generic mingw32-eigen3 mingw64-eigen3 mingw32-winpthreads-static mingw32-zlib mingw32-headers mingw64-libgomp mingw64-winpthreads texlive-latex-fonts texlive-pslatex texlive-collection-latexrecommended texlive-latex texlive-latexconfig doxygen-latex texlive-collection-latex texlive-latexbug texlive-latex-bin texlive-lualatex-math texlive-fncychap texlive-tabulary texlive-framed texlive-wrapfig texlive-upquote texlive-capt-of texlive-needspace dos2unix findutils rsync + dnf -y update + dnf -y install vim-enhanced git file make cmake patch which file \ + dos2unix findutils rsync \ + ccache gcc-c++ gdb valgrind eigen3-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 %labels - Author akohlmey + Author akohlmey diff --git a/tools/singularity/ubuntu16.04.def b/tools/singularity/ubuntu16.04.def index 2f7841bd4a..b6833707a2 100644 --- a/tools/singularity/ubuntu16.04.def +++ b/tools/singularity/ubuntu16.04.def @@ -2,8 +2,24 @@ BootStrap: docker From: ubuntu:16.04 %post - apt-get update -y - env DEBIAN_FRONTEND=noninteractive apt-get install -y make cmake cmake-curses-gui ninja-build git ccache gcc g++ gfortran libfftw3-dev libjpeg-dev libpng12-dev libblas-dev liblapack-dev mpi-default-bin mpi-default-dev libeigen3-dev libgsl-dev libopenblas-dev virtualenv python-dev enchant vim-nox + export DEBIAN_FRONTEND=noninteractive + apt-get update + apt-get upgrade --no-install-recommends -y + apt-get install --no-install-recommends -y \ + bc build-essential curl doxygen vim-nox wget \ + make cmake cmake-curses-gui ninja-build git \ + rsync ssh \ + ccache gcc g++ gfortran \ + mpi-default-bin mpi-default-dev \ + libfftw3-dev libjpeg-dev libpng12-dev libblas-dev liblapack-dev \ + python-dev libeigen3-dev libgsl-dev libopenblas-dev \ + virtualenv python3-dev python3-pip python3-pkg-resources \ + python3-setuptools python3-virtualenv \ + enchant + +%environment + LC_ALL=C + export LC_ALL %labels - Author akohlmey + Author akohlmey