From f35ebf7024b272486371af8ca879e5a238b9e3e3 Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Wed, 21 Dec 2016 12:04:32 +0100
Subject: [PATCH] Update from-scratch.sh to install caffe on Python 2.7 and
Linux
---
install/from-scratch.sh | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 41ae65e..bcb1b88 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -62,7 +62,10 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
tensorflow \
virtualenv \
vlfeat
- #caffe
+
+if [ "$(uname)" == "Linux" ] && [ ${PYTHON_VERSION} == "2.7" ]; then
+ ${CONDA} install --yes -n ${NAME} --override-channels -c conda-forge -c defaults caffe
+fi
echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..."
source ${BASEDIR}/bin/activate ${NAME}
--
GitLab