diff --git a/external/mkl/prepare_mkl.sh b/external/mkl/prepare_mkl.sh index aa27dca6b..5022263b4 100755 --- a/external/mkl/prepare_mkl.sh +++ b/external/mkl/prepare_mkl.sh @@ -1,21 +1,21 @@ #!/bin/sh # set -ex -# +# # All modification made by Intel Corporation: © 2016 Intel Corporation -# +# # All contributions by the University of California: # Copyright (c) 2014, 2015, The Regents of the University of California (Regents) # All rights reserved. -# +# # All other contributions: # Copyright (c) 2014, 2015, the respective contributors # All rights reserved. # For the list of contributors go to https://github.com/BVLC/caffe/blob/master/CONTRIBUTORS.md -# -# +# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions are met: -# +# # * Redistributions of source code must retain the above copyright notice, # this list of conditions and the following disclaimer. # * Redistributions in binary form must reproduce the above copyright @@ -24,7 +24,7 @@ # * Neither the name of Intel Corporation nor the names of its contributors # may be used to endorse or promote products derived from this software # without specific prior written permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE @@ -34,14 +34,14 @@ # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# FindLibrary() { # Find all the instances of the MKL libraries present in Caffe MKL_LIBS=`find $1 -name libmklml_intel.so` -# Sort libraries based on build date in $MKL/include/mkl_version.h. +# Sort libraries based on build date in $MKL/include/mkl_version.h. # Cut out everything but build date tagged with __INTEL_MKL_BUILD_DATE. # The format of sorted lines is: "build_date:path_to_mkl_lib/include/mkl_version.h". # Sort lines based on the first column (build_date), in reversed order (the recent on the top). @@ -73,12 +73,12 @@ echo $VERSION_LINE # Return Version Line # MKL DST=`dirname $0` -OMP=0 -VERSION_MATCH=20180928 -ARCHIVE_BASENAME=mklml_lnx_2019.0.1.20180928.tgz +OMP=0 +VERSION_MATCH=20190220 +ARCHIVE_BASENAME=mklml_lnx_2019.0.3.20190220.tgz MKL_CONTENT_DIR=`echo $ARCHIVE_BASENAME | rev | cut -d "." -f 2- | rev` -MKLURL="https://github.com/intel/mkl-dnn/releases/download/v0.17/$ARCHIVE_BASENAME" +MKLURL="https://github.com/intel/mkl-dnn/releases/download/v0.18/$ARCHIVE_BASENAME" # there are diffrent MKL lib to be used for GCC and for ICC reg='^[0-9]+$' VERSION_LINE=`GetVersionName $MKLROOT` @@ -103,12 +103,12 @@ if [ -z `find $MKLROOT -name libmkl_rt.so -print -quit` ]; then # LOCALMKL is not set, when MKLROOT was set manually and it points to MKLML in correct version FindLibrary $MKLROOT fi - + LIBRARIES=`basename $LOCALMKL | sed -e 's/^.*lib//' | sed -e 's/\.so.*$//'` OMP=1 else LIBRARIES="mkl_rt" -fi +fi # return value to calling script (Makefile,cmake) echo $MKLROOT $LIBRARIES $OMP