experiments/STT-tensorflow
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Grappler] Speed up function optimizer, by setting allow_duplicates=true in the call to AddEdges from AddStrictInputSemantics.

Browse Source 
This speeds up function optimizer from ~17s to 6.4s on the large distributed graph from billmark@.

PiperOrigin-RevId: 277824884
Change-Id: I925277bdccb1cd3b250bb630b80294a30bf4eba0
This commit is contained in:
A. Unique TensorFlower 2019-10-31 16:26:36 -07:00 committed by TensorFlower Gardener
parent fe1c95dee3
commit e8d9db593e
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tensorflow/core/grappler/optimizers/function_optimizer.cc
View File

@ -1079,9 +1079,14 @@ Status MakeFunctionBodyForInlining(const Node& node,
// V2, however we have to guarantee that graphs constructed with Tensorflow V1 // V2, however we have to guarantee that graphs constructed with Tensorflow V1
// will produce correct results. // will produce correct results.
void AddStrictInputSemantics(Node* caller, Graph* g) { void AddStrictInputSemantics(Node* caller, Graph* g) {
const bool has_incoming_control_edges = absl::flat_hash_set<const Node*> existing_control_sources;
absl::c_any_of(caller->in_edges(), for (const Edge* edge : caller->in_edges()) {
[](const Edge* edge) { return edge->IsControlEdge(); }); if (edge->IsControlEdge()) {
existing_control_sources.insert(edge->src());
}
}
const bool has_incoming_control_edges = !existing_control_sources.empty();
const bool has_resource_input = const bool has_resource_input =
absl::c_any_of(caller->input_types(), absl::c_any_of(caller->input_types(),
@ -1098,18 +1103,19 @@ void AddStrictInputSemantics(Node* caller, Graph* g) {
(has_constant_enter_input); // Case #2 (has_constant_enter_input); // Case #2
if (!requires_strict_semantics) return; if (!requires_strict_semantics) return;
std::vector<const Node*> data_inputs; std::set<const Node*> data_inputs;
data_inputs.reserve(caller->in_edges().size());
for (const Edge* edge : caller->in_edges()) { for (const Edge* edge : caller->in_edges()) {
if (edge->IsControlEdge()) continue; if (!edge->IsControlEdge() &&
data_inputs.push_back(edge->src()); !existing_control_sources.contains(edge->src())) {
data_inputs.insert(edge->src());
}
} }
VLOG(3) << "Add control edges from all data inputs to enforce strict " VLOG(3) << "Add control edges from all data inputs to enforce strict "
"semantics with regard to function inputs"; "semantics with regard to function inputs";
for (const Node* node : data_inputs) { for (const Node* node : data_inputs) {
g->AddControlEdge(g->FindNodeId(node->id()), caller); g->AddControlEdge(g->FindNodeId(node->id()), caller,
/*allow_duplicates=*/true);
} }
} }