Unverified Commit db71b3b9 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

update singularity image defitions to include gtest and libyaml. drop f30

parent 14fb49c1

tools/singularity/README.md

+0 −1
Original line number Diff line number Diff line
@@ -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            |

tools/singularity/centos7.def

+2 −2
Original line number Diff line number Diff line
@@ -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

tools/singularity/centos8.def

+2 −2
Original line number Diff line number Diff line
@@ -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

tools/singularity/fedora30_mingw.def

deleted100644 → 0
+0 −65
Original line number Diff line number Diff line 
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

tools/singularity/fedora32_mingw.def

+2 −2
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE