From ef3ca00a2be1ad80b9f5b5262f8f4beb7d842d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Anjos?= <andre.anjos@idiap.ch>
Date: Mon, 9 Jan 2017 13:41:40 +0100
Subject: [PATCH] Revert "Merge branch 'cherry-pick-5b7ad326' into 'master'"
This reverts merge request !29
---
install/from-scratch.sh | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 9ea38a8..82af9be 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -22,13 +22,6 @@ if [ -d ${BASEDIR}/envs/${NAME} ]; then
fi
fi
-
-if [ "$(uname)" == "Linux" ] && [ ${PYTHON_VERSION} == "2.7" ]; then
- CAFFE=caffe
-else
- CAFFE=
-fi
-
# For a complete list of dependencies, please read:
# https://gitlab.idiap.ch/bob/bob/wikis/Dependencies
echo "[>>] Creating environment ${NAME} for python ${PYTHON_VERSION} with bob dependencies..."
@@ -40,7 +33,6 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
dask \
docopt \
ffmpeg \
- gcc \
giflib \
hdf5 \
ipdb \
@@ -69,8 +61,12 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
sqlalchemy \
tensorflow \
virtualenv \
- vlfeat \
- ${CAFFE}
+ vlfeat
+
+# 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