From 0c97952a00134d045106fc2f35a00e56a9176c2d Mon Sep 17 00:00:00 2001 From: Amir Mohammadi <183.amir@gmail.com> Date: Fri, 13 Jan 2017 12:18:08 +0100 Subject: [PATCH] opencv and tensorflow are not available on mac for now --- install/from-scratch.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/install/from-scratch.sh b/install/from-scratch.sh index af222d7..8d30ec9 100755 --- a/install/from-scratch.sh +++ b/install/from-scratch.sh @@ -28,6 +28,14 @@ else CAFFE= fi +if [ "$(uname)" == "Linux" ]; then + OPENCV="opencv=3" + TENSORFLOW=tensorflow +else + OPENCV= + TENSORFLOW= +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..." @@ -61,7 +69,7 @@ ${CONDA} create --yes -n ${NAME} \ numexpr=2.6.1 \ numpy=1.11.1 \ openblas=0.2.19 \ - opencv=3 \ + ${OPENCV} \ pillow=3.3.1 \ pip=8.1.2 \ pkg-config \ @@ -73,7 +81,7 @@ ${CONDA} create --yes -n ${NAME} \ sphinx=1.4.6 \ sphinx_rtd_theme \ sqlalchemy=1.0.13 \ - tensorflow \ + ${TENSORFLOW} \ virtualenv \ vlfeat=0.9.20 -- GitLab