From 30611e5c5ced261ddfb39ad33061df5f390d2b4c Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Thu, 22 Dec 2016 11:32:37 +0100
Subject: [PATCH] Comment out caffe installation until Amir figures it out
---
install/from-scratch.sh | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index bcb1b88..82af9be 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -63,9 +63,10 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
virtualenv \
vlfeat
-if [ "$(uname)" == "Linux" ] && [ ${PYTHON_VERSION} == "2.7" ]; then
- ${CONDA} install --yes -n ${NAME} --override-channels -c conda-forge -c defaults caffe
-fi
+# Commented out while @amohammadi fixes it in conda-forge
+#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