From 25942a2c2b52eda3008da771833528409abbcd0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tar=C3=A9=20Gaskin?= Date: Wed, 29 Jul 2020 16:27:57 +0000 Subject: [PATCH] recommonded updates --- tensorflow/compiler/tf2xla/functionalize_cond.cc | 12 ++++++------ .../compiler/tf2xla/rearrange_function_argument.cc | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tensorflow/compiler/tf2xla/functionalize_cond.cc b/tensorflow/compiler/tf2xla/functionalize_cond.cc index 58bbb704329..8f6b4eff83b 100644 --- a/tensorflow/compiler/tf2xla/functionalize_cond.cc +++ b/tensorflow/compiler/tf2xla/functionalize_cond.cc @@ -236,16 +236,16 @@ StateMap::CondId StateMap::GetCondId(const StateMap::CondState& state) { } void StateMap::ResetCondId(const Node* node, StateMap::CondId id) { - const int64 node_to_condid_map_size = node_to_condid_map_.size(); - if (node->id() < node_to_condid_map_size) + const int64 node_to_map_size = node_to_condid_map_.size(); + if (node->id() < node_to_map_size) node_to_condid_map_[node->id()] = id; else added_node_condid_mapping_[node->id()] = id; } StateMap::AncestorId StateMap::LookupAncestorId(const Node* node) const { - const int64 node_to_ancestorid_map_size = node_to_ancestorid_map_.size(); - if (node->id() < node_to_ancestorid_map_size) + const int64 node_to_map_size = node_to_ancestorid_map_.size(); + if (node->id() < node_to_map_size) return node_to_ancestorid_map_[node->id()]; return added_node_ancestorid_mapping_.at(node->id()); } @@ -257,8 +257,8 @@ StateMap::AncestorId StateMap::GetAncestorId( } void StateMap::ResetAncestorId(const Node* node, StateMap::AncestorId id) { - const int64 node_to_ancestorid_map_size = node_to_ancestorid_map_.size(); - if (node->id() < node_to_ancestorid_map_size) + const int64 node_to_map_size = node_to_ancestorid_map_.size(); + if (node->id() < node_to_map_size) node_to_ancestorid_map_[node->id()] = id; else added_node_ancestorid_mapping_[node->id()] = id; diff --git a/tensorflow/compiler/tf2xla/rearrange_function_argument.cc b/tensorflow/compiler/tf2xla/rearrange_function_argument.cc index 635585639a8..ed7927a9999 100644 --- a/tensorflow/compiler/tf2xla/rearrange_function_argument.cc +++ b/tensorflow/compiler/tf2xla/rearrange_function_argument.cc @@ -146,7 +146,7 @@ Status ReorderOutputEdges(Graph* g, Node* n, int input_count, int dst_input = e->dst_input(); g->RemoveEdge(e); - if (new_src_output < static_cast(input_count - resource_input_count)) { + if (new_src_output < input_count - resource_input_count) { g->AddEdge(n, new_src_output, dst, dst_input); } else { const Edge* input_edge;