diff options
| author |  Yan Facai (颜发才) <facai.yan@gmail.com> | 2018-09-11 21:35:22 +0800 |
|---|---|---|
| committer | Yan Facai (颜发才) <facai.yan@gmail.com> | 2018-09-12 14:25:26 +0800 |
| commit | 2dd5fb6cfb16ccc612b6e278d6282ef90581c0bb (patch) | |
| tree | fc370d5a5a0b43f3137b0a33a1c92dbb80753c1e /tensorflow/contrib/losses | |
| parent | b2896c3cc3a0656b838f58975338d7dd309e3e62 (diff) | |
CLN: fix merge error
Diffstat (limited to 'tensorflow/contrib/losses')
| -rw-r--r-- | tensorflow/contrib/losses/python/losses/loss_ops.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tensorflow/contrib/losses/python/losses/loss_ops.py b/tensorflow/contrib/losses/python/losses/loss_ops.py index 8a0932c376..66322140cb 100644 --- a/tensorflow/contrib/losses/python/losses/loss_ops.py +++ b/tensorflow/contrib/losses/python/losses/loss_ops.py @@ -585,9 +585,10 @@ def mean_pairwise_squared_error(predictions, math_ops.square(diffs), reduction_indices=reduction_indices) num_present_per_batch = _num_present(diffs, weights, per_batch=True) - term1 = 2.0 * math_ops.div_no_nan(sum_squares_diff_per_batch, - math_ops.maximum(num_present_per_batch), - name="value") + term1 = 2.0 * math_ops.div_no_nan( + sum_squares_diff_per_batch, + math_ops.maximum(num_present_per_batch, 0), + name="value") sum_diff = math_ops.reduce_sum(diffs, reduction_indices=reduction_indices) term2 = 2.0 * math_ops.div_no_nan(math_ops.square(sum_diff), |