#1202: CI: use oneapi:os-tools image as base

DARMA-tasking · Jul 20, 2021 · 926acd6 · 926acd6
1 parent 2e9b2a3
commit 926acd6
Showing 1 changed file with 29 additions and 6 deletions.
diff --git a/ci/docker/ubuntu-18.04-intel-oneapi-cpp.dockerfile b/ci/docker/ubuntu-18.04-intel-oneapi-cpp.dockerfile
@@ -1,5 +1,5 @@
 
-FROM intel/oneapi-hpckit:2021.1-devel-ubuntu18.04 as base
+FROM intel/oneapi:os-tools-ubuntu18.04 as base
 
 ARG proxy=""
 
@@ -10,6 +10,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update -y -q && \
     apt-get install -y -q --no-install-recommends \
+    intel-oneapi-compiler-dpcpp-cpp \
+    intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic \
+    intel-oneapi-mpi-devel \
     ca-certificates \
     less \
     curl \
@@ -25,10 +28,11 @@ RUN apt-get update -y -q && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-COPY ./ci/deps/cmake.sh cmake.sh
-RUN ./cmake.sh 3.18.4
+# skip, we already have cmake 3.20 installed
+# COPY ./ci/deps/cmake.sh cmake.sh
+# RUN ./cmake.sh 3.18.4
 
-ENV PATH=/cmake/bin/:$PATH
+# ENV PATH=/cmake/bin/:$PATH
 ENV LESSCHARSET=utf-8
 
 ENV MPICH_CC=icc \
@@ -66,7 +70,26 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
+ENV CCL_CONFIGURATION='cpu_gpu_dpcpp'
+ENV CMAKE_PREFIX_PATH='/opt/intel/oneapi/vpl:/opt/intel/oneapi/tbb/latest/env/..:/opt/intel/oneapi/dal/latest'
+ENV CPATH='/opt/intel/oneapi/vpl/2021.2.2/include:/opt/intel/oneapi/tbb/latest/env/../include:/opt/intel/oneapi/mpi/latest//include:/opt/intel/oneapi/mkl/latest/include:/opt/intel/oneapi/ippcp/latest/include:/opt/intel/oneapi/ipp/latest/include:/opt/intel/oneapi/dpl/latest/linux/include:/opt/intel/oneapi/dnnl/latest/cpu_dpcpp_gpu_dpcpp/lib:/opt/intel/oneapi/dev-utilities/latest/include:/opt/intel/oneapi/dal/latest/include:/opt/intel/oneapi/compiler/latest/linux/include:/opt/intel/oneapi/ccl/latest/include/cpu_gpu_dpcpp'
+ENV CPLUS_INCLUDE_PATH='/opt/intel/oneapi/clck/latest/include'
+ENV FI_PROVIDER_PATH='/opt/intel/oneapi/mpi/latest//libfabric/lib/prov:/usr/lib64/libfabric'
+ENV INTEL_LICENSE_FILE='/opt/intel/licenses:/root/intel/licenses:/opt/intel/oneapi/clck/latest/licensing:/opt/intel/licenses:/root/intel/licenses:/Users/Shared/Library/Application Support/Intel/Licenses'
+ENV IPPCP_TARGET_ARCH='intel64'
+ENV IPPCRYPTOROOT='/opt/intel/oneapi/ippcp/latest'
+ENV IPPROOT='/opt/intel/oneapi/ipp/latest'
+ENV IPP_TARGET_ARCH='intel64'
+ENV I_MPI_ROOT='/opt/intel/oneapi/mpi/latest'
+ENV LD_LIBRARY_PATH='/opt/intel/oneapi/vpl/2021.2.2/lib:/opt/intel/oneapi/tbb/latest/env/../lib/intel64/gcc4.8:/opt/intel/oneapi/mpi/latest//libfabric/lib:/opt/intel/oneapi/mpi/latest//lib/release:/opt/intel/oneapi/mpi/latest//lib:/opt/intel/oneapi/mkl/latest/lib/intel64:/opt/intel/oneapi/itac/latest/slib:/opt/intel/oneapi/ippcp/latest/lib/intel64:/opt/intel/oneapi/ipp/latest/lib/intel64:/opt/intel/oneapi/dnnl/latest/cpu_dpcpp_gpu_dpcpp/lib:/opt/intel/oneapi/debugger/10.1.1/dep/lib:/opt/intel/oneapi/debugger/10.1.1/libipt/intel64/lib:/opt/intel/oneapi/debugger/10.1.1/gdb/intel64/lib:/opt/intel/oneapi/dal/latest/lib/intel64:/opt/intel/oneapi/compiler/latest/linux/lib:/opt/intel/oneapi/compiler/latest/linux/lib/x64:/opt/intel/oneapi/compiler/latest/linux/lib/emu:/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga/host/linux64/lib:/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga/linux64/lib:/opt/intel/oneapi/compiler/latest/linux/compiler/lib/intel64_lin:/opt/intel/oneapi/compiler/latest/linux/compiler/lib:/opt/intel/oneapi/ccl/latest/lib/cpu_gpu_dpcpp'
+ENV LIBRARY_PATH='/opt/intel/oneapi/vpl/2021.2.2/lib:/opt/intel/oneapi/tbb/latest/env/../lib/intel64/gcc4.8:/opt/intel/oneapi/mpi/latest//libfabric/lib:/opt/intel/oneapi/mpi/latest//lib/release:/opt/intel/oneapi/mpi/latest//lib:/opt/intel/oneapi/mkl/latest/lib/intel64:/opt/intel/oneapi/ippcp/latest/lib/intel64:/opt/intel/oneapi/ipp/latest/lib/intel64:/opt/intel/oneapi/dnnl/latest/cpu_dpcpp_gpu_dpcpp/lib:/opt/intel/oneapi/dal/latest/lib/intel64:/opt/intel/oneapi/compiler/latest/linux/compiler/lib/intel64_lin:/opt/intel/oneapi/compiler/latest/linux/lib:/opt/intel/oneapi/clck/latest/lib/intel64:/opt/intel/oneapi/ccl/latest/lib/cpu_gpu_dpcpp'
+ENV ONEAPI_ROOT='/opt/intel/oneapi'
+ENV PATH='/opt/intel/oneapi/mpi/latest//libfabric/bin:/opt/intel/oneapi/mpi/latest//bin:/opt/intel/oneapi/mkl/latest/bin/intel64:/opt/intel/oneapi/itac/latest/bin:/opt/intel/oneapi/itac/latest/bin:/opt/intel/oneapi/intelpython/latest/bin:/opt/intel/oneapi/intelpython/latest/condabin:/opt/intel/oneapi/inspector/latest/bin64:/opt/intel/oneapi/dev-utilities/latest/bin:/opt/intel/oneapi/debugger/10.1.1/gdb/intel64/bin:/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga/llvm/aocl-bin:/opt/intel/oneapi/compiler/latest/linux/lib/oclfpga/bin:/opt/intel/oneapi/compiler/latest/linux/bin/intel64:/opt/intel/oneapi/compiler/latest/linux/bin:/opt/intel/oneapi/compiler/latest/linux/ioc/bin:/opt/intel/oneapi/clck/latest/bin/intel64:/opt/intel/oneapi/advisor/latest/bin64:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
+ENV PKG_CONFIG_PATH='/opt/intel/oneapi/vtune/latest/include/pkgconfig/lib64:/opt/intel/oneapi/vpl/2021.2.2/lib/pkgconfig:/opt/intel/oneapi/mkl/latest/tools/pkgconfig:/opt/intel/oneapi/inspector/latest/include/pkgconfig/lib64:/opt/intel/oneapi/advisor/latest/include/pkgconfig/lib64:'
+ENV TBBROOT='/opt/intel/oneapi/tbb/latest/env/..'
+ENV VT_MPI='impi4'
+
 RUN /vt/ci/build_cpp.sh /vt /build
 
-FROM build as test
-RUN /vt/ci/test_cpp.sh /vt /build
+#FROM build as test
+#RUN /vt/ci/test_cpp.sh /vt /build