Temporarily disabling Conv2D fusions in grappler (#442)

* Temorarily commented out Conv2D fusion * Commented out Conv2D fusion tests.
tensorflow · Nov 20, 2018 · 81b2969 · 81b2969
1 parent f827bad
commit 81b2969
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/tensorflow/core/grappler/optimizers/remapper.cc b/tensorflow/core/grappler/optimizers/remapper.cc
@@ -676,7 +676,7 @@ Status Remapper::Optimize(Cluster* /*cluster*/, const GrapplerItem& item,
   for (const NodeDef& node : topo_sorted_item.graph.node()) {
     // Check if node was invalidated by one of the previous remaps.
     if (invalidated_nodes.count(&node) > 0) continue;
-
+#ifndef INTEL_MKL
     // Remap Conv2D+BiasAdd into the _FusedConv2D.
     if (FindConv2DWithBias(ctx, &node, &conv2d_with_bias)) {
       AddFusedConv2DNode(conv2d_with_bias, optimized_graph, &invalidated_nodes);
@@ -712,7 +712,7 @@ Status Remapper::Optimize(Cluster* /*cluster*/, const GrapplerItem& item,
                          &invalidated_nodes);
       continue;
     }
-
+#endif // INTEL_MKL
     // Infer properties lazily in case they are not needed.
     if (!ctx.inferred_graph_properties && IsFusedBatchNormCandidate(node)) {
       TF_RETURN_IF_ERROR(ctx.graph_properties.InferStatically(false));

diff --git a/tensorflow/core/grappler/optimizers/remapper_test.cc b/tensorflow/core/grappler/optimizers/remapper_test.cc
@@ -101,6 +101,7 @@ TEST_F(RemapperTest, FusedBatchNormNCHW) {
   }
 }
 
+#ifndef INTEL_MKL
 TEST_F(RemapperTest, FuseConv2DWithBias) {
   if (!EigenSupportsContractionOutputKernel()) return;
 
@@ -456,6 +457,7 @@ TEST_F(RemapperTest, FuseConv2DWithSqueezeAndBias) {
   EXPECT_EQ(1, tensors.size());
   test::ExpectTensorNear<float>(tensors_expected[0], tensors[0], 1e-6);
 }
+#endif // INTEL_MKL
 
 }  // namespace grappler
 }  // namespace tensorflow