Tools/make_binary_drop_linux: MKL replaces ACML; opencv-3.1

This commit is contained in:
Mark Hillebrand 2016-07-06 11:46:31 +02:00
Родитель 9ad0d1157b
Коммит fdcfc02ca6
1 изменённых файлов: 8 добавлений и 8 удалений

Просмотреть файл

@ -106,11 +106,11 @@ fi
# Dependency files
# ACML
declare -a acmlFiles=("libacml_mp.so" "libiomp5.so")
# MKL
declare -a mklFiles=("libmkl_cntk_p.so" "libiomp5.so")
# Open CV
declare -a opencvFiles=("libopencv_core.so.3.0" "libopencv_imgproc.so.3.0" "libopencv_imgproc.so.3.0" "libopencv_imgcodecs.so.3.0")
declare -a opencvFiles=("libopencv_core.so.3.1" "libopencv_imgproc.so.3.1" "libopencv_imgproc.so.3.1" "libopencv_imgcodecs.so.3.1")
# libzip
declare -a libzipFiles=("libzip.so")
@ -122,8 +122,8 @@ declare -a cudaFiles=("libcudart.so.7.5" "libcublas.so.7.5" "libcurand.so.7.5" "
declare -a cudnnFiles=("libcudnn.so.4")
# Set dependency sources paths
acmlPath="/usr/local/acml5.3.1/ifort64_mp/lib"
opencvPath="/usr/local/opencv-3.0.0/lib"
mklPath="/usr/local/CNTKCustomMKL/1/x64/parallel"
opencvPath="/usr/local/opencv-3.1.0/lib"
libzipPath="/usr/local/lib"
cudaPath="/usr/local/cuda/lib64"
cudnnPath="/usr/local/cudnn-4.0/cuda/lib64"
@ -158,9 +158,9 @@ echo "Copying Dependencies..." >&3
# Make dependencies directory
mkdir -p $baseDependenciesPath
# Copy ACML
echo "Copying ACML..." >&3
CopyFilesFromList $acmlPath acmlFiles[@] $baseDependenciesPath
# Copy MKL
echo "Copying MKL" >&3
CopyFilesFromList $mklPath mklFiles[@] $baseDependenciesPath
# Copy Open CV
echo "Copying Open CV..." >&3