Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into py_calc_memory
commit
999d097bbb
File diff suppressed because it is too large
Load Diff
@ -1,5 +1,6 @@
|
|||||||
cc_library(node SRCS node.cc DEPS proto_desc)
|
cc_library(node SRCS node.cc DEPS proto_desc)
|
||||||
cc_library(graph SRCS graph.cc DEPS node)
|
cc_library(graph SRCS graph.cc DEPS node)
|
||||||
|
cc_library(graph_helper SRCS graph_helper.cc DEPS graph)
|
||||||
cc_library(pass SRCS pass.cc DEPS graph node)
|
cc_library(pass SRCS pass.cc DEPS graph node)
|
||||||
|
cc_test(graph_test SRCS graph_test.cc DEPS graph op_registry)
|
||||||
cc_test(graph_test SRCS graph_test.cc DEPS graph proto_desc op_registry)
|
cc_test(graph_helper_test SRCS graph_helper_test.cc DEPS graph_helper op_registry)
|
||||||
|
|||||||
@ -0,0 +1,118 @@
|
|||||||
|
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License. */
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
#include <unordered_set>
|
||||||
|
|
||||||
|
#include "paddle/fluid/framework/ir/graph_helper.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace ir {
|
||||||
|
namespace {
|
||||||
|
void SortHelper(
|
||||||
|
const std::map<ir::Node *, std::unordered_set<ir::Node *>> &adj_list,
|
||||||
|
ir::Node *node, std::unordered_set<ir::Node *> *visited,
|
||||||
|
std::vector<ir::Node *> *ret) {
|
||||||
|
visited->insert(node);
|
||||||
|
|
||||||
|
for (auto adj : adj_list.at(node)) {
|
||||||
|
if (visited->find(adj) == visited->end()) {
|
||||||
|
SortHelper(adj_list, adj, visited, ret);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
VLOG(3) << "topology sort insert: " << node->Name()
|
||||||
|
<< reinterpret_cast<void *>(node) << " input " << node->inputs.size();
|
||||||
|
ret->push_back(node);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool HasCircleHelper(
|
||||||
|
ir::Node *node,
|
||||||
|
const std::map<ir::Node *, std::unordered_set<ir::Node *>> &adj_list,
|
||||||
|
std::unordered_set<ir::Node *> *visited,
|
||||||
|
std::unordered_set<ir::Node *> *in_trace) {
|
||||||
|
if (visited->find(node) == visited->end()) {
|
||||||
|
visited->insert(node);
|
||||||
|
in_trace->insert(node);
|
||||||
|
|
||||||
|
for (ir::Node *in : adj_list.at(node)) {
|
||||||
|
if (visited->find(in) == visited->end() &&
|
||||||
|
HasCircleHelper(in, adj_list, visited, in_trace)) {
|
||||||
|
return true;
|
||||||
|
} else if (in_trace->find(in) != in_trace->end()) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
in_trace->erase(node);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool HasCircleInternal(
|
||||||
|
const std::map<ir::Node *, std::unordered_set<ir::Node *>> &adj_list) {
|
||||||
|
std::unordered_set<ir::Node *> visited;
|
||||||
|
std::unordered_set<ir::Node *> in_trace;
|
||||||
|
for (auto &adj : adj_list) {
|
||||||
|
if (HasCircleHelper(adj.first, adj_list, &visited, &in_trace)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
bool HasCircle(const Graph &graph) {
|
||||||
|
return HasCircleInternal(BuildOperationAdjList(graph));
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<ir::Node *> TopologySortOperations(const Graph &graph) {
|
||||||
|
std::map<ir::Node *, std::unordered_set<ir::Node *>> adj_list =
|
||||||
|
BuildOperationAdjList(graph);
|
||||||
|
PADDLE_ENFORCE(!HasCircleInternal(adj_list));
|
||||||
|
std::unordered_set<ir::Node *> visited;
|
||||||
|
std::vector<ir::Node *> ret;
|
||||||
|
for (auto adj : adj_list) {
|
||||||
|
if (visited.find(adj.first) == visited.end()) {
|
||||||
|
SortHelper(adj_list, adj.first, &visited, &ret);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::map<ir::Node *, std::unordered_set<ir::Node *>> BuildOperationAdjList(
|
||||||
|
const Graph &graph) {
|
||||||
|
std::map<ir::Node *, std::unordered_set<ir::Node *>> adj_list;
|
||||||
|
|
||||||
|
for (auto &n : graph.Nodes()) {
|
||||||
|
if (n->NodeType() != ir::Node::Type::kOperation) continue;
|
||||||
|
if (adj_list.find(n) == adj_list.end()) {
|
||||||
|
adj_list[n] = std::unordered_set<ir::Node *>();
|
||||||
|
}
|
||||||
|
for (auto &var : n->inputs) {
|
||||||
|
for (auto &adj_n : var->inputs) {
|
||||||
|
PADDLE_ENFORCE(adj_n->NodeType() == ir::Node::Type::kOperation);
|
||||||
|
adj_list[n].insert(adj_n);
|
||||||
|
VLOG(3) << "adj " << adj_n->Name() << reinterpret_cast<void *>(adj_n)
|
||||||
|
<< " -> " << n->Name() << reinterpret_cast<void *>(n)
|
||||||
|
<< " via " << var->Name() << reinterpret_cast<void *>(var);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return adj_list;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace ir
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,40 @@
|
|||||||
|
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License. */
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <map>
|
||||||
|
#include <memory>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
#include "paddle/fluid/framework/ir/graph.h"
|
||||||
|
#include "paddle/fluid/framework/ir/node.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace ir {
|
||||||
|
// Test if the graph contains circle.
|
||||||
|
bool HasCircle(const Graph &graph);
|
||||||
|
|
||||||
|
// Topology Sort the operations in the graph from inputs to outputs.
|
||||||
|
// `graph` cannot contain circle.
|
||||||
|
std::vector<ir::Node *> TopologySortOperations(const Graph &graph);
|
||||||
|
|
||||||
|
// Build an adjacency list of operations for the `graph`.
|
||||||
|
std::map<ir::Node *, std::unordered_set<ir::Node *>> BuildOperationAdjList(
|
||||||
|
const Graph &graph);
|
||||||
|
|
||||||
|
} // namespace ir
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
@ -0,0 +1,125 @@
|
|||||||
|
/* Copyright (c) 2018 PaddlePaddle Authors. All Rights Reserved.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License. */
|
||||||
|
|
||||||
|
#include "paddle/fluid/framework/ir/graph.h"
|
||||||
|
#include <string>
|
||||||
|
#include "gtest/gtest.h"
|
||||||
|
#include "paddle/fluid/framework/ir/graph_helper.h"
|
||||||
|
#include "paddle/fluid/framework/program_desc.h"
|
||||||
|
|
||||||
|
namespace paddle {
|
||||||
|
namespace framework {
|
||||||
|
namespace ir {
|
||||||
|
|
||||||
|
void BuildCircleGraph(Graph* g) {
|
||||||
|
ir::Node* o1 = g->CreateEmptyNode("op1", Node::Type::kOperation);
|
||||||
|
ir::Node* v1 = g->CreateEmptyNode("var1", Node::Type::kVariable);
|
||||||
|
|
||||||
|
o1->outputs.push_back(v1);
|
||||||
|
o1->inputs.push_back(v1);
|
||||||
|
v1->inputs.push_back(o1);
|
||||||
|
v1->outputs.push_back(o1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void BuildCircleGraph2(Graph* g) {
|
||||||
|
ir::Node* o1 = g->CreateEmptyNode("op1", Node::Type::kOperation);
|
||||||
|
ir::Node* o2 = g->CreateEmptyNode("op2", Node::Type::kOperation);
|
||||||
|
ir::Node* v1 = g->CreateEmptyNode("var1", Node::Type::kVariable);
|
||||||
|
ir::Node* v2 = g->CreateEmptyNode("var2", Node::Type::kVariable);
|
||||||
|
|
||||||
|
o1->outputs.push_back(v1);
|
||||||
|
o2->inputs.push_back(v1);
|
||||||
|
v1->inputs.push_back(o1);
|
||||||
|
v1->outputs.push_back(o2);
|
||||||
|
|
||||||
|
o2->outputs.push_back(v2);
|
||||||
|
o1->inputs.push_back(v2);
|
||||||
|
v2->inputs.push_back(o2);
|
||||||
|
v2->outputs.push_back(o1);
|
||||||
|
}
|
||||||
|
|
||||||
|
void BuildNoCircleGraph(Graph* g) {
|
||||||
|
ir::Node* o1 = g->CreateEmptyNode("op1", Node::Type::kOperation);
|
||||||
|
ir::Node* o2 = g->CreateEmptyNode("op2", Node::Type::kOperation);
|
||||||
|
ir::Node* o3 = g->CreateEmptyNode("op3", Node::Type::kOperation);
|
||||||
|
ir::Node* o4 = g->CreateEmptyNode("op4", Node::Type::kOperation);
|
||||||
|
ir::Node* o5 = g->CreateEmptyNode("op5", Node::Type::kOperation);
|
||||||
|
ir::Node* v1 = g->CreateEmptyNode("var1", Node::Type::kVariable);
|
||||||
|
ir::Node* v2 = g->CreateEmptyNode("var2", Node::Type::kVariable);
|
||||||
|
ir::Node* v3 = g->CreateEmptyNode("var3", Node::Type::kVariable);
|
||||||
|
ir::Node* v4 = g->CreateEmptyNode("var4", Node::Type::kVariable);
|
||||||
|
|
||||||
|
// o1->v1->o2
|
||||||
|
o1->outputs.push_back(v1);
|
||||||
|
o2->inputs.push_back(v1);
|
||||||
|
v1->inputs.push_back(o1);
|
||||||
|
v1->outputs.push_back(o2);
|
||||||
|
// o2->v2->o3
|
||||||
|
// o2->v2->o4
|
||||||
|
o2->outputs.push_back(v2);
|
||||||
|
o3->inputs.push_back(v2);
|
||||||
|
o4->inputs.push_back(v2);
|
||||||
|
v2->inputs.push_back(o2);
|
||||||
|
v2->outputs.push_back(o3);
|
||||||
|
v2->outputs.push_back(o4);
|
||||||
|
// o2->v3->o5
|
||||||
|
o2->outputs.push_back(v3);
|
||||||
|
o5->inputs.push_back(v3);
|
||||||
|
v3->inputs.push_back(o2);
|
||||||
|
v3->outputs.push_back(o5);
|
||||||
|
// o3-v4->o5
|
||||||
|
o3->outputs.push_back(v4);
|
||||||
|
o5->inputs.push_back(v4);
|
||||||
|
v4->inputs.push_back(o3);
|
||||||
|
v4->outputs.push_back(o5);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST(GraphHelperTest, Basic) {
|
||||||
|
ProgramDesc prog;
|
||||||
|
|
||||||
|
Graph g(prog);
|
||||||
|
BuildCircleGraph(&g);
|
||||||
|
ASSERT_TRUE(HasCircle(g));
|
||||||
|
|
||||||
|
Graph g2(prog);
|
||||||
|
BuildCircleGraph2(&g2);
|
||||||
|
ASSERT_TRUE(HasCircle(g2));
|
||||||
|
|
||||||
|
auto adj_list = BuildOperationAdjList(g2);
|
||||||
|
for (auto& adj : adj_list) {
|
||||||
|
auto& adj_set = adj.second;
|
||||||
|
if (adj.first->Name() == "op1") {
|
||||||
|
ASSERT_EQ((*adj_set.begin())->Name(), "op2");
|
||||||
|
} else if (adj.first->Name() == "op2") {
|
||||||
|
ASSERT_EQ((*adj_set.begin())->Name(), "op1");
|
||||||
|
} else {
|
||||||
|
ASSERT_TRUE(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Graph g3(prog);
|
||||||
|
BuildNoCircleGraph(&g3);
|
||||||
|
ASSERT_FALSE(HasCircle(g3));
|
||||||
|
auto sorted = TopologySortOperations(g3);
|
||||||
|
std::map<std::string, size_t> node_map;
|
||||||
|
for (size_t i = 0; i < sorted.size(); ++i) {
|
||||||
|
node_map[sorted[i]->Name()] = i;
|
||||||
|
}
|
||||||
|
ASSERT_EQ(node_map.at("op1"), 0);
|
||||||
|
ASSERT_EQ(node_map.at("op2"), 1);
|
||||||
|
ASSERT_TRUE(node_map.at("op3") < node_map.at("op5"));
|
||||||
|
}
|
||||||
|
} // namespace ir
|
||||||
|
} // namespace framework
|
||||||
|
} // namespace paddle
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue