Skip to content

[Inference] Replace unordered_map with map to support subgraph stability #35147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2021
Merged

[Inference] Replace unordered_map with map to support subgraph stability #35147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7beeed
reuse from unordered_map to map to support subgraph stability
jiweibo Aug 25, 2021
8b81769
fix ut error
jiweibo Aug 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions paddle/fluid/framework/ir/subgraph_detector.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void SubgraphDetector::MarkNodesInsideSubGraph() {
// Use the Union Find(UF) algorithm to find fully connected sub-graphs, if node
// a's output is node b, that is a and b is in the same sub-graph. The UF
// algorithm will group them to the same cluster.
using node_map_t = std::unordered_map<int, Node *>;
using node_map_t = std::map<int, Node *>;
// Find the ancestor id of a node.
int UnionFindGetAncestor(const node_map_t &node_map, size_t id) {
int tmp = id;
Expand Down Expand Up @@ -155,7 +155,7 @@ struct BriefNode {
// 3. change all the dst's inputs and outputs
// corresponding inlinks and outlinks to src node.
// 4. delete all dst's inlinks and outlinks.
void UnionContractedNodes(const std::unordered_map<int, BriefNode *> &node_map,
void UnionContractedNodes(const std::map<int, BriefNode *> &node_map,
int src_id, int dst_id) {
// merge the two adjacent nodes into one node.
BriefNode *src_node = node_map.at(src_id);
Expand Down Expand Up @@ -262,7 +262,7 @@ std::vector<std::vector<Node *>> SubgraphDetector::ExtractSubGraphs() {
std::vector<Node *> marked_nodes;
// We use brief_node_map to represent the original graph in order to avoid
// changing the original graph.
std::unordered_map<int, BriefNode *> brief_node_map;
std::map<int, BriefNode *> brief_node_map;

std::unordered_set<int32_t> valid_node_ids;
for (auto *node : graph_->Nodes()) {
Expand Down
2 changes: 1 addition & 1 deletion python/paddle/fluid/tests/unittests/ir/test_ir_fusion_group_pass.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def build_program(self, dtype):

self.append_gradients(tmp_3)

self.num_fused_ops = 4
self.num_fused_ops = 3
self.fetch_list = [tmp_3, self.grad(tmp_0)]


Expand Down