tfdbg: Fix a bug in DebugNumericSummaryOp's min / max calculation algorithm

caisq · tensorflower-gardener · commit fa19f2f86d2b · 2017-02-21T20:32:25.000-08:00
Change: 148178117
diff --git a/tensorflow/core/kernels/debug_ops.h b/tensorflow/core/kernels/debug_ops.h
@@ -211,7 +211,8 @@ class DebugNumericSummaryOp : public OpKernel {
 
           if (x < min) {
             min = x;
-          } else if (x > max) {
+          }
+          if (x > max) {
             max = x;
           }
 
diff --git a/tensorflow/python/debug/lib/debug_data.py b/tensorflow/python/debug/lib/debug_data.py
@@ -57,17 +57,33 @@ def load_tensor_from_event_file(event_file_path):
   event = event_pb2.Event()
   with gfile.Open(event_file_path, "rb") as f:
     event.ParseFromString(f.read())
+    return load_tensor_from_event(event)
 
-    if (event.summary.value[0].tensor.tensor_content or
-        event.summary.value[0].tensor.string_val):
-      # Initialized tensor.
-      try:
-        tensor_value = tensor_util.MakeNdarray(event.summary.value[0].tensor)
-      except KeyError:
-        tensor_value = None
-    else:
-      # Uninitialized tensor or tensor of unconvertible data type.
+
+def load_tensor_from_event(event):
+  """Load a tensor from an Event proto.
+
+  Args:
+    event: The Event proto, assumed to hold a tensor value in its
+        summary.value[0] field.
+
+  Returns:
+    The tensor value loaded from the event file, as a `numpy.ndarray`. For
+    uninitialized Tensors, returns `None`. For Tensors of data types that
+    cannot be converted to `numpy.ndarray` (e.g., `tf.resource`), return
+    `None`.
+  """
+
+  if (event.summary.value[0].tensor.tensor_content or
+      event.summary.value[0].tensor.string_val):
+    # Initialized tensor.
+    try:
+      tensor_value = tensor_util.MakeNdarray(event.summary.value[0].tensor)
+    except KeyError:
       tensor_value = None
+  else:
+    # Uninitialized tensor or tensor of unconvertible data type.
+    tensor_value = None
 
   return tensor_value
 

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,8 @@ class DebugNumericSummaryOp : public OpKernel {`
`211`	`211`
`212`	`212`	`if (x < min) {`
`213`	`213`	`min = x;`
`214`		`- } else if (x > max) {`
	`214`	`+ }`
	`215`	`+ if (x > max) {`
`215`	`216`	`max = x;`
`216`	`217`	`}`
`217`	`218`