Skip to content

Commit

Permalink
Merge pull request apache#998 from shiyemin/master
Browse files Browse the repository at this point in the history
fix implicit-conversion-failure-from-initializer-list
  • Loading branch information
mli committed Dec 21, 2015
2 parents 3a55502 + aad6806 commit 19863ea
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/symbol/graph_executor.cc
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void GraphExecutor::InitGraph(const Symbol &symbol,
}
std::sort(head_nodes.begin(), head_nodes.end());
head_nodes.resize(std::unique(head_nodes.begin(), head_nodes.end()) - head_nodes.begin());
std::vector<uint32_t> fwd_nodes = graph_.PostDFSOrder(head_nodes, {});
std::vector<uint32_t> fwd_nodes = graph_.PostDFSOrder(head_nodes, std::unordered_set<uint32_t>());
num_forward_nodes_ = fwd_nodes.size();

std::unordered_set<uint32_t> fwd_set(fwd_nodes.begin(), fwd_nodes.end());
Expand Down
3 changes: 2 additions & 1 deletion src/symbol/static_graph.h
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,8 @@ class StaticGraph {
* \return a post DFS visit order of nodes that can reach heads.
*/
std::vector<uint32_t> PostDFSOrder(const std::vector<uint32_t>& head_nodes,
const std::unordered_set<uint32_t>& banned = {}) const;
const std::unordered_set<uint32_t>& banned
= std::unordered_set<uint32_t>()) const;
/*!
* \brief infer the node shapes in the computation graph.
*
Expand Down

0 comments on commit 19863ea

Please sign in to comment.