From 5481cbf0629e9b8a2d5ebeb36f2332ca97690e8e Mon Sep 17 00:00:00 2001 From: "Xiaoming (Jason) Cui" Date: Fri, 28 Jun 2019 18:21:34 -0700 Subject: [PATCH] [INTEL_MKL] Changed 4 unit tests because of the node label changes recently introduced by graph rewrite changes --- tensorflow/core/kernels/mkl_fused_ops_test.cc | 10 +++++----- .../kernels/mkl_quantized_conv_ops_perchannel_test.cc | 2 +- tensorflow/core/kernels/mkl_quantized_conv_ops_test.cc | 2 +- .../core/kernels/mkl_quantized_pooling_ops_test.cc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tensorflow/core/kernels/mkl_fused_ops_test.cc b/tensorflow/core/kernels/mkl_fused_ops_test.cc index 6bb5bac3cd3..30bc16931d7 100644 --- a/tensorflow/core/kernels/mkl_fused_ops_test.cc +++ b/tensorflow/core/kernels/mkl_fused_ops_test.cc @@ -57,7 +57,7 @@ class CommonTestUtilities : public OpsTestBase { .Input(FakeInput(dtype)) // Input .Input(FakeInput(DT_UINT8)) // Mkl second tensor .Attr("T", dtype) - .Attr("_kernel", "MklOp") + .Attr("_kernel", "MklLayoutDependentOp") .Finalize(node_def())); TF_EXPECT_OK(InitOp()); AddInputFromArray(tensor.shape(), tensor.flat()); @@ -232,7 +232,7 @@ class MklFusedConv2DOpTest : public OpsTestBase { .Attr("strides", {1, stride, stride, 1}) .Attr("padding", "SAME") .Attr("fused_ops", fused_ops) - .Attr("_kernel", "MklOp") + .Attr("_kernel", "MklLayoutDependentOp") .Finalize(node_def())); TF_EXPECT_OK(InitOp()); @@ -432,7 +432,7 @@ class FusedPadConvOpTest : public OpsTestBase { .Attr("data_format", data_format) .Attr("T", dtype) .Attr("strides", {1, stride, stride, 1}) - .Attr("_kernel", "MklOp") + .Attr("_kernel", "MklLayoutDependentOp") .Finalize(node_def())); TF_EXPECT_OK(InitOp()); @@ -526,7 +526,7 @@ class FilterCacheTest : public OpsTestBase { .Attr("is_filter_const", is_filter_const) .Attr("T", dtype) .Attr("strides", {1, stride, stride, 1}) - .Attr("_kernel", "MklOp") + .Attr("_kernel", "MklLayoutDependentOp") .Finalize(node_def())); TF_EXPECT_OK(InitOp()); @@ -724,7 +724,7 @@ class MklPadWithFusedConv2DOpTest : public OpsTestBase { .Attr("strides", {1, stride, stride, 1}) .Attr("padding", "VALID") .Attr("fused_ops", fused_ops) - .Attr("_kernel", "MklOp") + .Attr("_kernel", "MklLayoutDependentOp") .Finalize(node_def())); TF_EXPECT_OK(InitOp()); diff --git a/tensorflow/core/kernels/mkl_quantized_conv_ops_perchannel_test.cc b/tensorflow/core/kernels/mkl_quantized_conv_ops_perchannel_test.cc index dcef8360f04..b34fcca3813 100644 --- a/tensorflow/core/kernels/mkl_quantized_conv_ops_perchannel_test.cc +++ b/tensorflow/core/kernels/mkl_quantized_conv_ops_perchannel_test.cc @@ -53,7 +53,7 @@ class ConvMklToTF : public OpsTestBase { .Input(FakeInput(dtype)) // Input .Input(FakeInput(DT_UINT8)) // MKL second tensor .Attr("T", dtype) - .Attr("_kernel", "MklOp") + .Attr("_kernel", "MklLayoutDependentOp") .Finalize(node_def())); TF_EXPECT_OK(InitOp()); AddInputFromArray(first.shape(), first.flat()); diff --git a/tensorflow/core/kernels/mkl_quantized_conv_ops_test.cc b/tensorflow/core/kernels/mkl_quantized_conv_ops_test.cc index 91eb260889d..d9a521cef94 100644 --- a/tensorflow/core/kernels/mkl_quantized_conv_ops_test.cc +++ b/tensorflow/core/kernels/mkl_quantized_conv_ops_test.cc @@ -55,7 +55,7 @@ class ConvMklToTF : public OpsTestBase { .Input(FakeInput(dtype)) // Input .Input(FakeInput(DT_UINT8)) // MKL metadata tensor .Attr("T", dtype) - .Attr("_kernel", "MklOp") + .Attr("_kernel", "MklLayoutDependentOp") .Finalize(node_def())); TF_EXPECT_OK(InitOp()); AddInputFromArray(input.shape(), input.flat()); diff --git a/tensorflow/core/kernels/mkl_quantized_pooling_ops_test.cc b/tensorflow/core/kernels/mkl_quantized_pooling_ops_test.cc index 7c1e32d6e35..ba771a5422d 100644 --- a/tensorflow/core/kernels/mkl_quantized_pooling_ops_test.cc +++ b/tensorflow/core/kernels/mkl_quantized_pooling_ops_test.cc @@ -47,7 +47,7 @@ class ConvMklToTF : public OpsTestBase { .Input(FakeInput(dtype)) // Input .Input(FakeInput(DT_UINT8)) // Mkl second tensor .Attr("T", dtype) - .Attr("_kernel", "MklOp") + .Attr("_kernel", "MklLayoutDependentOp") .Finalize(node_def())); TF_EXPECT_OK(InitOp()); AddInputFromArray(first.shape(), first.flat());