#1202: CI: use setvars.sh instead of providing configuration directly

DARMA-tasking · Nov 5, 2021 · f2a5162 · f2a5162
1 parent 664ef95
commit f2a5162
Showing 1 changed file with 2 additions and 15 deletions.
diff --git a/ci/docker/ubuntu-18.04-intel-oneapi-cpp.dockerfile b/ci/docker/ubuntu-18.04-intel-oneapi-cpp.dockerfile
@@ -37,20 +37,6 @@ ENV MPICH_CC=icc \
 ENV MPI_EXTRA_FLAGS="" \
     PATH=/usr/lib/ccache/:$PATH
 
-ENV CCL_CONFIGURATION='cpu_gpu_dpcpp' \
-    CMAKE_PREFIX_PATH='/opt/intel/oneapi/tbb/latest/env/..' \
-    CPATH='/opt/intel/oneapi/tbb/latest/env/../include:/opt/intel/oneapi/mpi/latest//include:/opt/intel/oneapi/dev-utilities/latest/include:/opt/intel/oneapi/compiler/latest/linux/include' \
-    FI_PROVIDER_PATH='/opt/intel/oneapi/mpi/latest//libfabric/lib/prov:/usr/lib64/libfabric' \
-    INTEL_LICENSE_FILE='/opt/intel/licenses:/root/intel/licenses:/opt/intel/licenses:/root/intel/licenses:/Users/Shared/Library/Application Support/Intel/Licenses' \
-    IPPCP_TARGET_ARCH='intel64' \
-    IPP_TARGET_ARCH='intel64' \
-    I_MPI_ROOT='/opt/intel/oneapi/mpi/latest' \
-    LD_LIBRARY_PATH='/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/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/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' \
-    LIBRARY_PATH='/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/compiler/latest/linux/compiler/lib/intel64_lin:/opt/intel/oneapi/compiler/latest/linux/lib' \
-    ONEAPI_ROOT='/opt/intel/oneapi' \
-    PATH='/opt/intel/oneapi/mpi/latest//libfabric/bin:/opt/intel/oneapi/mpi/latest//bin:/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:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' \
-    TBBROOT='/opt/intel/oneapi/tbb/latest/env/..' \
-    VT_MPI='impi4'
 
 FROM base as build
 COPY . /vt
@@ -89,7 +75,8 @@ ENV VT_LB_ENABLED=${VT_LB_ENABLED} \
     VT_DIAGNOSTICS_RUNTIME_ENABLED=${VT_DIAGNOSTICS_RUNTIME_ENABLED} \
     CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
 
-RUN /vt/ci/build_cpp.sh /vt /build
+RUN . /opt/intel/oneapi/setvars.sh && \
+    /vt/ci/build_cpp.sh /vt /build
 
 FROM build as test
 RUN /vt/ci/test_cpp.sh /vt /build