Unverified Commit 566eb30e authored by Jean-Noël Grad's avatar Jean-Noël Grad Committed by GitHub

Merge pull request #133 from mkuron/patch-15

Fix ROCm image build

rocPRIM patch not needed since rocm 2.7.1 release
parents 40925c9f 19980533
Pipeline #9250 passed with stages
in 308 minutes and 48 seconds
......@@ -26,11 +26,6 @@ RUN apt-get update && apt-get install -y \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
# fix rocprim namespace issue in rocthrust v2.7
# https://github.com/ROCmSoftwarePlatform/rocPRIM/pull/91
COPY rocm.patch /tmp/
RUN cd /opt/rocm && patch -p1 < /tmp/rocm.patch
RUN useradd -m espresso
USER 1000
WORKDIR /home/espresso
......
diff -ru rocm/rocprim/include/rocprim/types/integer_sequence.hpp rocm/rocprim/include/rocprim/types/integer_sequence.hpp
--- rocm/rocprim/include/rocprim/types/integer_sequence.hpp 2019-08-27 17:47:02.426632521 +0000
+++ rocm/rocprim/include/rocprim/types/integer_sequence.hpp 2019-08-27 17:47:06.474637231 +0000
@@ -29,6 +29,7 @@
#if defined(__cpp_lib_integer_sequence) && !defined(DOXYGEN_SHOULD_SKIP_THIS)
// For C++14 or newer we just use standard implementation
using std::integer_sequence;
+using std::index_sequence;
using std::make_integer_sequence;
using std::make_index_sequence;
using std::index_sequence_for;
Markdown is supported
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