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

Swap NaN count from index 7 to 2 within DebugNumericSummary ops.

Browse Source 
Change: 147888410
This commit is contained in:
A. Unique TensorFlower 2017-02-17 15:38:08 -08:00 committed by TensorFlower Gardener
parent ef1f50399d
commit a6421c4dda
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tensorflow/core/kernels/debug_ops.h
View File

@ -241,12 +241,12 @@ class DebugNumericSummaryOp : public OpKernel {
OP_REQUIRES_OK(context, context->allocate_output(0, shape, &output_tensor)); OP_REQUIRES_OK(context, context->allocate_output(0, shape, &output_tensor));
output_tensor->vec<double>()(0) = static_cast<double>(is_initialized); output_tensor->vec<double>()(0) = static_cast<double>(is_initialized);
output_tensor->vec<double>()(1) = static_cast<double>(element_count); output_tensor->vec<double>()(1) = static_cast<double>(element_count);
output_tensor->vec<double>()(2) = static_cast<double>(negative_inf_count); output_tensor->vec<double>()(2) = static_cast<double>(nan_count);
output_tensor->vec<double>()(3) = static_cast<double>(negative_count); output_tensor->vec<double>()(3) = static_cast<double>(negative_inf_count);
output_tensor->vec<double>()(4) = static_cast<double>(zero_count); output_tensor->vec<double>()(4) = static_cast<double>(negative_count);
output_tensor->vec<double>()(5) = static_cast<double>(positive_count); output_tensor->vec<double>()(5) = static_cast<double>(zero_count);
output_tensor->vec<double>()(6) = static_cast<double>(positive_inf_count); output_tensor->vec<double>()(6) = static_cast<double>(positive_count);
output_tensor->vec<double>()(7) = static_cast<double>(nan_count); output_tensor->vec<double>()(7) = static_cast<double>(positive_inf_count);
output_tensor->vec<double>()(8) = min; output_tensor->vec<double>()(8) = min;
output_tensor->vec<double>()(9) = max; output_tensor->vec<double>()(9) = max;
output_tensor->vec<double>()(10) = mean; output_tensor->vec<double>()(10) = mean;

18
tensorflow/core/kernels/debug_ops_test.cc
View File

@ -254,12 +254,12 @@ TEST_F(DebugNumericSummaryOpTest, Float_full_house) {
&expected, &expected,
{1.0, // Is initialized. {1.0, // Is initialized.
18.0, // Total element count. 18.0, // Total element count.
4.0, // nan count.
2.0, // -inf count. 2.0, // -inf count.
2.0, // negative number count (excluding -inf). 2.0, // negative number count (excluding -inf).
3.0, // zero count. 3.0, // zero count.
2.0, // positive number count (excluding +inf). 2.0, // positive number count (excluding +inf).
5.0, // +inf count. 5.0, // +inf count.
4.0, // nan count.
-3.0, // minimum of non-inf and non-nan elements. -3.0, // minimum of non-inf and non-nan elements.
7.0, // maximum of non-inf and non-nan elements. 7.0, // maximum of non-inf and non-nan elements.
0.85714285714, // mean of non-inf and non-nan elements. 0.85714285714, // mean of non-inf and non-nan elements.
@ -290,12 +290,12 @@ TEST_F(DebugNumericSummaryOpTest, Double_full_house) {
&expected, &expected,
{1.0, // Is initialized. {1.0, // Is initialized.
18.0, // Total element count. 18.0, // Total element count.
4.0, // nan count.
2.0, // -inf count. 2.0, // -inf count.
2.0, // negative count (excluding -inf). 2.0, // negative count (excluding -inf).
3.0, // zero count. 3.0, // zero count.
2.0, // positive count (excluding +inf). 2.0, // positive count (excluding +inf).
5.0, // +inf count. 5.0, // +inf count.
4.0, // nan count.
-3.0, // minimum of non-inf and non-nan elements. -3.0, // minimum of non-inf and non-nan elements.
7.0, // maximum of non-inf and non-nan elements. 7.0, // maximum of non-inf and non-nan elements.
0.85714285714, // mean of non-inf and non-nan elements. 0.85714285714, // mean of non-inf and non-nan elements.
@ -315,12 +315,12 @@ TEST_F(DebugNumericSummaryOpTest, Float_only_valid_values) {
&expected, &expected,
{1.0, // Is initialized. {1.0, // Is initialized.
6.0, // Total element count. 6.0, // Total element count.
0.0, // nan count.
0.0, // -inf count. 0.0, // -inf count.
1.0, // negative count (excluding -inf). 1.0, // negative count (excluding -inf).
2.0, // zero count. 2.0, // zero count.
3.0, // positive count (excluding +inf). 3.0, // positive count (excluding +inf).
0.0, // +inf count. 0.0, // +inf count.
0.0, // nan count.
-1.0, // minimum of non-inf and non-nan elements. -1.0, // minimum of non-inf and non-nan elements.
7.0, // maximum of non-inf and non-nan elements. 7.0, // maximum of non-inf and non-nan elements.
2.0, // mean of non-inf and non-nan elements. 2.0, // mean of non-inf and non-nan elements.
@ -351,12 +351,12 @@ TEST_F(DebugNumericSummaryOpTest, Float_all_Inf_or_NaN) {
// NaNs. // NaNs.
ASSERT_NEAR(1.0, output[0], 1e-8); // Is initialized. ASSERT_NEAR(1.0, output[0], 1e-8); // Is initialized.
ASSERT_NEAR(9.0, output[1], 1e-8); // Total element count. ASSERT_NEAR(9.0, output[1], 1e-8); // Total element count.
ASSERT_NEAR(2.0, output[2], 1e-8); // -inf count. ASSERT_NEAR(4.0, output[2], 1e-8); // nan count.
ASSERT_NEAR(0.0, output[3], 1e-8); // negative count (excluding -inf). ASSERT_NEAR(2.0, output[3], 1e-8); // -inf count.
ASSERT_NEAR(0.0, output[4], 1e-8); // zero count. ASSERT_NEAR(0.0, output[4], 1e-8); // negative count (excluding -inf).
ASSERT_NEAR(0.0, output[5], 1e-8); // positive count (excluding +inf). ASSERT_NEAR(0.0, output[5], 1e-8); // zero count.
ASSERT_NEAR(3.0, output[6], 1e-8); // +inf count. ASSERT_NEAR(0.0, output[6], 1e-8); // positive count (excluding +inf).
ASSERT_NEAR(4.0, output[7], 1e-8); // nan count. ASSERT_NEAR(3.0, output[7], 1e-8); // +inf count.
// Due to the absence of any non-inf and non-nan values, the output of min, // Due to the absence of any non-inf and non-nan values, the output of min,
// max, mean and var are all degenerate. // max, mean and var are all degenerate.
ASSERT_EQ(std::numeric_limits<float>::infinity(), output[8]); ASSERT_EQ(std::numeric_limits<float>::infinity(), output[8]);

2
tensorflow/python/debug/lib/session_debug_testlib.py
View File

@ -1060,7 +1060,7 @@ class SessionDebugTestBase(test_util.TensorFlowTestCase):
self.assertTrue(dump.loaded_partition_graphs()) self.assertTrue(dump.loaded_partition_graphs())
self.assertAllClose([[ self.assertAllClose([[
1.0, 18.0, 2.0, 2.0, 3.0, 2.0, 5.0, 4.0, -3.0, 7.0, 0.85714286, 1.0, 18.0, 4.0, 2.0, 2.0, 3.0, 2.0, 5.0, -3.0, 7.0, 0.85714286,
8.97959184 8.97959184
]], dump.get_tensors("numeric_summary/a/read", 0, "DebugNumericSummary")) ]], dump.get_tensors("numeric_summary/a/read", 0, "DebugNumericSummary"))