experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to avoid useless node in the graph based on review

Browse Source 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
This commit is contained in:
Yong Tang 2018-10-10 14:24:13 +00:00
parent 7efb78e55c
commit 1994b259d9
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tensorflow/python/keras/integration_test.py
View File

@ -318,7 +318,7 @@ class KerasIntegrationTest(test.TestCase):
with self.cached_session():
v = variable_scope.get_variable(
"v",
shape = [4, 4],
shape=[4, 4],
initializer=keras.initializers.glorot_uniform(),
regularizer=keras.regularizers.l2(0.))

14
tensorflow/python/keras/regularizers.py
View File

@ -55,12 +55,14 @@ class L1L2(Regularizer):
self.l2 = K.cast_to_floatx(l2)
def __call__(self, x):
regularization = ops.convert_to_tensor(0., dtype=K.floatx())
if self.l1:
regularization += math_ops.reduce_sum(self.l1 * math_ops.abs(x))
if self.l2:
regularization += math_ops.reduce_sum(self.l2 * math_ops.square(x))
return regularization
if self.l1 or self.l2:
regularization = ops.convert_to_tensor(0., dtype=K.floatx())
if self.l1:
regularization += math_ops.reduce_sum(self.l1 * math_ops.abs(x))
if self.l2:
regularization += math_ops.reduce_sum(self.l2 * math_ops.square(x))
return regularization
return None
def get_config(self):
return {'l1': float(self.l1), 'l2': float(self.l2)}