diff options
Diffstat (limited to 'tensorflow/core/graph/mkl_layout_pass_test.cc')
| -rw-r--r-- | tensorflow/core/graph/mkl_layout_pass_test.cc | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/tensorflow/core/graph/mkl_layout_pass_test.cc b/tensorflow/core/graph/mkl_layout_pass_test.cc index fc474c0dc8..b8f5492f7c 100644 --- a/tensorflow/core/graph/mkl_layout_pass_test.cc +++ b/tensorflow/core/graph/mkl_layout_pass_test.cc @@ -3015,12 +3015,8 @@ TEST_F(MklLayoutPassTest, LRN_Negative2) { "node { name: 'E' op: 'Zeta' attr { key: 'T' value { type: DT_FLOAT } }" " input: ['A', 'D'] }"); EXPECT_EQ(DoMklLayoutOptimizationPass(), - "A(Input);B(Input);C(Input);D(_MklLRNGrad);DMT/_0(Const);" - "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Zeta)|" - "A->D;A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;" - "A:control->DMT/_2:control;A:control->DMT/_3:control;" - "A:control->DMT/_4:control;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;" - "DMT/_1->D:7;DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6"); + "A(Input);B(Input);C(Input);D(LRNGrad);" + "E(Zeta)|A->D;A->E;B->D:1;C->D:2;D->E:1"); } /* Test LRN->LRNGrad negative case, where single LRN feeds @@ -3058,15 +3054,11 @@ TEST_F(MklLayoutPassTest, LRN_Negative3) { " input: ['E', 'F'] }"); EXPECT_EQ(DoMklLayoutOptimizationPass(), "A(Input);B(_MklLRN);C(Input);D(Input);DMT/_0(Const);DMT/_1(Const);" - "DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);DMT/_5(Const);" - "DMT/_6(Const);E(_MklLRNGrad);F(_MklLRNGrad);G(Zeta)|A->B;" - "A:control->DMT/_0:control;B->E:2;" - "B->F:1;B:1->E:3;B:2->E:6;B:2->F:5;B:3->E:7;C->E;C->F;" - "C:control->DMT/_1:control;C:control->DMT/_2:control;" - "C:control->DMT/_3:control;C:control->DMT/_4:control;" - "C:control->DMT/_5:control;C:control->DMT/_6:control;" - "D->E:1;D->F:2;DMT/_0->B:1;DMT/_1->E:4;DMT/_2->E:5;DMT/_3->F:3;" - "DMT/_4->F:7;DMT/_5->F:4;DMT/_6->F:6;E->G;F->G:1"); + "DMT/_2(Const);E(_MklLRNGrad);F(LRNGrad);G(Zeta)|A->B;" + "A:control->DMT/_0:control;B->E:2;B->F:1;B:1->E:3;B:2->E:6;" + "B:3->E:7;C->E;C->F;C:control->DMT/_1:control;" + "C:control->DMT/_2:control;D->E:1;D->F:2;DMT/_0->B:1;" + "DMT/_1->E:4;DMT/_2->E:5;E->G;F->G:1"); } /* Test MaxPool->MaxPoolGrad replacement by workspace+rewrite nodes. */ @@ -3137,12 +3129,8 @@ TEST_F(MklLayoutPassTest, NodeWorkspace_MaxPool_Negative2) { "node { name: 'E' op: 'Zeta' attr { key: 'T' value { type: DT_FLOAT } }" " input: ['A', 'D'] }"); EXPECT_EQ(DoMklLayoutOptimizationPass(), - "A(Input);B(Input);C(Input);D(_MklMaxPoolGrad);DMT/_0(Const);" - "DMT/_1(Const);DMT/_2(Const);DMT/_3(Const);DMT/_4(Const);E(Zeta)|" - "A->D;A->E;A:control->DMT/_0:control;A:control->DMT/_1:control;" - "A:control->DMT/_2:control;A:control->DMT/_3:control;" - "A:control->DMT/_4:control;B->D:1;C->D:2;D->E:1;DMT/_0->D:3;" - "DMT/_1->D:7;DMT/_2->D:4;DMT/_3->D:5;DMT/_4->D:6"); + "A(Input);B(Input);C(Input);D(MaxPoolGrad);" + "E(Zeta)|A->D;A->E;B->D:1;C->D:2;D->E:1"); } // Test MaxPool handling for batch-wise pooling (NCHW) |