diff options
| author |  Vijay Vasudevan <vrv@google.com> | 2016-01-27 13:54:08 -0800 |
|---|---|---|
| committer | Vijay Vasudevan <vrv@google.com> | 2016-01-27 14:01:22 -0800 |
| commit | c3c27f275f94af6e32ecaff66a6bf439abdaff5b (patch) | |
| tree | 528d0353eee14787aeefc52918afb9b32dd7bfbd /tensorflow/core/kernels/summary_image_op_test.cc | |
| parent | 0cee1d3dac5961a08594c3734eea14fc490f3250 (diff) | |
TensorFlow: ASSERT_OK and EXPECT_OK are also defined in other projects
that are built with TensorFlow (protobuf), so prefix our macros with
TF_ to make them project specific.
Change: 113197186
Diffstat (limited to 'tensorflow/core/kernels/summary_image_op_test.cc')
| -rw-r--r-- | tensorflow/core/kernels/summary_image_op_test.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tensorflow/core/kernels/summary_image_op_test.cc b/tensorflow/core/kernels/summary_image_op_test.cc index 013e4df174..78eecec1e6 100644 --- a/tensorflow/core/kernels/summary_image_op_test.cc +++ b/tensorflow/core/kernels/summary_image_op_test.cc @@ -51,12 +51,12 @@ class SummaryImageOpTest : public OpsTestBase { protected: void MakeOp(int max_images) { RequireDefaultOps(); - ASSERT_OK(NodeDefBuilder("myop", "ImageSummary") - .Input(FakeInput()) - .Input(FakeInput()) - .Attr("max_images", max_images) - .Finalize(node_def())); - ASSERT_OK(InitOp()); + TF_ASSERT_OK(NodeDefBuilder("myop", "ImageSummary") + .Input(FakeInput()) + .Input(FakeInput()) + .Attr("max_images", max_images) + .Finalize(node_def())); + TF_ASSERT_OK(InitOp()); } void CheckAndRemoveEncodedImages(Summary* summary) { @@ -83,7 +83,7 @@ TEST_F(SummaryImageOpTest, ThreeGrayImagesOutOfFive4dInput) { AddInputFromArray<string>(TensorShape({}), {"tag"}); AddInputFromArray<float>(TensorShape({5, 2, 1, 1}), {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}); - ASSERT_OK(RunOpKernel()); + TF_ASSERT_OK(RunOpKernel()); // Check the output size. Tensor* out_tensor = GetOutput(0); @@ -106,7 +106,7 @@ TEST_F(SummaryImageOpTest, OneGrayImage4dInput) { AddInputFromArray<string>(TensorShape({}), {"tag"}); AddInputFromArray<float>(TensorShape({5 /*batch*/, 2, 1, 1 /*depth*/}), {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}); - ASSERT_OK(RunOpKernel()); + TF_ASSERT_OK(RunOpKernel()); // Check the output size. Tensor* out_tensor = GetOutput(0); @@ -138,7 +138,7 @@ TEST_F(SummaryImageOpTest, OneColorImage4dInput) { /* r4, c0, RGB */ 1.0, 1.0, 0.0, /* r4, c1, RGB */ 1.0, 0.0, 1.0, }); - ASSERT_OK(RunOpKernel()); + TF_ASSERT_OK(RunOpKernel()); // Check the output size. Tensor* out_tensor = GetOutput(0); |