Merge branch 'master' into staging

Conflicts:
	gitlab/functions.sh

gitlab/functions.sh

@@ -310,3 +310,10 @@ if [ -z "${CI_BUILD_TAG}" ]; then
 else
   log_info "Building tag, not setting BOB_DOCUMENTATION_SERVER"
 fi
+
+# Patches conda environment
+log_info "Patching build flags to provide for conda..."
+CFLAGS="${CFLAGS} -pthread"
+export_env CFLAGS
+CXXFLAGS="${CXXFLAGS} -pthread"
+export_env CXXFLAGS

install/from-scratch.sh

@@ -48,7 +48,6 @@ ${CONDA} create --yes -n ${NAME} \
   cmake \
   coverage \
   cython=0.24.1 \
-  ccache=3.3.2 \
   dask=0.11.0 \
   docopt \
   ffmpeg=2.8.10 \
@@ -81,19 +80,13 @@ ${CONDA} create --yes -n ${NAME} \
   sphinx_rtd_theme \
   sqlalchemy=1.0.13 \
   ${TENSORFLOW} \
+  toolchain=2.0.1 \
   virtualenv \
   vlfeat=0.9.20
 
 echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..."
 source ${BASEDIR}/bin/activate ${NAME}
 
-# pip install tensorflow in mac
-if [ "$(uname)" == "Darwin" ]; then
-  pip install tensorflow
-  # test tensorflow
-  python -c "import tensorflow"
-fi
-
 # Cyvlfeat requires special instructions
 cyvlfeat=git+https://github.com/menpo/cyvlfeat@v0.4.5
 if [ "$(uname)" == "Linux" ]; then