Skip to content
Snippets Groups Projects
Commit ea05e0f1 authored by André Anjos's avatar André Anjos :speech_balloon:
Browse files

Merge branch 'newchannel' into 'master'

opencv and tensorflow are not available on mac for now

See merge request !38
parents 0f592f88 5c719292
Branches
Tags
1 merge request!38opencv and tensorflow are not available on mac for now
...@@ -28,6 +28,12 @@ else ...@@ -28,6 +28,12 @@ else
CAFFE= CAFFE=
fi fi
if [ "$(uname)" == "Linux" ]; then
TENSORFLOW=tensorflow
else
TENSORFLOW=
fi
# For a complete list of dependencies, please read: # For a complete list of dependencies, please read:
# https://gitlab.idiap.ch/bob/bob/wikis/Dependencies # https://gitlab.idiap.ch/bob/bob/wikis/Dependencies
echo "[>>] Creating environment ${NAME} for python ${PYTHON_VERSION} with bob dependencies..." echo "[>>] Creating environment ${NAME} for python ${PYTHON_VERSION} with bob dependencies..."
...@@ -73,13 +79,20 @@ ${CONDA} create --yes -n ${NAME} \ ...@@ -73,13 +79,20 @@ ${CONDA} create --yes -n ${NAME} \
sphinx=1.4.6 \ sphinx=1.4.6 \
sphinx_rtd_theme \ sphinx_rtd_theme \
sqlalchemy=1.0.13 \ sqlalchemy=1.0.13 \
tensorflow \ ${TENSORFLOW} \
virtualenv \ virtualenv \
vlfeat=0.9.20 vlfeat=0.9.20
echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..." echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..."
source ${BASEDIR}/bin/activate ${NAME} 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 requires special instructions
cyvlfeat=git+https://github.com/menpo/cyvlfeat@v0.4.5 cyvlfeat=git+https://github.com/menpo/cyvlfeat@v0.4.5
if [ "$(uname)" == "Linux" ]; then if [ "$(uname)" == "Linux" ]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment