Unverified Commit 0601c0b5 authored by Kai Szuttor's avatar Kai Szuttor Committed by GitHub

Merge pull request #58 from KaiSzuttor/intel_c++14

Intel 18 container
parents 1b55c81e db7e2e0b
Pipeline #5595 passed with stages
in 37 minutes and 42 seconds
......@@ -69,9 +69,7 @@ cuda:9.0:
<<: *build_definition
rocm:latest:
<<: *build_definition
intel:15:
<<: *build_definition
intel:17:
intel:18:
<<: *build_definition
ubuntu-python3:16.04:
<<: *build_definition
......@@ -115,9 +113,7 @@ test/rocm:latest:
myconfig: "maxset"
HIP_PLATFORM: "hcc"
HCC_AMDGPU_TARGET: "gfx900"
test/intel:15:
<<: *test_definition
test/intel:17:
test/intel:18:
<<: *test_definition
test/ubuntu-python3:16.04:
<<: *test_py3_definition
......
FROM nvidia/cuda:8.0-devel-ubuntu14.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 \
lcov \
libbz2-dev \
libfftw3-dev \
python python-numpy python-enum \
git \
pep8 pylint\
python-vtk \
python-pip \
libpython-dev \
doxygen \
vim \
ccache \
&& pip2 install cython sphinx sphinxcontrib-bibtex numpydoc --upgrade \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& rm /usr/lib/pymodules/python2.7/vtk/vtkRenderingPython.so /usr/lib/pymodules/python2.7/vtk/vtkVolumeRenderingPython.so /usr/lib/pymodules/python2.7/vtk/vtkHybridPython.so /usr/lib/pymodules/python2.7/vtk/vtkWidgetsPython.so /usr/lib/pymodules/python2.7/vtk/vtkChartsPython.so /usr/lib/pymodules/python2.7/vtk/vtkGeovisPython.so /usr/lib/pymodules/python2.7/vtk/vtkInfovisPython.so /usr/lib/pymodules/python2.7/vtk/vtkViewsPython.so /usr/lib/pymodules/python2.7/vtk/vtkParallelPython.so
# CMake
RUN cd /usr/local \
&& curl -sL https://cmake.org/files/v3.10/cmake-3.10.3-Linux-x86_64.tar.gz | tar --strip-components=1 -xz
# Intel Compiler
COPY intel-15.cfg /tmp/intel.cfg
RUN cd /tmp \
&& mkdir intel \
&& cd intel \
&& curl -sL http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/4933/l_compxe_2015.1.133.tgz | tar --strip-components=1 -xz \
&& USER=root ./install.sh --silent /tmp/intel.cfg \
&& cd \
&& rm -r /tmp/intel
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}"
# Intel MPI
COPY intel-mpi.cfg /tmp/
RUN cd /tmp \
&& mkdir intel-mpi \
&& cd intel-mpi \
&& curl -sL http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12414/l_mpi_2018.1.163.tgz | tar --strip-components=1 -xz \
&& ./install.sh --silent /tmp/intel-mpi.cfg \
&& ln -s /opt/intel-mpi/compilers_and_libraries_2018.1.163/linux/mpi/intel64/bin/mpicxx /opt/intel-mpi/compilers_and_libraries_2018.1.163/linux/mpi/intel64/bin/mpic++ \
&& cd \
&& rm -r /tmp/intel-mpi
ENV PATH="/opt/intel-mpi/compilers_and_libraries_2018.1.163/linux/mpi/intel64/bin:${PATH}" I_MPI_ROOT=/opt/intel-mpi/compilers_and_libraries_2018.1.163/linux/mpi
# Boost
RUN cd /tmp \
&& mkdir boost \
&& cd boost \
&& curl -sL https://dl.bintray.com/boostorg/release/1.65.0/source/boost_1_65_0.tar.bz2 | tar xj \
&& cd boost_1_65_0 \
&& echo 'using mpi ;' > 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}"
COPY thrust.patch /tmp/
RUN cd /usr/local/cuda/include/thrust && patch -p1 < /tmp/thrust.patch
RUN useradd -m espresso && usermod -a -G www-data espresso
USER espresso
WORKDIR /home/espresso
FROM nvidia/cuda:9.0-devel-ubuntu16.04
FROM nvidia/cuda:10.0-devel-ubuntu16.04
MAINTAINER Florian Weik <fweik@icp.uni-stuttgart.de>
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y \
......@@ -30,25 +30,15 @@ COPY intel.cfg /tmp/
RUN cd /tmp \
&& mkdir intel \
&& cd intel \
&& curl -sL http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/11541/parallel_studio_xe_2017_update4_composer_edition.tgz | tar --strip-components=1 -xz \
&& 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
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++
# Intel MPI
COPY intel-mpi.cfg /tmp/
RUN cd /tmp \
&& mkdir intel-mpi \
&& cd intel-mpi \
&& curl -sL http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/12748/l_mpi_2018.2.199.tgz | tar --strip-components=1 -xz \
&& ./install.sh --silent /tmp/intel-mpi.cfg \
&& ln -s /opt/intel-mpi/compilers_and_libraries_2018.2.199/linux/mpi/intel64/bin/mpicxx /opt/intel-mpi/compilers_and_libraries_2018.2.199/linux/mpi/intel64/bin/mpic++ \
&& cd \
&& rm -r /tmp/intel-mpi
ENV PATH="/opt/intel-mpi/compilers_and_libraries_2018.2.199/linux/mpi/intel64/bin:${PATH}" I_MPI_ROOT=/opt/intel-mpi/compilers_and_libraries_2018.2.199/linux/mpi
# Boost
RUN cd /tmp \
......@@ -56,7 +46,7 @@ RUN cd /tmp \
&& 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 ;' > tools/build/src/user-config.jam \
&& echo 'using mpi : mpiicpc ;' > tools/build/src/user-config.jam \
&& ./bootstrap.sh \
&& ./b2 -j $(nproc) -d0 toolset=intel install --prefix=/opt/boost \
&& cd \
......
ACCEPT_EULA=accept
INSTALL_MODE=NONRPM
CONTINUE_WITH_OPTIONAL_ERROR=yes
PSET_INSTALL_DIR=/opt/intel
CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes
PSET_MODE=install
PHONEHOME_SEND_USAGE_DATA=no
SIGNING_ENABLED=yes
COMPONENTS=intel-compilerpro-common__noarch;intel-compilerpro-devel__x86_64;intel-compilerpro-vars__noarch;intel-compilerproc__x86_64;intel-compilerproc-vars__noarch;intel-compilerproc-common__noarch;intel-compilerproc-devel__x86_64;intel-openmp__x86_64;intel-openmp-devel__x86_64;intel-compxe__noarch;intel-compilerpro-common-pset
ACTIVATION_LICENSE_FILE=28518@pudu.icp.uni-stuttgart.de
ACTIVATION_TYPE=license_server
ACCEPT_EULA=accept
INSTALL_MODE=NONRPM
CONTINUE_WITH_OPTIONAL_ERROR=yes
PSET_INSTALL_DIR=/opt/intel-mpi
CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes
PSET_MODE=install
SIGNING_ENABLED=yes
......@@ -4,7 +4,6 @@ CONTINUE_WITH_OPTIONAL_ERROR=yes
PSET_INSTALL_DIR=/opt/intel
CONTINUE_WITH_INSTALLDIR_OVERWRITE=yes
PSET_MODE=install
PHONEHOME_SEND_USAGE_DATA=no
SIGNING_ENABLED=yes
COMPONENTS=intel-icc-l-ps-ss-bec-wrapper__x86_64;intel-icc-l-all__x86_64;intel-compxe__noarch;intel-ccompxe__noarch;intel-psxe-licensing__noarch;intel-psxe-common__noarch
COMPONENTS=;intel-comp__x86_64;intel-comp-l-all-common__noarch;intel-comp-l-all-vars__noarch;intel-comp-nomcu-vars__noarch;intel-comp-ps__x86_64;intel-comp-ps-ss__x86_64;intel-comp-ps-ss-bec__x86_64;intel-openmp__x86_64;intel-openmp-common__noarch;intel-openmp-common-icc__noarch;intel-tbb-libs__x86_64;intel-icc__x86_64;intel-c-comp-common__noarch;intel-icc-common__noarch;intel-icc-common-ps__noarch;intel-icc-common-ps-ss-bec__noarch;intel-icc-doc__noarch;intel-icc-ps__x86_64;intel-icc-ps-ss__x86_64;intel-icc-ps-ss-bec__x86_64;intel-tbb-devel__x86_64;intel-tbb-common__noarch;intel-imb__x86_64;intel-mpi-rt__x86_64;intel-mpi-sdk__x86_64;intel-ism__noarch;intel-icsxe__noarch;intel-psxe-common__noarch;intel-psxe-licensing__noarch;intel-icsxe-pset
ACTIVATION_TYPE=license_server
--- thrust/system/cuda/detail/bulk/detail/synchronize.hpp 2017-10-19 10:57:38.732756117 +0200
+++ thrust/system/cuda/detail/bulk/detail/synchronize.hpp 2018-01-18 17:26:10.922050554 +0100
@@ -29,7 +29,7 @@
{
-inline __host__ __device__
+inline __host__
void synchronize(const char* message = "")
{
#if __BULK_HAS_CUDART__
@@ -41,7 +41,7 @@
} // end terminate()
-inline __host__ __device__
+inline __host__
void synchronize_if_enabled(const char* message = "")
{
// XXX we rely on __THRUST_SYNCHRONOUS here
--- thrust/system/cuda/detail/synchronize.h 2017-10-19 10:57:38.664757761 +0200
+++ thrust/system/cuda/detail/synchronize.h 2018-01-18 17:25:17.049664809 +0100
@@ -29,14 +29,14 @@
{
-inline __host__ __device__
+inline __host__
void synchronize(const char *message = "");
-inline __host__ __device__
+inline __host__
void synchronize(cudaStream_t stream, const char *message = "");
-inline __host__ __device__
+inline __host__
void synchronize_if_enabled(const char *message = "");
--- thrust/system/cuda/detail/synchronize.inl 2017-10-19 10:57:38.676757471 +0200
+++ thrust/system/cuda/detail/synchronize.inl 2018-01-18 17:25:06.761591137 +0100
@@ -29,14 +29,14 @@
{
-inline __host__ __device__
+inline __host__
void synchronize(const char *message)
{
throw_on_error(cudaDeviceSynchronize(), message);
} // end synchronize()
-inline __host__ __device__
+inline __host__
void synchronize(cudaStream_t stream, const char *message)
{
#if !defined(__CUDA_ARCH__)
@@ -46,7 +46,7 @@
#endif
}
-inline __host__ __device__
+inline __host__
void synchronize_if_enabled(const char *message)
{
// XXX this could potentially be a runtime decision
--- thrust/system/cuda/detail/bulk/detail/cuda_launcher/cuda_launcher.hpp 2017-10-19 10:57:38.744755827 +0200
+++ thrust/system/cuda/detail/bulk/detail/cuda_launcher/cuda_launcher.hpp 2018-01-19 15:37:32.828072280 +0100
@@ -70,8 +70,6 @@
if(num_blocks > 0)
{
super_t::launch(num_blocks, block_size, num_dynamic_smem_bytes, stream, task);
-
- bulk::detail::synchronize_if_enabled("bulk_kernel_by_value");
} // end if
} // end launch()
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