From dfaacb3ff079187508aca0f07d5b6d163fbb591d Mon Sep 17 00:00:00 2001
From: Amir Mohammadi <183.amir@gmail.com>
Date: Wed, 11 Jan 2017 17:27:14 +0100
Subject: [PATCH] [install] remove mkl which will remove caffe
---
install/from-scratch.sh | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index c7e5f63..a5d3bda 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -63,7 +63,8 @@ ${CONDA} create --yes -n ${NAME} \
matplotlib=1.5.3 \
nose=1.3.7 \
numexpr=2.6.1 \
- numpy=1.11 \
+ numpy=1.11.1 \
+ openblas=0.2.19 \
opencv=3 \
pillow=3.3.1 \
pip=8.1.2 \
@@ -81,6 +82,10 @@ ${CONDA} create --yes -n ${NAME} \
virtualenv \
vlfeat=0.9.20
+# remove mkl
+${CONDA} install --yes nomkl numpy=1.11.1 scipy=0.18.1 scikit-learn=0.17.1 numexpr=2.6.1
+${CONDA} remove --yes mkl mkl-service
+
echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..."
source ${BASEDIR}/bin/activate ${NAME}
--
GitLab