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

Merge branch 'master' into python-wo-pip

parents 4057c0e2 657c4dd5
Pipeline #9975 passed with stages
in 87 minutes and 44 seconds
......@@ -68,7 +68,7 @@ intel-python3:18:build:
extends:
- .build_template
- .manual_template
timeout: 3h
timeout: 4h
tags:
- docker
- linux
......
......@@ -37,7 +37,7 @@ RUN cd /usr/local \
&& rm -r /usr/local/man
RUN cd /usr/src && \
git clone https://github.com/thrust/thrust.git && \
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
......
......@@ -36,8 +36,9 @@ RUN cd /tmp \
&& 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++
ENV I_MPI_ROOT=/opt/intel/compilers_and_libraries_2018.5.274/linux/mpi
ENV LD_LIBRARY_PATH="${I_MPI_ROOT}/intel64/lib:${LD_LIBRARY_PATH}" PATH="${I_MPI_ROOT}/intel64/bin:${PATH}"
RUN ln -s "${I_MPI_ROOT}/intel64/bin/mpicxx" "${I_MPI_ROOT}/intel64/bin/mpic++"
# Boost
......
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