Skip to content
Snippets Groups Projects
Commit 7347c46d authored by Amir Mohammadi's avatar Amir Mohammadi
Browse files

Use toolchain 2.3.0, dont install gcc on mac

parent a4aa4f55
No related branches found
No related tags found
1 merge request!44Update to anaconda 4.3.0, remove virtualenv
Hide whitespace changes
Inline Side-by-side
Showing
with 11 additions and 3 deletions
install/from-scratch.sh
+ 11
− 3
View file @ 7347c46d
...@@ -34,6 +34,14 @@ else ...@@ -34,6 +34,14 @@ else
TENSORFLOW= TENSORFLOW=
fi fi
if [ "$(uname)" == "Linux" ]; then
MYGCCPACKAGE="gcc=4.8.5"
MYLIBGCCPKG="libgcc=4.8.5"
else
MYGCCPACKAGE=
MYLIBGCCPKG=
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
...@@ -75,8 +83,8 @@ ${CONDA} create --copy --yes -n ${NAME} \ ...@@ -75,8 +83,8 @@ ${CONDA} create --copy --yes -n ${NAME} \
cyvlfeat=0.4.5 \ cyvlfeat=0.4.5 \
docopt \ docopt \
ffmpeg=2.8.10 \ ffmpeg=2.8.10 \
gcc=4.8.5 \ ${MYGCCPACKAGE} \
libgcc=4.8.5 \ ${MYLIBGCCPKG} \
giflib=5.1.4 \ giflib=5.1.4 \
ipdb=0.10.2 \ ipdb=0.10.2 \
ipython \ ipython \
...@@ -97,7 +105,7 @@ ${CONDA} create --copy --yes -n ${NAME} \ ...@@ -97,7 +105,7 @@ ${CONDA} create --copy --yes -n ${NAME} \
sox=14.4.2 \ sox=14.4.2 \
sphinx_rtd_theme \ sphinx_rtd_theme \
${TENSORFLOW} \ ${TENSORFLOW} \
toolchain=2.1.0 \ toolchain=2.3.0 \
vlfeat=0.9.20 vlfeat=0.9.20
echo "[>>] Bye!" echo "[>>] Bye!"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment