Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix dtype for streaming confusion matrix #12714

Merged
merged 4 commits into from
Sep 7, 2017
Merged

Fix dtype for streaming confusion matrix #12714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b521d0
Fix dtype for streaming confusion matrix
taion Aug 30, 2017
7694c39
Invert branches
taion Sep 5, 2017
1b16f84
Set the correct weight for the test
taion Sep 5, 2017
e2a98fa
Always use float64 for streaming confusion matrix
taion Sep 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions tensorflow/python/kernel_tests/metrics_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3538,7 +3538,7 @@ def testMultipleUpdatesWithWeights(self):
weights_queue = data_flow_ops.FIFOQueue(
6, dtypes=dtypes_lib.float32, shapes=(1, 1))
_enqueue_vector(sess, weights_queue, [1.0])
_enqueue_vector(sess, weights_queue, [1.0])
_enqueue_vector(sess, weights_queue, [0.5])
_enqueue_vector(sess, weights_queue, [1.0])
_enqueue_vector(sess, weights_queue, [0.0])
_enqueue_vector(sess, weights_queue, [1.0])
Expand All @@ -3551,7 +3551,7 @@ def testMultipleUpdatesWithWeights(self):
variables.local_variables_initializer().run()
for _ in range(6):
sess.run(update_op)
desired_output = np.mean([2.0 / 2.0, 1.0 / 2.0])
desired_output = np.mean([2.0 / 2.0, 0.5 / 1.5])
self.assertAlmostEqual(desired_output, mean_accuracy.eval())

def testMultipleUpdatesWithMissingClass(self):
Expand Down
5 changes: 2 additions & 3 deletions tensorflow/python/ops/metrics_impl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,11 +259,10 @@ def _streaming_confusion_matrix(labels, predictions, num_classes, weights=None):
update_op: An operation that increments the confusion matrix.
"""
# Local variable to accumulate the predictions in the confusion matrix.
cm_dtype = dtypes.int64 if weights is not None else dtypes.float64
total_cm = _create_local(
'total_confusion_matrix',
shape=[num_classes, num_classes],
dtype=cm_dtype)
dtype=dtypes.float64)

# Cast the type to int64 required by confusion_matrix_ops.
predictions = math_ops.to_int64(predictions)
Expand All @@ -282,7 +281,7 @@ def _streaming_confusion_matrix(labels, predictions, num_classes, weights=None):

# Accumulate the prediction to current confusion matrix.
current_cm = confusion_matrix.confusion_matrix(
labels, predictions, num_classes, weights=weights, dtype=cm_dtype)
labels, predictions, num_classes, weights=weights, dtype=dtypes.float64)
update_op = state_ops.assign_add(total_cm, current_cm)
return total_cm, update_op

Expand Down