Skip to content
This repository has been archived by the owner on Aug 5, 2022. It is now read-only.

Commit

Permalink
- Fixes from review: Version match usage applied and adjusted
Browse files Browse the repository at this point in the history
  • Loading branch information
jczaja committed Aug 30, 2016
1 parent 5a700a1 commit 94b9001
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions external/mkl/prepare_mkl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,19 +28,19 @@ echo $VERSION_LINE # Return Version Line
# MKL
DST=`dirname $0`
OMP=0
VERSION_MATCH=20160801
ARCHIVE_BASENAME=mklml_lnx_2017.0.0.$VERSION_MATCH.tgz
VERSION_MATCH=20160706
ARCHIVE_BASENAME=mklml_lnx_2017.0.0.20160801.tgz
MKL_CONTENT_DIR=`echo $ARCHIVE_BASENAME | rev | cut -d "." -f 2- | rev`
GITHUB_RELEASE_TAG=self_containted_MKLGOLD
MKLURL="https://github.com/intel/caffe/releases/download/$GITHUB_RELEASE_TAG/$ARCHIVE_BASENAME"
# there are diffrent MKL lib to be used for GCC and for ICC
reg='^[0-9]+$'
VERSION_LINE=`GetVersionName $MKLROOT`
# Check if MKLROOT is set if positive then set one will be used..
if [ -z $MKLROOT ] || [ $VERSION_LINE -lt 20160706 ]; then
if [ -z $MKLROOT ] || [ $VERSION_LINE -lt $VERSION_MATCH ]; then
# ..if MKLROOT is not set then check if we have MKL downloaded in proper version
VERSION_LINE=`GetVersionName $DST/$MKL_CONTENT_DIR`
if [ $VERSION_LINE -lt 20160706 ] ; then
if [ $VERSION_LINE -lt $VERSION_MATCH ] ; then
#...If it is not then downloaded and unpacked
wget --no-check-certificate -P $DST $MKLURL -O $DST/$ARCHIVE_BASENAME
tar -xzf $DST/$ARCHIVE_BASENAME -C $DST
Expand Down

0 comments on commit 94b9001

Please sign in to comment.