From cd10a3b140f73c0acf638b324192949aadb161de Mon Sep 17 00:00:00 2001
From: Amir MOHAMMADI <amir.mohammadi@idiap.ch>
Date: Thu, 5 Jan 2017 16:16:45 +0100
Subject: [PATCH] Merge branch 'cherry-pick-5b7ad326' into 'master'
Merge branch 'gcc' into 'master'
Add caffe and gcc
The script now fails if `caffe` is in compatible.
I also added `gcc` because compiling with gcc from the host PC (Idiap machines) .
See merge request !27
See merge request !29
---
install/from-scratch.sh | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 82af9be..9ea38a8 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -22,6 +22,13 @@ 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..."
@@ -33,6 +40,7 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
dask \
docopt \
ffmpeg \
+ gcc \
giflib \
hdf5 \
ipdb \
@@ -61,12 +69,8 @@ ${CONDA} create --yes -n ${NAME} --override-channels -c conda-forge -c defaults
sqlalchemy \
tensorflow \
virtualenv \
- 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
+ vlfeat \
+ ${CAFFE}
echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..."
source ${BASEDIR}/bin/activate ${NAME}
--
GitLab