Skip to content

Commit

Permalink
Fixing the installation of dependencies in travis.yml (keras-team#334)
Browse files Browse the repository at this point in the history
* Added the forgotten semicolon.

* Added the executable bit for cntk

* Install cntk in all cases because of the backend tests.

* Removed progress bar from pip and converted lines endings Win -> Unix
  • Loading branch information
gabrieldemarmiesse authored Dec 15, 2018
1 parent 98c4a8d commit 6574bad
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 15 deletions.
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ install:
- export LD_LIBRARY_PATH=$HOME/miniconda/envs/test-environment/lib/:$LD_LIBRARY_PATH

- if [[ "$KERAS_BACKEND" == "theano" ]]; then
travis_retry conda install -q mkl mkl-service
travis_retry conda install -q mkl mkl-service;
fi

- pip install -e .[tests] --progress-bar off
Expand All @@ -55,9 +55,7 @@ install:
- pip install tensorflow==1.9 --progress-bar off

# install cntk
- if [[ "$KERAS_BACKEND" == "cntk" ]] || [[ "$TEST_MODE" == "PEP8" ]]; then
./.travis/install_cntk.sh;
fi
- ./.travis/install_cntk.sh

# Remove the current backend from the coverage exclusion.
- sed -i "\/keras\/backend\/${KERAS_BACKEND}_backend.py/d" .coveragerc
Expand Down
22 changes: 11 additions & 11 deletions .travis/install_cntk.sh
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
set -e
pip install cntk

# open mpi is needed for cntk
rm -rf ~/mpi
mkdir ~/mpi
pushd ~/mpi
wget http://cntk.ai/PythonWheel/ForKeras/depends/openmpi_1.10-3.zip
unzip ./openmpi_1.10-3.zip
sudo dpkg -i openmpi_1.10-3.deb
popd
set -e
pip install cntk --progress-bar off

# open mpi is needed for cntk
rm -rf ~/mpi
mkdir ~/mpi
pushd ~/mpi
wget http://cntk.ai/PythonWheel/ForKeras/depends/openmpi_1.10-3.zip
unzip ./openmpi_1.10-3.zip
sudo dpkg -i openmpi_1.10-3.deb
popd

0 comments on commit 6574bad

Please sign in to comment.