do not share data between tests

devinwang · Dec 16, 2015 · 490ba42 · 490ba42
1 parent ca37f96
commit 490ba42
Showing 1 changed file with 27 additions and 10 deletions.
diff --git a/tests/keras/test_models.py b/tests/keras/test_models.py
@@ -12,24 +12,29 @@
 from keras.utils.test_utils import get_test_data
 
 import os
-from keras.utils.layer_utils import model_summary
+
 
 input_dim = 32
 nb_hidden = 16
 nb_class = 4
 batch_size = 32
 nb_epoch = 1
 
-train_samples = 2000
-test_samples = 500
 
-(X_train, y_train), (X_test, y_test) = get_test_data(nb_train=train_samples,
-                                                     nb_test=test_samples,
-                                                     input_shape=(input_dim,),
-                                                     classification=True,
-                                                     nb_class=4)
-y_test = np_utils.to_categorical(y_test)
-y_train = np_utils.to_categorical(y_train)
+def _get_test_data():
+    np.random.seed(1234)
+
+    train_samples = 2000
+    test_samples = 500
+
+    (X_train, y_train), (X_test, y_test) = get_test_data(nb_train=train_samples,
+                                                         nb_test=test_samples,
+                                                         input_shape=(input_dim,),
+                                                         classification=True,
+                                                         nb_class=4)
+    y_test = np_utils.to_categorical(y_test)
+    y_train = np_utils.to_categorical(y_train)
+    return (X_train, y_train), (X_test, y_test)
 
 
 ####################
@@ -38,6 +43,8 @@
 
 
 def test_sequential():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
+
     model = Sequential()
     model.add(Dense(nb_hidden, input_shape=(input_dim,)))
     model.add(Activation('relu'))
@@ -87,6 +94,7 @@ def test_sequential():
 
 
 def test_merge_sum():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
     left = Sequential()
     left.add(Dense(nb_hidden, input_shape=(input_dim,)))
     left.add(Activation('relu'))
@@ -140,6 +148,8 @@ def test_merge_sum():
 @pytest.mark.skipif(K._BACKEND == 'tensorflow',
                     reason='currently not working with TensorFlow')
 def test_merge_dot():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
+
     left = Sequential()
     left.add(Dense(input_dim=input_dim, output_dim=nb_hidden))
     left.add(Activation('relu'))
@@ -172,6 +182,8 @@ def test_merge_dot():
 
 
 def test_merge_concat():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
+
     left = Sequential()
     left.add(Dense(nb_hidden, input_shape=(input_dim,)))
     left.add(Activation('relu'))
@@ -226,6 +238,7 @@ def test_merge_concat():
 
 
 def test_merge_recursivity():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
     left = Sequential()
     left.add(Dense(nb_hidden, input_shape=(input_dim,)))
     left.add(Activation('relu'))
@@ -274,6 +287,7 @@ def test_merge_recursivity():
 
 
 def test_merge_overlap():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
     left = Sequential()
     left.add(Dense(nb_hidden, input_shape=(input_dim,)))
     left.add(Activation('relu'))
@@ -310,6 +324,7 @@ def test_merge_overlap():
 
 
 def test_lambda():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
     def func(X):
         s = X[0]
         for i in range(1, len(X)):
@@ -395,6 +410,7 @@ def test_sequential_count_params():
 
 
 def test_siamese_1():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
     left = Sequential()
     left.add(Dense(nb_hidden, input_shape=(input_dim,)))
     left.add(Activation('relu'))
@@ -449,6 +465,7 @@ def test_siamese_1():
 
 
 def test_siamese_2():
+    (X_train, y_train), (X_test, y_test) = _get_test_data()
     left = Sequential()
     left.add(Dense(nb_hidden, input_shape=(input_dim,)))
     left.add(Activation('relu'))