From 1f9ef34d6dce70bfc5a29d8c42ba0820756eb128 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 27 Jan 2017 15:53:38 +0100
Subject: [PATCH] Don't use pip, install from our conda channel
---
install/from-scratch.sh | 29 +++++++++--------------------
1 file changed, 9 insertions(+), 20 deletions(-)
diff --git a/install/from-scratch.sh b/install/from-scratch.sh
index 7babdb5..72c4649 100755
--- a/install/from-scratch.sh
+++ b/install/from-scratch.sh
@@ -48,6 +48,7 @@ ${CONDA} create --yes -n ${NAME} \
cmake \
coverage \
cython=0.24.1 \
+ cyvlfeat=0.4.5 \
dask=0.11.0 \
docopt \
ffmpeg=2.8.10 \
@@ -55,6 +56,7 @@ ${CONDA} create --yes -n ${NAME} \
libgcc=4.8.5 \
giflib=5.1.4 \
hdf5=1.8.17 \
+ ipdb=0.10.2 \
ipython \
jpeg=8d \
libblitz=0.10 \
@@ -63,6 +65,10 @@ ${CONDA} create --yes -n ${NAME} \
libsvm=3.21 \
libtiff=4.0.6 \
matplotlib=1.5.3 \
+ menpo=0.7.7 \
+ menpofit=0.4.1 \
+ menpowidgets=0.2.1p3 \
+ mne=0.13.1 \
nose=1.3.7 \
numexpr=2.6.1 \
numpy=1.11.1 \
@@ -70,8 +76,11 @@ ${CONDA} create --yes -n ${NAME} \
opencv=3 \
pillow=3.3.1 \
pip=8.1.2 \
+ pkgtools=0.7.3 \
pkg-config \
psutil=4.3.1 \
+ pyedflib=0.1.6 \
+ schema=0.6.5 \
scikit-image=0.12.3 \
scikit-learn=0.17.1 \
scipy=0.18.1 \
@@ -84,25 +93,5 @@ ${CONDA} create --yes -n ${NAME} \
virtualenv \
vlfeat=0.9.20
-echo "[>>] Pip-installing extra dependencies in environment ${NAME} for ${PYTHON_VERSION}..."
-source ${BASEDIR}/bin/activate ${NAME}
-
-# Cyvlfeat requires special instructions
-cyvlfeat=git+https://github.com/menpo/cyvlfeat@v0.4.5
-if [ "$(uname)" == "Linux" ]; then
- CFLAGS="-I${CONDA_PREFIX}/include" LDFLAGS="-L${CONDA_PREFIX}/lib -lvl -Wl,-rpath=${CONDA_PREFIX}/lib" pip --no-cache-dir install ${cyvlfeat}
-else
- CFLAGS="-I${CONDA_PREFIX}/include" LDFLAGS="-L${CONDA_PREFIX}/lib -lvl" pip --no-cache-dir install ${cyvlfeat}
-fi
-
-pip --no-cache-dir install \
- git+https://github.com/menpo/menpo@v0.7.5 \
- git+https://github.com/menpo/menpofit@v0.4.1 \
- schema \
- pyedflib \
- mne \
- ipdb \
- pkgtools
-
echo "[>>] Bye!"
exit 0
--
GitLab