cleanup

test/pass_manager.cpp

@@ -24,6 +24,7 @@
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/pass/propagate_types.hpp"
 #include "ngraph/pass/topological_sort.hpp"
+#include "ngraph/util.hpp"
 #include "test_tools.hpp"
 
 using namespace ngraph;
@@ -38,7 +39,8 @@ TEST(pass_manager, add)
     pass_manager.register_pass<pass::AssignTensors>();
 
     auto graph = make_test_graph();
-    size_t node_count = get_node_count(graph->get_result());
+    size_t node_count = 0;
+    traverse_nodes(graph, [&](shared_ptr<Node> node) { node_count++; });
     pass_manager.run_passes(graph);
     auto sorted = graph->get_ordered_ops();
     EXPECT_EQ(node_count, sorted.size());

test/test_tools.cpp

@@ -78,31 +78,3 @@ shared_ptr<Function> make_test_graph()
 
     return f0;
 }
-
-size_t get_node_count(std::shared_ptr<Node> node)
-{
-    size_t node_count = 0;
-
-    unordered_set<shared_ptr<Node>> instances_seen;
-    deque<shared_ptr<Node>> stack;
-
-    stack.push_back(node);
-
-    while (stack.size() > 0)
-    {
-        shared_ptr<Node> n = stack.front();
-        if (instances_seen.find(n) == instances_seen.end())
-        {
-            instances_seen.insert(n);
-            stack.push_back(n);
-            node_count++;
-        }
-        stack.pop_front();
-        for (auto arg : n->get_arguments())
-        {
-            stack.push_front(arg);
-        }
-    }
-
-    return node_count;
-}

test/test_tools.hpp

@@ -25,4 +25,3 @@ namespace ngraph
 
 bool validate_list(const std::list<std::shared_ptr<ngraph::Node>>& nodes);
 std::shared_ptr<ngraph::Function> make_test_graph();
-size_t get_node_count(std::shared_ptr<ngraph::Node> n);