From 5c7192926e078cee9fafaf7299cc7b1dd0651ec9 Mon Sep 17 00:00:00 2001
From: Amir Mohammadi <183.amir@gmail.com>
Date: Mon, 16 Jan 2017 00:16:35 +0100
Subject: [PATCH] pip install tensorflow on mac, opencv 3 is available now
---
install/from-scratch.sh | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 8d30ec9..2f68850 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -29,10 +29,8 @@ else
fi
if [ "$(uname)" == "Linux" ]; then
- OPENCV="opencv=3"
TENSORFLOW=tensorflow
else
- OPENCV=
TENSORFLOW=
fi
@@ -69,7 +67,7 @@ ${CONDA} create --yes -n ${NAME} \
numexpr=2.6.1 \
numpy=1.11.1 \
openblas=0.2.19 \
- ${OPENCV} \
+ opencv=3 \
pillow=3.3.1 \
pip=8.1.2 \
pkg-config \
@@ -88,6 +86,13 @@ ${CONDA} create --yes -n ${NAME} \
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
--
GitLab