p60975123
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

revert some vector to deque

This commit is contained in:
zhangzhaoju 2021-05-21 10:19:23 +08:00
parent 5b673684e3
commit 169a2bcd97
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mindspore/ccsrc/frontend/optimizer/opt.cc
View File

@ -126,8 +126,8 @@ static AnfNodePtr DoTransform(const OptimizerPtr &optimizer, const AnfNodePtr &n
return nullptr;
}
static void UpdateTransformingList(const OptimizerPtr &optimizer, const AnfNodePtr &node,
std::vector<AnfNodePtr> *todo, bool change, size_t seen) {
static void UpdateTransformingList(const OptimizerPtr &optimizer, const AnfNodePtr &node, std::deque<AnfNodePtr> *todo,
bool change, size_t seen) {
if (IsValueNode<FuncGraph>(node)) {
(*todo).emplace_back(GetValueNode<FuncGraphPtr>(node)->output());
}
@ -164,17 +164,15 @@ bool SubstitutionList::ApplyIRToSubstitutions(const OptimizerPtr &optimizer, con
#endif
FuncGraphManagerPtr manager = optimizer->manager();
auto seen = NewSeenGeneration();
// 1024 is for the initial capacity of vector
std::vector<AnfNodePtr> todo;
todo.reserve(1024);
// 1024 is for the initial capacity of deque
std::deque<AnfNodePtr> todo;
todo.emplace_back(func_graph->output());
bool changes = false;
auto &all_nodes = manager->all_nodes();
size_t node_idx = 0;
while (node_idx < todo.size()) {
AnfNodePtr node = todo[node_idx];
node_idx++;
while (!todo.empty()) {
AnfNodePtr node = todo.front();
todo.pop_front();
if (node == nullptr || node->seen_ == seen || !isTraversable(node) || !all_nodes.contains(node)) {
continue;
@ -207,17 +205,15 @@ bool SubstitutionList::ApplySubstitutionToIR(const OptimizerPtr &optimizer, cons
#endif
FuncGraphManagerPtr manager = optimizer->manager();
auto seen = NewSeenGeneration();
// 1024 is for the initial capacity of vector
std::vector<AnfNodePtr> todo(0);
todo.reserve(1024);
// 1024 is for the initial capacity of deque
std::deque<AnfNodePtr> todo;
todo.emplace_back(root_node);
bool changes = false;
auto &all_nodes = manager->all_nodes();
size_t node_idx = 0;
while (node_idx < todo.size()) {
AnfNodePtr node = todo[node_idx];
node_idx++;
while (!todo.empty()) {
AnfNodePtr node = todo.front();
todo.pop_front();
if (node == nullptr || node->seen_ == seen || !isTraversable(node) || !all_nodes.contains(node)) {
continue;

24
mindspore/core/ir/graph_utils.cc
View File

@ -37,12 +37,12 @@
namespace mindspore {
std::vector<AnfNodePtr> TopoSort(const AnfNodePtr &root, const SuccFunc &succ, const IncludeFunc &include) {
std::vector<AnfNodePtr> res;
res.reserve(1024);
if (root == nullptr) {
return res;
}
size_t seen = NewSeenGeneration();
std::vector<AnfNodePtr> todo;
todo.reserve(1024);
std::deque<AnfNodePtr> todo;
todo.push_back(root);
while (!todo.empty()) {
@ -98,13 +98,11 @@ std::vector<CNodePtr> BroadFirstSearchGraphCNodes(const std::vector<CNodePtr> &s
std::vector<CNodePtr> todo;
todo.reserve(1024);
todo.insert(todo.end(), starts.begin(), starts.end());
std::vector<CNodePtr> sorted_nodes;
auto seen = NewSeenGeneration();
size_t top_idx = 0;
while (top_idx < todo.size()) {
CNodePtr top = todo[top_idx];
top_idx++;
sorted_nodes.push_back(top);
auto inputs = top->inputs();
for (auto &item : inputs) {
if (item->seen_ == seen) {
@ -117,19 +115,17 @@ std::vector<CNodePtr> BroadFirstSearchGraphCNodes(const std::vector<CNodePtr> &s
item->seen_ = seen;
}
}
return sorted_nodes;
return todo;
}
// search the cnode match the predicate inside this graph only
CNodePtr BroadFirstSearchFirstOf(const std::vector<CNodePtr> &starts, const MatchFunc &match_predicate) {
std::vector<CNodePtr> todo;
todo.reserve(1024);
std::deque<CNodePtr> todo;
todo.insert(todo.end(), starts.begin(), starts.end());
auto seen = NewSeenGeneration();
size_t top_idx = 0;
while (top_idx < todo.size()) {
CNodePtr top = todo[top_idx];
top_idx++;
while (!todo.empty()) {
CNodePtr top = todo.front();
todo.pop_front();
if (match_predicate(top)) {
return top;
}
@ -152,14 +148,11 @@ std::vector<FuncGraphPtr> BroadFirstSearchGraphUsed(FuncGraphPtr root) {
std::vector<FuncGraphPtr> todo;
todo.reserve(128);
todo.push_back(root);
std::vector<FuncGraphPtr> sorted;
sorted.reserve(128);
auto seen = NewSeenGeneration();
size_t top_idx = 0;
while (top_idx < todo.size()) {
FuncGraphPtr top = todo[top_idx];
top_idx++;
sorted.push_back(top);
auto used = top->func_graphs_used();
for (auto &item : used) {
if (item.first->seen_ == seen) {
@ -169,7 +162,7 @@ std::vector<FuncGraphPtr> BroadFirstSearchGraphUsed(FuncGraphPtr root) {
item.first->seen_ = seen;
}
}
return sorted;
return todo;
}
// PushSuccessors push cnode inputs to a vector as successors for topo sort.
@ -243,6 +236,7 @@ std::vector<AnfNodePtr> SuccIncoming(const AnfNodePtr &node) {
std::vector<AnfNodePtr> SuccIncludeFV(const FuncGraphPtr &fg, const AnfNodePtr &node) {
std::vector<AnfNodePtr> vecs;
vecs.reserve(128);
if (node == nullptr) {
return vecs;
}