message: rebasing with master and removing the conflict
diff: @@ -101,6 +101,7 @@ TEST(DirectSessionWithTrackingAllocTest, CostModelTest) {
  EXPECT_EQ(2, shape.dim_size());
  EXPECT_EQ(2, shape.dim(0).size());
  EXPECT_EQ(1, shape.dim(1).size());
  + if (node->name() == y->name()) {
  #ifdef INTEL_MKL
  // if MKL is used, it goes through various additional
  // graph rewrite pass. In TF, everytime a graph pass
  @@ -110,19 +111,18 @@ TEST(DirectSessionWithTrackingAllocTest, CostModelTest) {
  // which increments the value of AllocationId.
  // Thus AllocationId becomes more than 3 and 4 if
  // MKL is used. Now they are 9 and 10 for MKL.
  - if (node->name() == y->name()) {
  - EXPECT_EQ(9, cm->AllocationId(node, 0));
  - } else {
  - EXPECT_EQ(10, cm->AllocationId(node, 0));
  - }
  + EXPECT_EQ(15, cm->AllocationId(node, 0));
  #else
  - if (node->name() == y->name()) {
  EXPECT_EQ(9, cm->AllocationId(node, 0));
  +#endif
  } else {
  +#ifdef INTEL_MKL
  + EXPECT_EQ(16, cm->AllocationId(node, 0));
  +#else
  EXPECT_EQ(10, cm->AllocationId(node, 0));
  - }
  #endif
  }
  + }
  EXPECT_LE(0, cm->MaxExecutionTime(node));
  EXPECT_GE(run_duration_micros, cm->MaxExecutionTime(node));
  }
  