Merge branch 'revert-5b7ad326' into 'master'

Revert "Merge branch 'gcc' into 'master'"

This reverts merge request !27

See merge request !28

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}