diff --git a/stacks/dars/mkl/Dockerfile b/stacks/dars/mkl/Dockerfile index 3e44dda..1787a51 100644 --- a/stacks/dars/mkl/Dockerfile +++ b/stacks/dars/mkl/Dockerfile @@ -3,36 +3,36 @@ LABEL maintainer="otc-swstacks@intel.com" ARG swupd_args +WORKDIR /root + +# ldconfig configuration +COPY dars.ld.so.conf . +RUN cat dars.ld.so.conf >> /etc/ld.so.conf + # OS update and bundle installation RUN swupd update $swupd_args && \ swupd bundle-add --skip-diskspace-check \ big-data-basic \ which -# general settings for all derived images -WORKDIR /root - -# ldconfig configuration -COPY dars.ld.so.conf . -RUN cat dars.ld.so.conf >> /etc/ld.so.conf - -# copy spark-core jar -COPY spark-core_2.12-2.4.0.jar /usr/share/apache-spark/jars/spark-core_2.12-2.4.0.jar +COPY profile /etc/profile -RUN swupd bundle-add curl cpio +# start: MKL specific +ENV MKL_INSTALLER=http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15095/l_mkl_2019.2.187_online.tgz +ENV MKL_WRAPPER=https://github.com/Intel-bigdata/mkl_wrapper_for_non_CDH/raw/master +ENV MKL_TARGET_DIR=/opt/intel/mkl/wrapper -# mkl COPY silent.cfg . -RUN curl http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/15095/l_mkl_2019.2.187_online.tgz -o l_mkl.tgz -RUN mkdir l_mkl && tar -xvf l_mkl.tgz -C l_mkl --strip-components=1 && \ - l_mkl/install.sh -s silent.cfg && rm -rf l_mkl +RUN swupd bundle-add curl cpio && \ + curl ${MKL_INSTALLER} -o l_mkl.tgz && \ + mkdir l_mkl && \ + tar -xvf l_mkl.tgz -C l_mkl --strip-components=1 && \ + l_mkl/install.sh -s silent.cfg && \ + rm -rf l_mkl && \ + mkdir -p ${MKL_TARGET_DIR} && \ + curl -L ${MKL_WRAPPER}/mkl_wrapper.jar -o ${MKL_TARGET_DIR}/mkl_wrapper.jar && \ + curl -L ${MKL_WRAPPER}/mkl_wrapper.so -o ${MKL_TARGET_DIR}/mkl_wrapper.so && \ + ldconfig -# mkl wrapper -RUN mkdir -p /opt/intel/mkl/wrapper && \ - curl -L https://github.com/Intel-bigdata/mkl_wrapper_for_non_CDH/raw/master/mkl_wrapper.jar -o /opt/intel/mkl/wrapper/mkl_wrapper.jar && \ - curl -L https://github.com/Intel-bigdata/mkl_wrapper_for_non_CDH/raw/master/mkl_wrapper.so -o /opt/intel/mkl/wrapper/mkl_wrapper.so - -RUN ldconfig - -CMD ["/bin/bash"] +CMD ["/bin/sh"] diff --git a/stacks/dars/mkl/README.md b/stacks/dars/mkl/README.md index 166934b..5628444 100644 --- a/stacks/dars/mkl/README.md +++ b/stacks/dars/mkl/README.md @@ -14,4 +14,4 @@ docker build --no-cache -t clearlinux/stacks-dars-mkl . * `swupd_args` specifies [swupd update](https://github.com/clearlinux/swupd-client/blob/master/docs/swupd.1.rst#options) flags passed to the update during build. ->NOTE: An empty `swupd_args` will default to Clear Linux OS latest version. Consider this when building from the Dockerfile, as an OS update will be performed. The docker image in this registry was built and validated using version 29200. +>NOTE: An empty `swupd_args` will default to Clear Linux OS latest version. Consider this when building from the Dockerfile, as an OS update will be performed. The docker image in this registry was built and validated using version 29480. diff --git a/stacks/dars/mkl/profile b/stacks/dars/mkl/profile new file mode 100644 index 0000000..516c403 --- /dev/null +++ b/stacks/dars/mkl/profile @@ -0,0 +1,7 @@ +#!/usr/bin/bash + +# Configure openjdk11 + +export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk +export PATH="${JAVA_HOME}/bin:${PATH}" + diff --git a/stacks/dars/mkl/spark-core_2.12-2.4.0.jar b/stacks/dars/mkl/spark-core_2.12-2.4.0.jar deleted file mode 100644 index 0686262..0000000 Binary files a/stacks/dars/mkl/spark-core_2.12-2.4.0.jar and /dev/null differ diff --git a/stacks/dars/openblas/Dockerfile b/stacks/dars/openblas/Dockerfile index 7ece43f..e308ba6 100644 --- a/stacks/dars/openblas/Dockerfile +++ b/stacks/dars/openblas/Dockerfile @@ -3,33 +3,31 @@ LABEL maintainer="otc-swstacks@intel.com" ARG swupd_args +WORKDIR /root + +# ldconfig configuration +COPY dars.ld.so.conf . +RUN cat dars.ld.so.conf >> /etc/ld.so.conf + # OS update and bundle installation RUN swupd update $swupd_args && \ swupd bundle-add --skip-diskspace-check \ big-data-basic \ which -# general settings for all derived images -WORKDIR /root - -# ldconfig configuration -COPY dars.ld.so.conf . -RUN cat dars.ld.so.conf >> /etc/ld.so.conf - -# copy spark-core jar -COPY spark-core_2.12-2.4.0.jar /usr/share/apache-spark/jars/spark-core_2.12-2.4.0.jar +COPY profile /etc/profile -RUN swupd bundle-add --skip-diskspace-check \ - python-basic-dev +# start: OpenBLAS specific +ENV OPENBLAS_AVX512=/usr/lib64/haswell/avx512_1/libopenblas_skylakexp-r0.3.5.so # TODO: remove this softlinks once CLR team fix it -ENV OPENBLAS_AVX512 /usr/lib64/haswell/avx512_1/libopenblas_skylakexp-r0.3.5.so -RUN ln -sf ${OPENBLAS_AVX512} /usr/lib64/haswell/libblas.so && \ - ln -sf ${OPENBLAS_AVX512} /usr/lib64/haswell/libblas.so.3 && \ - ln -sf ${OPENBLAS_AVX512} /usr/lib64/haswell/liblapack.so && \ - ln -sf ${OPENBLAS_AVX512} /usr/lib64/haswell/liblapack.so.3 +RUN swupd bundle-add --skip-diskspace-check \ + python-basic-dev && \ + ln -sf ${OPENBLAS_AVX512} /usr/lib64/haswell/libblas.so && \ + ln -sf ${OPENBLAS_AVX512} /usr/lib64/haswell/libblas.so.3 && \ + ln -sf ${OPENBLAS_AVX512} /usr/lib64/haswell/liblapack.so && \ + ln -sf ${OPENBLAS_AVX512} /usr/lib64/haswell/liblapack.so.3 && \ + ldconfig -RUN ldconfig - -CMD ["/bin/bash"] +CMD ["/bin/sh"] diff --git a/stacks/dars/openblas/README.md b/stacks/dars/openblas/README.md index ce14398..9ce358d 100644 --- a/stacks/dars/openblas/README.md +++ b/stacks/dars/openblas/README.md @@ -14,4 +14,4 @@ docker build --no-cache -t clearlinux/stacks-dars-openblas . * `swupd_args` specifies [swupd update](https://github.com/clearlinux/swupd-client/blob/master/docs/swupd.1.rst#options) flags passed to the update during build. ->NOTE: An empty `swupd_args` will default to Clear Linux OS latest version. Consider this when building from the Dockerfile, as an OS update will be performed. The docker image in this registry was built and validated using version 29200. +>NOTE: An empty `swupd_args` will default to Clear Linux OS latest version. Consider this when building from the Dockerfile, as an OS update will be performed. The docker image in this registry was built and validated using version 29480. diff --git a/stacks/dars/openblas/profile b/stacks/dars/openblas/profile new file mode 100644 index 0000000..516c403 --- /dev/null +++ b/stacks/dars/openblas/profile @@ -0,0 +1,7 @@ +#!/usr/bin/bash + +# Configure openjdk11 + +export JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk +export PATH="${JAVA_HOME}/bin:${PATH}" + diff --git a/stacks/dars/openblas/spark-core_2.12-2.4.0.jar b/stacks/dars/openblas/spark-core_2.12-2.4.0.jar deleted file mode 100644 index 0686262..0000000 Binary files a/stacks/dars/openblas/spark-core_2.12-2.4.0.jar and /dev/null differ