Simplifying travis.
@@ -7,17 +7,17 @@ cache:
matrix:
include:
- python: 2.7
- env: KERAS_BACKEND=tensorflow TEST_MODE=INTEGRATION_TESTS
+ env: KERAS_BACKEND=tensorflow TEST_MODE=INTEGRATION_TESTS PIL=Pil
- python: 3.6
- env: KERAS_BACKEND=tensorflow TEST_MODE=PEP8_DOC
+ env: KERAS_BACKEND=tensorflow TEST_MODE=PEP8_DOC PIL=Pillow
- python: 2.7
env: KERAS_BACKEND=tensorflow
- python: 3.6
env: KERAS_BACKEND=tensorflow
- python: 2.7
- env: KERAS_BACKEND=theano THEANO_FLAGS=optimizer=fast_compile
+ env: KERAS_BACKEND=theano THEANO_FLAGS=optimizer=fast_compile MKL="mkl mkl-service"
- python: 3.6
- env: KERAS_BACKEND=theano THEANO_FLAGS=optimizer=fast_compile
+ env: KERAS_BACKEND=theano THEANO_FLAGS=optimizer=fast_compile MKL="mkl mkl-service"
- python: 2.7
env: KERAS_BACKEND=cntk PYTHONWARNINGS=ignore
- python: 3.6
@@ -47,20 +47,6 @@ install:
# set library path
- export LD_LIBRARY_PATH=$HOME/miniconda/envs/test-environment/lib/:$LD_LIBRARY_PATH
- # install PIL for preprocessing tests (they are integration tests).
- - if [[ "$TEST_MODE" == "INTEGRATION_TESTS" ]] || [[ "$TEST_MODE" == "PEP8_DOC" ]]; then
- if [[ "$TRAVIS_PYTHON_VERSION" == "2.7" ]]; then
- export PIL=Pil;
- else
- export PIL=Pillow;
- fi
- fi
-
- # install mkl only for Theano.
- - if [[ "$KERAS_BACKEND" == "theano" ]]; then
- export MKL="mkl mkl-service";
- fi
-
# install pydot for visualization tests
- travis_retry conda install $MKL pydot graphviz $PIL
