diff options
author | Andrew Harp <andrewharp@google.com> | 2016-12-08 20:05:49 -0800 |
---|---|---|
committer | TensorFlower Gardener <gardener@tensorflow.org> | 2016-12-08 20:21:45 -0800 |
commit | 1cb96893a64f59b7265f9def9968f7bed1e57662 (patch) | |
tree | 0e6d595a0806028f5f92e64c84342ae9659ca108 /tensorflow/core/kernels/fused_batch_norm_op_test.cc | |
parent | 90b72f4b2f07a0126efb110d8d4cc96386fcc968 (diff) |
Merge changes from github.
Additionally:
- change single quotes to double quotes to make path rewriting easier
- guard windows lib reference with PLATFORM_WINDOWS
- fixed failing kmeans test
Change: 141515942
Diffstat (limited to 'tensorflow/core/kernels/fused_batch_norm_op_test.cc')
-rw-r--r-- | tensorflow/core/kernels/fused_batch_norm_op_test.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tensorflow/core/kernels/fused_batch_norm_op_test.cc b/tensorflow/core/kernels/fused_batch_norm_op_test.cc index c4b942c56f..a3f760b746 100644 --- a/tensorflow/core/kernels/fused_batch_norm_op_test.cc +++ b/tensorflow/core/kernels/fused_batch_norm_op_test.cc @@ -79,7 +79,7 @@ TEST_F(FusedBatchNormOpTest, Inference) { AddInputFromArray<float>(TensorShape({2}), {4.0, 4.0}); AddInputFromArray<float>(TensorShape({2}), {2.0, 2.0}); AddInputFromArray<float>(TensorShape({2}), {10, 10}); - AddInputFromArray<float>(TensorShape({2}), {11.67, 11.67}); + AddInputFromArray<float>(TensorShape({2}), {11.67f, 11.67f}); TF_ASSERT_OK(RunOpKernel()); @@ -106,8 +106,8 @@ TEST_F(FusedBatchNormGradOpTest, Simple) { AddInputFromArray<float>(TensorShape({1, 1, 6, 2}), {1, 1, 7, 7, 4, 4, -3, -3, -11, -11, 13, 13}); AddInputFromArray<float>(TensorShape({2}), {4, 4}); - AddInputFromArray<float>(TensorShape({2}), {1.833, 1.833}); - AddInputFromArray<float>(TensorShape({2}), {57.472, 57.472}); + AddInputFromArray<float>(TensorShape({2}), {1.833f, 1.833f}); + AddInputFromArray<float>(TensorShape({2}), {57.472f, 57.472f}); TF_ASSERT_OK(RunOpKernel()); |