Unverified Commit 6839ce23 authored by Kai Szuttor's avatar Kai Szuttor Committed by GitHub
Browse files

Merge pull request #121 from jngrad/remove-41-images

Remove python3 images from 4.0
parents 78d847fe d81e72e3
Pipeline #8134 passed with stages
in 225 minutes and 8 seconds
......@@ -31,7 +31,7 @@ stages:
stage: test
image: $CI_REGISTRY/$CI_PROJECT_PATH/$CI_JOB_NAME-$CI_COMMIT_SHA
script:
- git clone --depth=1 --recursive https://github.com/espressomd/espresso
- git clone -b 4.0 --depth=1 --recursive https://github.com/espressomd/espresso
- cd espresso
- maintainer/CI/build_cmake.sh
variables:
......@@ -41,49 +41,22 @@ stages:
- docker
- linux
.test_template_v40:
extends: .test_template
script:
- git clone -b 4.0 --depth=1 --recursive https://github.com/espressomd/espresso
- cd espresso
- maintainer/CI/build_cmake.sh
centos:7:build:
extends: .build_template
centos-python3:7:build:
extends: .build_template
centos:next:build:
extends: .build_template
centos-python3:next:build:
extends: .build_template
debian:9:build:
extends: .build_template
debian-python3:9:build:
extends: .build_template
opensuse:42.3:build:
extends: .build_template
opensuse:15.0:build:
extends: .build_template
opensuse:15.1:build:
extends: .build_template
ubuntu:16.04:build:
extends: .build_template
ubuntu:18.04:build:
extends: .build_template
ubuntu:wo-dependencies:build:
extends: .build_template
ubuntu-python3:wo-dependencies:build:
extends: .build_template
clang:6.0:build:
extends: .build_template
clang-python3:6.0:build:
extends: .build_template
cuda:tutorials:build:
extends: .build_template
cuda:9.0:build:
extends: .build_template
rocm-python3:latest:build:
extends: .build_template
intel:15:build:
extends:
- .build_template
......@@ -93,90 +66,22 @@ intel:15:build:
- linux
- nofirewall
- icp
intel-python3:18:build:
extends:
- .build_template
- .manual_template
tags:
- docker
- linux
- nofirewall
- icp
ubuntu-python3:16.04:build:
extends: .build_template
ubuntu-python3:18.04:build:
extends: .build_template
ubuntu-python3:wo-dependencies:build:
extends: .build_template
ubuntu-python3:min_boost:build:
extends: .build_template
ubuntu:arm64:build:
extends:
- .build_template
- .manual_template
ubuntu:armhf:build:
extends:
- .build_template
- .manual_template
ubuntu:i386:build:
extends:
- .build_template
- .manual_template
ubuntu:ppc64le:build:
extends:
- .build_template
- .manual_template
ubuntu:s390x:build:
extends:
- .build_template
- .manual_template
test/centos:7:
extends: .test_template_v40
test/centos-python3:7:
extends: .test_template
test/centos:next:
extends: .test_template_v40
test/centos-python3:next:
extends: .test_template
test/debian:9:
extends: .test_template_v40
test/debian-python3:9:
extends: .test_template
test/opensuse:42.3:
extends: .test_template_v40
extends: .test_template
test/opensuse:15.0:
extends: .test_template_v40
test/opensuse:15.1:
extends: .test_template
test/ubuntu:16.04:
extends: .test_template_v40
test/ubuntu:18.04:
extends: .test_template_v40
test/clang:6.0:
extends: .test_template_v40
test/clang-python3:6.0:
extends: .test_template
test/cuda:tutorials:
extends: .test_template
test/cuda:9.0:
extends: .test_template
test/rocm-python3:latest:
test/clang:6.0:
extends: .test_template
variables:
make_check: "false"
myconfig: "maxset"
HIP_PLATFORM: "hcc"
HCC_AMDGPU_TARGET: "gfx900"
test/intel:15:
extends:
- .test_template_v40
- .manual_template
tags:
- docker
- linux
- icp
test/intel-python3:18:
extends:
- .test_template
- .manual_template
......@@ -184,72 +89,26 @@ test/intel-python3:18:
- docker
- linux
- icp
test/ubuntu-python3:16.04:
extends: .test_template
test/ubuntu-python3:18.04:
extends: .test_template
test/ubuntu-python3:min_boost:
extends: .test_template
test/ubuntu:arm64:
extends:
- .test_template
- .manual_template
test/ubuntu:armhf:
extends:
- .test_template
- .manual_template
test/ubuntu:i386:
extends:
- .test_template
- .manual_template
test/ubuntu:ppc64le:
extends:
- .test_template
- .manual_template
test/ubuntu:s390x:
extends:
- .test_template
- .manual_template
test/ubuntu:wo-dependencies:
extends: .test_template_v40
test/ubuntu-python3:wo-dependencies:
extends: .test_template
centos:7:
extends: .deploy_template
centos-python3:7:
extends: .deploy_template
centos:next:
extends: .deploy_template
centos-python3:next:
extends: .deploy_template
debian:9:
extends: .deploy_template
debian-python3:9:
extends: .deploy_template
opensuse:42.3:
extends: .deploy_template
opensuse:15.0:
extends: .deploy_template
opensuse:15.1:
extends: .deploy_template
ubuntu:16.04:
extends: .deploy_template
ubuntu:18.04:
extends: .deploy_template
ubuntu:wo-dependencies:
extends: .deploy_template
clang:6.0:
extends: .deploy_template
clang-python3:6.0:
extends: .deploy_template
cuda:tutorials:
extends: .deploy_template
cuda:9.0:
extends: .deploy_template
rocm-python3:latest:
extends: .deploy_template
intel:15:
extends:
- .deploy_template
......@@ -259,43 +118,6 @@ intel:15:
- linux
- nofirewall
- icp
intel-python3:18:
extends:
- .deploy_template
- .manual_template
tags:
- docker
- linux
- nofirewall
- icp
ubuntu-python3:16.04:
extends: .deploy_template
ubuntu-python3:18.04:
extends: .deploy_template
ubuntu-python3:wo-dependencies:
extends: .deploy_template
ubuntu-python3:min_boost:
extends: .deploy_template
ubuntu:arm64:
extends:
- .deploy_template
- .manual_template
ubuntu:armhf:
extends:
- .deploy_template
- .manual_template
ubuntu:i386:
extends:
- .deploy_template
- .manual_template
ubuntu:ppc64le:
extends:
- .deploy_template
- .manual_template
ubuntu:s390x:
extends:
- .deploy_template
- .manual_template
status_success:
stage: status
......
FROM centos/devtoolset-6-toolchain-centos7
USER root
MAINTAINER Jean-Noel Grad <jgrad@icp.uni-stuttgart.de>
RUN yum -y install epel-release && yum -y install \
make \
cmake3 \
openmpi-devel \
fftw-devel \
boost169-devel boost169-openmpi-devel \
git \
python36 \
python36-devel \
python36-pip \
python36-Cython \
python36-pycodestyle \
python36-pylint \
python36-numpy \
hdf5-openmpi-devel \
zlib-devel \
which \
vim \
ccache \
&& yum clean all \
&& ln -s /usr/bin/cmake3 /usr/bin/cmake \
&& pip3 install h5py
ENV BOOST_INCLUDEDIR=/usr/include/boost169
ENV BOOST_LIBRARYDIR=/usr/lib64/boost169
RUN ln -s /usr/lib64/openmpi/lib/boost169/libboost_mpi.so /usr/lib64/boost169/libboost_mpi.so
RUN useradd -m espresso -u 1000
USER 1000
WORKDIR /home/espresso
FROM fedora:latest
MAINTAINER Jean-Noel Grad <jgrad@icp.uni-stuttgart.de>
RUN yum -y install \
gcc gcc-c++ make \
cmake \
openmpi-devel \
fftw-devel \
boost-devel boost-openmpi-devel \
git \
python3 \
python3-devel \
python3-Cython \
python3-pycodestyle \
python3-pylint \
python3-numpy \
python3-h5py \
hdf5-openmpi-devel \
zlib-devel \
which \
vim \
ccache \
&& yum clean all
RUN useradd -m espresso
USER 1000
WORKDIR /home/espresso
FROM nvidia/cuda:9.0-devel-ubuntu16.04
MAINTAINER Florian Weik <fweik@icp.uni-stuttgart.de>
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \
apt-utils \
build-essential \
clang-6.0 clang-tidy-6.0 clang-format-6.0 \
curl \
openmpi-bin \
libfftw3-dev \
libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
cython3 python3 python3-numpy python3-h5py \
git \
pep8 pylint3 \
# python3-vtk7 \ # not available in 16.04
python3-pip \
libpython3-dev \
libhdf5-openmpi-dev \
doxygen \
vim \
&& pip3 install requests autopep8==0.9.1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& ln -s /usr/bin/llvm-symbolizer-6.0 /usr/bin/llvm-symbolizer \
&& ln -s /usr/bin/clang-format-6.0 /usr/bin/clang-format \
&& curl -Lo /usr/local/bin/git-clang-format https://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format/git-clang-format \
&& chmod +x /usr/local/bin/git-clang-format
RUN cd /tmp \
&& curl https://www.samba.org/ftp/ccache/ccache-3.4.3.tar.xz | tar xJ \
&& cd ccache-3.4.3 \
&& ./configure --prefix=/usr/local \
&& make && make install \
&& cd \
&& rm -r /tmp/ccache-3.4.3
# more recent version of CMake required for Clang-tidy
RUN cd /usr/local \
&& curl -sL https://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.tar.gz | tar --strip-components=1 -xz \
&& rm -r /usr/local/man
RUN cd /usr/src && \
git clone https://github.com/thrust/thrust.git && \
rm -r /usr/local/cuda/include/thrust && \
ln -s /usr/src/thrust/thrust /usr/local/cuda/include/thrust
ENV CC=/usr/bin/clang-6.0 CXX=/usr/bin/clang++-6.0 NVCC=/usr/bin/clang++-6.0
# removes superfluous Clang-tidy warnings from the boost libraries
COPY boost.patch /tmp/
RUN cd /usr/include/boost && patch -p1 < /tmp/boost.patch
RUN useradd -m espresso && usermod -a -G www-data espresso
USER 1000
WORKDIR /home/espresso
diff -ru boost/mpi/collectives/all_reduce.hpp boost/mpi/collectives/all_reduce.hpp
--- boost/mpi/collectives/all_reduce.hpp 2017-12-20 14:26:58.105542000 +0100
+++ boost/mpi/collectives/all_reduce.hpp 2017-12-20 14:56:39.862227286 +0100
@@ -51,7 +51,8 @@
T* out_values, Op op, mpl::false_ /*is_mpi_op*/,
mpl::true_ /*is_mpi_datatype*/)
{
- user_op<Op, T> mpi_op(op);
+ static auto lop = op;
+ user_op<Op, T> mpi_op(lop);
BOOST_MPI_CHECK_RESULT(MPI_Allreduce,
(const_cast<T*>(in_values), out_values, n,
boost::mpi::get_mpi_datatype<T>(*in_values),
diff -ru /tmp/boost/mpi/collectives/reduce.hpp /usr/include/boost/mpi/collectives/reduce.hpp
--- boost/mpi/collectives/reduce.hpp 2018-01-08 12:24:08.143526811 +0100
+++ boost/mpi/collectives/reduce.hpp 2018-01-08 12:27:01.368661956 +0100
@@ -81,7 +81,8 @@
T* out_values, Op op, int root, mpl::false_ /*is_mpi_op*/,
mpl::true_/*is_mpi_datatype*/)
{
- user_op<Op, T> mpi_op(op);
+ static Op lop = op;
+ user_op<Op, T> mpi_op(lop);
BOOST_MPI_CHECK_RESULT(MPI_Reduce,
(const_cast<T*>(in_values), out_values, n,
boost::mpi::get_mpi_datatype<T>(*in_values),
@@ -96,7 +97,8 @@
reduce_impl(const communicator& comm, const T* in_values, int n, Op op,
int root, mpl::false_/*is_mpi_op*/, mpl::true_/*is_mpi_datatype*/)
{
- user_op<Op, T> mpi_op(op);
+ static Op lop = op;
+ user_op<Op, T> mpi_op(lop);
BOOST_MPI_CHECK_RESULT(MPI_Reduce,
(const_cast<T*>(in_values), 0, n,
boost::mpi::get_mpi_datatype<T>(*in_values),
diff -ru /tmp/boost/mpi/collectives/scan.hpp /usr/include/boost/mpi/collectives/scan.hpp
--- boost/mpi/collectives/scan.hpp 2018-01-08 12:24:08.143526811 +0100
+++ boost/mpi/collectives/scan.hpp 2018-01-08 12:28:38.185296393 +0100
@@ -67,7 +67,8 @@
scan_impl(const communicator& comm, const T* in_values, int n, T* out_values,
Op op, mpl::false_ /*is_mpi_op*/, mpl::true_ /*is_mpi_datatype*/)
{
- user_op<Op, T> mpi_op(op);
+ static Op lop = op;
+ user_op<Op, T> mpi_op(lop);
BOOST_MPI_CHECK_RESULT(MPI_Scan,
(const_cast<T*>(in_values), out_values, n,
boost::mpi::get_mpi_datatype<T>(*in_values),
diff -ru boost/mpi/collectives/scatter.hpp boost/mpi/collectives/scatter.hpp
--- boost/mpi/collectives/scatter.hpp 2017-12-20 14:26:58.079548000 +0100
+++ boost/mpi/collectives/scatter.hpp 2017-12-20 15:07:44.242734024 +0100
@@ -69,7 +69,7 @@
// Send archive
packed_oarchive oa(comm);
for (int i = 0; i < n; ++i)
- oa << in_values[dest * n + i];
+ oa << in_values[dest * n + i]; // NOLINT
detail::packed_archive_send(comm, dest, tag, oa);
}
}
diff -ru boost/variant/detail/forced_return.hpp boost/variant/detail/forced_return.hpp
--- boost/variant/detail/forced_return.hpp 2017-12-20 14:26:13.518182000 +0100
+++ boost/variant/detail/forced_return.hpp 2017-12-20 16:24:49.834173291 +0100
@@ -39,7 +39,7 @@
BOOST_ASSERT(false);
T (*dummy_function_ptr)() = 0;
- return dummy_function_ptr();
+ return dummy_function_ptr(); // NOLINT
}
template <>
FROM nvidia/cuda:9.0-devel-ubuntu16.04
MAINTAINER Florian Weik <fweik@icp.uni-stuttgart.de>
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \
apt-utils \
cmake \
build-essential \
curl \
lcov \
pkg-config \
openmpi-bin libopenmpi-dev \
libfftw3-dev \
libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
libgsl-dev \
cython3 python3 python3-numpy python3-h5py \
git \
pep8 pylint3 \
# python3-vtk7 \ # not available in 16.04
python3-sphinx python3-numpydoc \
python3-pip \
libpython-dev \
libhdf5-openmpi-dev \
libhdf5-openmpi-10:amd64 \
libhdf5-10:amd64 \
doxygen \
vim \
ccache \
graphviz \
&& pip3 install --upgrade sphinxcontrib-bibtex 'sphinx!=2.1.0' \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN useradd -m espresso && usermod -a -G www-data espresso
USER 1000
WORKDIR /home/espresso
FROM nvidia/cuda:9.0-devel-ubuntu16.04
MAINTAINER Jean-Noel Grad <jgrad@icp.uni-stuttgart.de>
ENV DEBIAN_FRONTEND noninteractive
### start of modified Dockerfile-9.0
RUN apt-get update && apt-get install -y \
apt-utils \
cmake \
build-essential \
curl \
pkg-config \
openmpi-bin libopenmpi-dev \
lcov \
libfftw3-dev \
libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
libgsl-dev \
# cython3 # use pip instead
python3 python3-numpy python3-h5py \
lcov \
curl \
git \
pep8 pylint3 \
# python3-vtk7 \ # not available in 16.04
python3-sphinx python3-numpydoc python3-pip \
libpython-dev \
libhdf5-openmpi-dev \
libhdf5-openmpi-10:amd64 \
libhdf5-10:amd64 \
doxygen \
vim \
ccache \
#&& pip3 install --upgrade sphinx sphinxcontrib-bibtex \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
### end of modified Dockerfile-9.0
# install Python3 packages required for testing tutorials and samples
RUN apt-get update && \
apt-get install -y --no-install-recommends \
python3-dev python3-pip \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& python3 -m pip install --upgrade pip \
&& pip3 install --upgrade setuptools \
&& pip3 install --upgrade six cython numpy scipy matplotlib ipython nbconvert sphinx sphinxcontrib-bibtex numpydoc
# install CMake 3.7.0
RUN cd /tmp \
&& mkdir cmake \
&& cd cmake \
&& curl -sL https://cmake.org/files/v3.7/cmake-3.7.0.tar.gz | tar --strip-components=1 -xz \
&& ./bootstrap \
&& make -j$(nproc) \
&& make install \
&& cd \
&& rm -rf /tmp/cmake
RUN useradd -m espresso && usermod -a -G www-data espresso
USER 1000
WORKDIR /home/espresso
FROM debian:stretch
MAINTAINER Florian Weik <fweik@icp.uni-stuttgart.de>
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \
apt-utils \
cmake \
build-essential \
clang \
openmpi-bin \
libfftw3-dev \
libboost-dev libboost-serialization-dev libboost-mpi-dev libboost-filesystem-dev libboost-test-dev \
cython3 python3 python3-numpy python3-h5py \
# python3-vtk7 \ # not available in stretch
lcov \
git \
pycodestyle pylint3 \
python3-pip \
libpython3-dev \
libhdf5-openmpi-dev \
vim \
ccache \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN useradd -m espresso
USER 1000
WORKDIR /home/espresso
FROM nvidia/cuda:10.0-devel-ubuntu18.04
MAINTAINER Florian Weik <fweik@icp.uni-stuttgart.de>
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \
apt-utils \
build-essential \
curl \
cpio \
lcov \
libbz2-dev \
libfftw3-dev \
cython3 python3 python3-numpy \
git \
pycodestyle pylint3 \
python3-vtk7 \
libpython3-dev \
vim \
ccache \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# CMake
RUN cd /usr/local \
&& curl -sL https://cmake.org/files/v3.11/cmake-3.11.0-Linux-x86_64.tar.gz | tar --strip-components=1 -xz \
&& rm -r /usr/local/man
# Intel Compiler
COPY intel.cfg /tmp/
RUN cd /tmp \
&& mkdir intel \
&& cd intel \
&& curl -sL http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/13717/parallel_studio_xe_2018_update4_cluster_edition_online.tgz | tar --strip-components=1 -xz \
&& USER=root ./install.sh --silent /tmp/intel.cfg \
&& cd \
&& rm -r /tmp/intel \
&& /opt/intel/ism/uninstall.sh --silent \
&& rm -f /tmp/intelremotemonfifo.*
ENV CC=/opt/intel/bin/icc CXX=/opt/intel/bin/icpc PATH="/opt/intel/bin:${PATH}" LD_LIBRARY_PATH="/opt/intel/lib/intel64:${LD_LIBRARY_PATH}"
ENV PATH="/opt/intel/compilers_and_libraries_2018.5.274/linux/mpi/intel64/bin:${PATH}" I_MPI_ROOT=/opt/intel/compilers_and_libraries_2018.5.274/linux/mpi
RUN ln -s /opt/intel/compilers_and_libraries_2018.5.274/linux/mpi/intel64/bin/mpicxx /opt/intel/compilers_and_libraries_2018.5.274/linux/mpi/intel64/bin/mpic++
# Boost
RUN cd /tmp \
&& mkdir boost \
&& cd boost \
&& curl -sL https://dl.bintray.com/boostorg/release/1.66.0/source/boost_1_66_0.tar.bz2 | tar xj \
&& cd boost_1_66_0 \
&& echo 'using mpi : mpiicpc ;' > tools/build/src/user-config.jam \
&& ./bootstrap.sh \
&& ./b2 -j $(nproc) -d0 toolset=intel install --prefix=/opt/boost \
&& cd \
&& rm -r /tmp/boost
ENV BOOST_ROOT=/opt/boost LD_LIBRARY_PATH="/opt/boost/lib:${LD_LIBRARY_PATH}"
RUN useradd -m espresso && usermod -a -G www-data espresso