set env MKLROOT in intel/mkl containers+add deps (#51)

r-hub · Oct 16, 2023 · 8c9f505 · 8c9f505
1 parent 993400a
commit 8c9f505
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/containers/intel/Dockerfile b/containers/intel/Dockerfile
@@ -7,7 +7,7 @@ FROM fedora:38
 COPY oneAPI.repo /etc/yum.repos.d
 
 RUN dnf install -y \
-    intel-oneapi-mkl-2023.2.0 \
+    intel-oneapi-mkl-devel-2023.2.0 \
     intel-oneapi-compiler-dpcpp-cpp-2023.2.1.x86_64 \
     intel-oneapi-compiler-fortran-2023.2.1.x86_64
 
@@ -72,7 +72,7 @@ COPY r-check /usr/local/bin
 # ------------------------------------------------------------------------------------
 # Useful system packages
 
-RUN dnf install -y pkg-config devscripts-checkbashisms qpdf tidy
+RUN dnf install -y pkg-config devscripts-checkbashisms qpdf tidy procps
 
 # ------------------------------------------------------------------------------------
 # Check config

diff --git a/containers/intel/r-check b/containers/intel/r-check
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -a && . /opt/intel/oneapi/setvars.sh && set +a
 set -e
 
 checkdir=${1-/check}

diff --git a/containers/mkl/Dockerfile b/containers/mkl/Dockerfile
@@ -6,7 +6,7 @@ FROM fedora:38
 
 COPY oneAPI.repo /etc/yum.repos.d
 
-RUN dnf install -y intel-oneapi-mkl-2023.2.0
+RUN dnf install -y intel-oneapi-mkl-devel-2023.2.0
 
 # ------------------------------------------------------------------------------------
 # Install pre-built R and requirements
@@ -66,7 +66,13 @@ COPY r-check /usr/local/bin
 # ------------------------------------------------------------------------------------
 # Useful system packages
 
-RUN dnf install -y pkg-config devscripts-checkbashisms qpdf tidy
+RUN dnf install -y pkg-config devscripts-checkbashisms qpdf tidy procps
+
+# ------------------------------------------------------------------------------------
+# Copy MKL environment
+
+ENV SETVARS_ARGS --config=/opt/mklconfig.txt
+COPY mklconfig.txt /opt/mklconfig.txt
 
 # ------------------------------------------------------------------------------------
 # Check config

diff --git a/containers/mkl/mklconfig.txt b/containers/mkl/mklconfig.txt
@@ -0,0 +1,2 @@
+default=exclude
+mkl=latest
diff --git a/containers/mkl/r-check b/containers/mkl/r-check
@@ -1,4 +1,5 @@
 #! /bin/bash
+set -a && . /opt/intel/oneapi/setvars.sh && set +a
 set -e
 
 checkdir=${1-/check}