From de536c37ecd9cb735d45262cc6fc24a4b2626ad1 Mon Sep 17 00:00:00 2001
From: Chi Zeng <4221553+chihuahua@users.noreply.github.com>
Date: Sun, 22 Apr 2018 21:08:43 -0700
Subject: [PATCH] Use tf.clip_by_value again in PR curves demo

Previously, #1132 had circumvented the use of `tf.clip_by_value` within the PR curves demo because it was buggy.

However, that behavior seems to have been fixed.
---
 tensorboard/plugins/pr_curve/pr_curve_demo.py | 36 +++++--------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/tensorboard/plugins/pr_curve/pr_curve_demo.py b/tensorboard/plugins/pr_curve/pr_curve_demo.py
index 7c29caa3d0..7f8a8dc8fa 100644
--- a/tensorboard/plugins/pr_curve/pr_curve_demo.py
+++ b/tensorboard/plugins/pr_curve/pr_curve_demo.py
@@ -70,51 +70,33 @@ def start_runs(
   # Sample the distribution to generate colors. Lets generate different numbers
   # of each color. The first dimension is the count of examples.
 
-  def clip(value, minValue, maxValue):
-    """Clips an op to the range [minValue, maxValue].
-
-    For now, we intentionally avoid using tf.clip_by_value because it
-    apparently exhibits slightly different behavior based on system
-    characteristics. See tensorflow/tensorflow#18527. Tests rely on this demo,
-    so behavior must be consistent.
-
-    Args:
-      value: The value to clip.
-      minValue: The min value to clip by.
-      maxValue: The max value to clip by.
-
-    Returns:
-      A TensorFlow op that outputs the clipped value.
-    """
-    return tf.maximum(minValue, tf.minimum(maxValue, value))
-
   # Generate reds.
   number_of_reds = 100
-  true_reds = clip(
+  true_reds = tf.clip_by_value(
       tf.concat([
-          255. - tf.abs(channel_distribution.sample([number_of_reds, 1])),
+          255 - tf.abs(channel_distribution.sample([number_of_reds, 1])),
           tf.abs(channel_distribution.sample([number_of_reds, 2]))
       ], axis=1),
-      0., 255.)
+      0, 255)
 
   # Generate greens.
   number_of_greens = 200
-  true_greens = clip(
+  true_greens = tf.clip_by_value(
       tf.concat([
           tf.abs(channel_distribution.sample([number_of_greens, 1])),
-          255. - tf.abs(channel_distribution.sample([number_of_greens, 1])),
+          255 - tf.abs(channel_distribution.sample([number_of_greens, 1])),
           tf.abs(channel_distribution.sample([number_of_greens, 1]))
       ], axis=1),
-      0., 255.)
+      0, 255)
 
   # Generate blues.
   number_of_blues = 150
-  true_blues = clip(
+  true_blues = tf.clip_by_value(
       tf.concat([
           tf.abs(channel_distribution.sample([number_of_blues, 2])),
-          255. - tf.abs(channel_distribution.sample([number_of_blues, 1]))
+          255 - tf.abs(channel_distribution.sample([number_of_blues, 1]))
       ], axis=1),
-      0., 255.)
+      0, 255)
 
   # Assign each color a vector of 3 booleans based on its true label.
   labels = tf.concat([