diff --git a/common/install_mkl.sh b/common/install_mkl.sh index 6224ee5df..ead1ae60e 100644 --- a/common/install_mkl.sh +++ b/common/install_mkl.sh @@ -3,9 +3,11 @@ set -ex # MKL +MKL_VERSION=2019.5 +MKL_BUILD=281 mkdir -p /opt/intel/lib pushd /tmp -curl -fsSL https://anaconda.org/intel/mkl-static/2019.5/download/linux-64/mkl-static-2019.5-intel_281.tar.bz2 | tar xjv +curl -fsSL https://anaconda.org/intel/mkl-static/${MKL_VERSION}/download/linux-64/mkl-static-${MKL_VERSION}-intel_${MKL_BUILD}.tar.bz2 | tar xjv mv lib/* /opt/intel/lib/ -curl -fsSL https://anaconda.org/intel/mkl-include/2019.5/download/linux-64/mkl-include-2019.5-intel_281.tar.bz2 | tar xjv +curl -fsSL https://anaconda.org/intel/mkl-include/${MKL_VERSION}/download/linux-64/mkl-include-${MKL_VERSION}-intel_${MKL_BUILD}.tar.bz2 | tar xjv mv include /opt/intel/ diff --git a/libtorch/ubuntu16.04/Dockerfile b/libtorch/ubuntu16.04/Dockerfile index 499acaad8..b51839fd9 100644 --- a/libtorch/ubuntu16.04/Dockerfile +++ b/libtorch/ubuntu16.04/Dockerfile @@ -10,12 +10,9 @@ ENV LANG en_US.UTF-8 ENV LANGUAGE en_US.UTF-8 FROM base as intel -RUN mkdir -p /opt/intel/lib -WORKDIR /tmp -RUN curl -fsSL https://anaconda.org/intel/mkl-static/2019.5/download/linux-64/mkl-static-2019.5-intel_281.tar.bz2 | tar xjv -RUN mv lib/* /opt/intel/lib/ -RUN curl -fsSL https://anaconda.org/intel/mkl-include/2019.5/download/linux-64/mkl-include-2019.5-intel_281.tar.bz2 | tar xjv -RUN mv include /opt/intel/ +# Install MKL +ADD ./common/install_mkl.sh install_mkl.sh +RUN bash ./install_mkl.sh && rm install_mkl.sh FROM base as cuda ADD ./common/install_cuda.sh install_cuda.sh @@ -37,10 +34,6 @@ FROM base as final ADD ./common/install_patchelf.sh install_patchelf.sh RUN bash ./install_patchelf.sh && rm install_patchelf.sh -# Install MKL -ADD ./common/install_mkl.sh install_mkl.sh -RUN bash ./install_mkl.sh && rm install_mkl.sh - # Install MAGMA (need CUDA) ADD ./common/install_magma.sh install_magma.sh RUN bash ./install_magma.sh 9.2 10.0 10.1 10.2 && rm install_magma.sh diff --git a/manywheel/Dockerfile b/manywheel/Dockerfile index 07c4eeae0..a91246035 100644 --- a/manywheel/Dockerfile +++ b/manywheel/Dockerfile @@ -42,12 +42,8 @@ RUN bash ./install_cuda.sh ${BASE_CUDA_VERSION} && rm install_cuda.sh FROM base as intel # MKL -RUN mkdir -p /opt/intel/lib -WORKDIR /tmp -RUN curl -fsSL https://anaconda.org/intel/mkl-static/2019.5/download/linux-64/mkl-static-2019.5-intel_281.tar.bz2 | tar xjv -RUN mv lib/* /opt/intel/lib/ -RUN curl -fsSL https://anaconda.org/intel/mkl-include/2019.5/download/linux-64/mkl-include-2019.5-intel_281.tar.bz2 | tar xjv -RUN mv include /opt/intel/ +ADD ./common/install_mkl.sh install_mkl.sh +RUN bash ./install_mkl.sh && rm install_mkl.sh # EPEL for cmake FROM base as patchelf