From e1fc234284c558475b6ef5c113b92a14f3e8a381 Mon Sep 17 00:00:00 2001 From: Avanti Shrikumar Date: Mon, 27 Aug 2018 15:13:30 -0700 Subject: [PATCH] trying out different travis build configs, fixing random seed in random tests --- .travis.yml | 13 +++++++------ .../functional/test_functional_concatenate_model.py | 1 + .../sequential/test_conv1d_model_same_padding.py | 1 + .../sequential/test_conv2d_model_channels_first.py | 1 + .../sequential/test_conv2d_model_same_padding.py | 1 + .../sequential/test_conv2d_model_valid_padding.py | 1 + tests/layers/test_deeplift_genomics_default_mode.py | 1 + 7 files changed, 13 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1931324..7a30e1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,9 +4,11 @@ language: python matrix: include: - python: 2.7 - env: KERAS_BACKEND=tensorflow - - python: 3.5 - env: KERAS_BACKEND=tensorflow + env: KERAS_BACKEND=tensorflow TF_VERSION=1.7 KERAS_VERSION=2.2 + - python: 2.7 + env: KERAS_BACKEND=tensorflow TF_VERSION=1.10.1 KERAS_VERSION=2.2 + - python: 3.6 + env: KERAS_BACKEND=tensorflow TF_VERSION=1.10.1 KERAS_VERSION=2.2 notifications: email: true @@ -28,9 +30,8 @@ install: - conda create -q -n test-environment python=$TRAVIS_PYTHON_VERSION numpy pytest h5py nose - source activate test-environment - - pip install numpy==1.14.0 - - pip install tensorflow==1.10.1 - - pip install keras==2.1.5 + - pip install tensorflow==$TF_VERSION + - pip install keras==$KERAS_VERSION script: - PYTHONPATH=$PWD:$PYTHONPATH py.test diff --git a/tests/conversion/functional/test_functional_concatenate_model.py b/tests/conversion/functional/test_functional_concatenate_model.py index 126b908..77aa2cb 100644 --- a/tests/conversion/functional/test_functional_concatenate_model.py +++ b/tests/conversion/functional/test_functional_concatenate_model.py @@ -6,6 +6,7 @@ import sys import os import numpy as np +np.random.seed(1234) from deeplift.conversion import kerasapi_conversion as kc import deeplift.layers as layers from deeplift.layers import NonlinearMxtsMode diff --git a/tests/conversion/sequential/test_conv1d_model_same_padding.py b/tests/conversion/sequential/test_conv1d_model_same_padding.py index 0b69a45..57f7ae9 100644 --- a/tests/conversion/sequential/test_conv1d_model_same_padding.py +++ b/tests/conversion/sequential/test_conv1d_model_same_padding.py @@ -6,6 +6,7 @@ import sys import os import numpy as np +np.random.seed(1234) from deeplift.conversion import kerasapi_conversion as kc import deeplift.layers as layers from deeplift.layers import NonlinearMxtsMode diff --git a/tests/conversion/sequential/test_conv2d_model_channels_first.py b/tests/conversion/sequential/test_conv2d_model_channels_first.py index 1caf0db..57ebaf5 100644 --- a/tests/conversion/sequential/test_conv2d_model_channels_first.py +++ b/tests/conversion/sequential/test_conv2d_model_channels_first.py @@ -6,6 +6,7 @@ import sys import os import numpy as np +np.random.seed(1234) from deeplift.conversion import kerasapi_conversion as kc import deeplift.layers as layers from deeplift.layers import NonlinearMxtsMode diff --git a/tests/conversion/sequential/test_conv2d_model_same_padding.py b/tests/conversion/sequential/test_conv2d_model_same_padding.py index 121f553..286fb98 100644 --- a/tests/conversion/sequential/test_conv2d_model_same_padding.py +++ b/tests/conversion/sequential/test_conv2d_model_same_padding.py @@ -6,6 +6,7 @@ import sys import os import numpy as np +np.random.seed(1234) from deeplift.conversion import kerasapi_conversion as kc import deeplift.layers as layers from deeplift.layers import NonlinearMxtsMode diff --git a/tests/conversion/sequential/test_conv2d_model_valid_padding.py b/tests/conversion/sequential/test_conv2d_model_valid_padding.py index 4536d41..9e78428 100644 --- a/tests/conversion/sequential/test_conv2d_model_valid_padding.py +++ b/tests/conversion/sequential/test_conv2d_model_valid_padding.py @@ -6,6 +6,7 @@ import sys import os import numpy as np +np.random.seed(1234) from deeplift.conversion import kerasapi_conversion as kc import deeplift.layers as layers from deeplift.layers import NonlinearMxtsMode diff --git a/tests/layers/test_deeplift_genomics_default_mode.py b/tests/layers/test_deeplift_genomics_default_mode.py index b19513e..572f644 100644 --- a/tests/layers/test_deeplift_genomics_default_mode.py +++ b/tests/layers/test_deeplift_genomics_default_mode.py @@ -7,6 +7,7 @@ import sys import os import numpy as np +np.random.seed(1234) import deeplift.layers as layers from deeplift.util import compile_func from deeplift.layers import ConvMxtsMode, DenseMxtsMode, NonlinearMxtsMode