Verified Commit 557b2e9f authored by Jean-Noël Grad's avatar Jean-Noël Grad
Browse files

Remove clang:6.0 image

parent ef2408e2
......@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
image: ['centos', 'clang', 'debian', 'fedora', 'opensuse', 'rocm',
image: ['centos', 'debian', 'fedora', 'opensuse', 'rocm',
'ubuntu-18.04', 'ubuntu-20.04', 'ubuntu-wo-dependencies']
steps:
- uses: actions/checkout@master
......
FROM nvidia/cuda:9.0-devel-ubuntu16.04
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 \
python3 python3-numpy python3-scipy python3-h5py \
git \
# python3-vtk7 \ # not available in 16.04
python3-pip \
python3-setuptools \
libpython3-dev \
libhdf5-openmpi-dev \
libblas-dev \
liblapack-dev \
doxygen \
vim \
&& 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
RUN cd /usr/src && \
git clone --depth=1 -b 1.9.5 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
USER espresso
ENV HOME="/home/espresso"
# install Python3 packages locally
ENV PATH="${PATH}:${HOME}/.local/bin"
RUN pip3 install --upgrade pip
RUN pip install --user requests autopep8==1.3.4 pycodestyle==2.3.1 pylint==2.2.2 astroid==2.1.0 isort==4.3.4 cython==0.26 cmake==3.10.3 cmake-format==0.6.9 pre-commit
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 <>
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment