Merge branch 'master' of github.com:fchollet/keras

This commit is contained in:
Francois Chollet 2017-04-11 13:56:43 -07:00
commit 9eb7ecd3e5

@ -24,7 +24,7 @@ from keras import backend as K
def euclidean_distance(vects):
x, y = vects
return K.sqrt(K.sum(K.square(x - y), axis=1, keepdims=True))
return K.sqrt(K.maximum(K.sum(K.square(x - y), axis=1, keepdims=True), K.epsilon()))
def eucl_dist_output_shape(shapes):