From 7e2b602dd7b29ede8e69a78b7efb2cfbe1a3880c Mon Sep 17 00:00:00 2001 From: "Li, Guizi" Date: Fri, 25 Oct 2019 09:57:28 +0800 Subject: [PATCH] code cleanup --- tensorflow/core/grappler/optimizers/remapper.cc | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tensorflow/core/grappler/optimizers/remapper.cc b/tensorflow/core/grappler/optimizers/remapper.cc index 2796366c08223e..3f55c3da5a2838 100644 --- a/tensorflow/core/grappler/optimizers/remapper.cc +++ b/tensorflow/core/grappler/optimizers/remapper.cc @@ -573,6 +573,7 @@ bool FindContractionWithBiasInPort(const RemapperContext& ctx, if (add_node_view.NumRegularFanins() < port_id + 1) return false; const auto& bias_add_node_view = add_node_view.GetRegularFanin(port_id).node_view(); + if (bias_add_node_view == nullptr) return false; const auto* bias_add_node_def = bias_add_node_view->node(); if (!FindContractionWithBias(ctx, bias_add_node_view->node_index(), base, @@ -637,6 +638,7 @@ bool FindContractionWithBiasAndAddActivation( // Root of the pattern must be an activation node. const auto* node_def = node_view->node(); + if (node_def == nullptr) return false; if (!IsSupportedActivation(*node_def)) return false; // MKL activation op only supports float data type. @@ -1208,14 +1210,13 @@ Status AddFusedBatchNormExNode(RemapperContext* ctx, const NodeDef& activation = graph->node(matched.activation); VLOG(2) << "Fuse " << activation.op() << " with FusedBatchNorm:" - << " activation=" << activation.name() << " side_input=" - << (matched.side_input != kMissingIndex - ? graph->node(matched.side_input).name() - : "") - << " invalidated=" - << (matched.invalidated != kMissingIndex - ? graph->node(matched.invalidated).name() - : "") + << " activation=" << activation.name() + << " side_input=" << (matched.side_input != kMissingIndex + ? graph->node(matched.side_input).name() + : "") + << " invalidated=" << (matched.invalidated != kMissingIndex + ? graph->node(matched.invalidated).name() + : "") << " fused_batch_norm=" << fused_batch_norm.name(); // Replace FusedBatchNorm with _FusedBatchNormEx + + .