Skip to content

Commit 682c3a1

Browse files
committed
Install MKL through spack in CI
1 parent 798849a commit 682c3a1

1 file changed

Lines changed: 14 additions & 13 deletions

File tree

ci/docker/build.Dockerfile

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ RUN apt-get -yqq update && \
3434
rm -rf /var/lib/apt/lists/*
3535

3636
# Install MKL and remove static libs (to keep image smaller)
37-
ARG USE_MKL=ON
38-
ARG MKL_VERSION=2024.0
39-
ARG MKL_SPEC=2024.0.0
40-
RUN if [ "$USE_MKL" = "ON" ]; then \
41-
wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB 2>/dev/null > /etc/apt/trusted.gpg.d/intel.asc && \
42-
apt-add-repository 'deb https://apt.repos.intel.com/oneapi all main' && \
43-
apt-get install -y -qq --no-install-recommends intel-oneapi-mkl-devel-${MKL_VERSION} && \
44-
rm -rf /var/lib/apt/lists/* && \
45-
find "/opt/intel/oneapi" -name "*.a" -delete ; \
37+
# ARG USE_MKL=ON
38+
# ARG MKL_VERSION=2024.0
39+
# ARG MKL_SPEC=2024.0.0
40+
# RUN if [ "$USE_MKL" = "ON" ]; then \
41+
# wget -qO - https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS.PUB 2>/dev/null > /etc/apt/trusted.gpg.d/intel.asc && \
42+
# apt-add-repository 'deb https://apt.repos.intel.com/oneapi all main' && \
43+
# apt-get install -y -qq --no-install-recommends intel-oneapi-mkl-devel-${MKL_VERSION} && \
44+
# rm -rf /var/lib/apt/lists/* && \
45+
# find "/opt/intel/oneapi" -name "*.a" -delete ; \
4646
fi
4747

4848
# This is the spack version we want to have
@@ -74,10 +74,10 @@ RUN spack external find \
7474
perl \
7575
pkg-config \
7676
python \
77-
xz && \
78-
if [ "$USE_MKL" = "ON" ]; then \
79-
echo -e " intel-oneapi-mkl:\n externals:\n - spec: \"intel-oneapi-mkl@$MKL_SPEC mpi_family=mpich\"\n prefix: /opt/intel/oneapi\n buildable: False" >> ~/.spack/packages.yaml ; \
80-
fi
77+
xz # && \
78+
# if [ "$USE_MKL" = "ON" ]; then \
79+
# echo -e " intel-oneapi-mkl:\n externals:\n - spec: \"intel-oneapi-mkl@$MKL_SPEC mpi_family=mpich\"\n prefix: /opt/intel/oneapi\n buildable: False" >> ~/.spack/packages.yaml ; \
80+
# fi
8181

8282
# Add our custom spack repo from here
8383
ARG SPACK_DLAF_REPO
@@ -107,6 +107,7 @@ ARG CXXSTD=17
107107
RUN spack -e ci config add "packages:dla-future:variants:cxxstd=${CXXSTD}"
108108
# 3. Concretize environment
109109
RUN spack -e ci concretize
110+
RUN spack -e ci spec -lI --cover edges
110111
# 4. Install only the dependencies of this (top level is our package)
111112
ARG NUM_PROCS
112113
RUN spack -e ci install --jobs ${NUM_PROCS} --fail-fast --only=dependencies

0 commit comments

Comments
 (0)