fixes problems with new keras and tf version

Author: Jan Ludwiczak

requirements.txt

@@ -3,13 +3,14 @@ bleach==1.5.0
 enum34==1.1.6
 h5py==2.7.1
 html5lib==0.9999999
-Keras==2.1.5
+Keras==2.2.0
 Markdown==2.6.11
 numpy==1.14.3
-protobuf==3.5.2.post1
+protobuf==3.6.0
 PyYAML==3.12
 scipy==1.1.0
 six==1.11.0
-tensorflow==1.4.0
+setuptools==39.1.0
+tensorflow==1.10.0
 tensorflow-tensorboard==0.4.0
 Werkzeug==0.14.1

utils.py

@@ -5,7 +5,7 @@
 
 stderr = sys.stderr
 sys.stderr = open(os.devnull, 'w')
-from keras.layers import LSTM, Convolution1D, Dropout, BatchNormalization, TimeDistributed, Bidirectional, Input, merge, \
+from keras.layers import LSTM, Concatenate, Convolution1D, Dropout, BatchNormalization, TimeDistributed, Bidirectional, Input, \
     Dense
 from keras.regularizers import l2
 from keras.models import Model
@@ -83,7 +83,7 @@ def PiPred_Model():
     b_b = BatchNormalization()(b)
     e = Convolution1D(64, 7, activation='tanh', padding='same', kernel_regularizer=l2(0.0001))(inp1)
     e_b = BatchNormalization()(e)
-    x = merge([a_b, b_b, e_b], mode='concat', concat_axis=-1)
+    x = Concatenate()([a_b, b_b, e_b])
     t = TimeDistributed(Dense(200, activation='relu', kernel_regularizer=l2(0.0001)))(x)
     k = Bidirectional(LSTM(200, return_sequences=True, activation='tanh', recurrent_activation='sigmoid', dropout=0.5,
                            recurrent_dropout=0.5))(t)