Bob/includes (#178)

* cleanup

* fix node includes

src/ngraph/descriptor/buffer.hpp

@@ -14,8 +14,6 @@
 
 #pragma once
 
-#include <memory>
-
 namespace ngraph
 {
     namespace descriptor

src/ngraph/descriptor/input.cpp

@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/descriptor/input.hpp"
+#include "ngraph/descriptor/output.hpp"
 
-using namespace std;
 using namespace ngraph;
 using namespace descriptor;
 

src/ngraph/descriptor/layout/dense_tensor_view_layout.hpp

@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <cstddef>
 #include <vector>
 
 #include "ngraph/descriptor/buffer.hpp"

src/ngraph/descriptor/layout/tensor_view_layout.hpp

@@ -14,6 +14,7 @@
 
 #pragma once
 
+#include <memory>
 #include <tuple>
 #include <vector>
 

src/ngraph/descriptor/output.cpp

@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/descriptor/output.hpp"
+#include "ngraph/descriptor/input.hpp"
 
 using namespace std;
 using namespace ngraph;
-using namespace descriptor;
+using namespace ngraph::descriptor;
 
 Output::Output(const std::shared_ptr<Node>& node,
                size_t index,

src/ngraph/descriptor/output.hpp

@@ -18,6 +18,7 @@
 #include <set>
 
 #include "ngraph/descriptor/tensor_view.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

src/ngraph/node.hpp

@@ -22,17 +22,13 @@
 #include <iostream>
 
 #include "ngraph/common.hpp"
+#include "ngraph/descriptor/input.hpp"
+#include "ngraph/descriptor/output.hpp"
+#include "ngraph/descriptor/tensor.hpp"
 #include "ngraph/types/type.hpp"
 
 namespace ngraph
 {
-    namespace descriptor
-    {
-        class Input;
-        class Output;
-        class Tensor;
-    }
-
     /// Nodes are the backbone of the graph of Value dataflow. Every node has
     /// zero or more nodes as arguments and one value, which is either a tensor
     /// view or a (possibly empty) tuple of values.

src/ngraph/ops/abs.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/add.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/binary_elementwise_arithmetic.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/op.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/ops/binary_elementwise_builtin.cpp

@@ -15,7 +15,7 @@
 #include <memory>
 
 #include "ngraph/log.hpp"
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/op.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/ops/binary_elementwise_comparison.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/op.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/ops/broadcast.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/broadcast.hpp"
 
 using namespace std;
 using namespace ngraph::op;

src/ngraph/ops/broadcast.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/ceiling.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/concatenate.cpp

@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/concatenate.hpp"
 
 using namespace std;
 using namespace ngraph::op;

src/ngraph/ops/concatenate.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/constant.cpp

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/constant.hpp"
 
 using namespace ngraph::op;
 

src/ngraph/ops/constant.hpp

@@ -16,6 +16,7 @@
 
 #include <sstream>
 
+#include "ngraph/node.hpp"
 #include "ngraph/runtime/utils.hpp"
 #include "ngraph/types/element_type.hpp"
 

src/ngraph/ops/convert.cpp

@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/convert.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/ops/convert.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/divide.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/dot.cpp

@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/dot.hpp"
 
 using namespace std;
 using namespace ngraph::op;

src/ngraph/ops/dot.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/equal.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/exp.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/floor.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/function_call.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
-#include "ngraph/pass/topological_sort.hpp"
+#include "ngraph/ops/function_call.hpp"
+#include "ngraph/function.hpp"
 
 using namespace std;
 using namespace ngraph::op;

src/ngraph/ops/function_call.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "ngraph/pass/manager.hpp"
+#include "ngraph/ops/op.hpp"
 #include "ngraph/pass/propagate_types.hpp"
 
 namespace ngraph

src/ngraph/ops/greater.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/greater_eq.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/less.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/less_eq.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/log.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/maximum.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/minimum.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/multiply.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/negative.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/not_equal.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/op.cpp

@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <sstream>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/op.hpp"
 
 using namespace ngraph;
 using namespace std;

src/ngraph/ops/parameter.cpp

@@ -14,7 +14,7 @@
 
 #include <sstream>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/parameter.hpp"
 
 using namespace std;
 using namespace ngraph::op;

src/ngraph/ops/power.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/reduce.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
-#include "ngraph/pass/topological_sort.hpp"
+#include "ngraph/ops/reduce.hpp"
+#include "ngraph/function.hpp"
 
 using namespace std;
 using namespace ngraph::op;

src/ngraph/ops/reduce.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/remainder.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/select.cpp

@@ -15,7 +15,7 @@
 #include <memory>
 
 #include "ngraph/log.hpp"
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/select.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/ops/select.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/subtract.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/tuple.cpp

@@ -15,7 +15,7 @@
 #include <memory>
 #include <vector>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/tuple.hpp"
 
 using namespace std;
 using namespace ngraph::op;

src/ngraph/ops/tuple.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "ngraph/ops/op.hpp"
+
 namespace ngraph
 {
     namespace op

src/ngraph/ops/unary_elementwise_arithmetic.cpp

@@ -12,11 +12,8 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include <memory>
+#include "ngraph/ops/op.hpp"
 
-#include "ngraph/ngraph.hpp"
-
-using namespace std;
 using namespace ngraph;
 using namespace ngraph::op;
 

src/ngraph/ops/unary_elementwise_builtin.cpp

@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/ops/op.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ngraph/pass/assign_tensors.hpp

@@ -22,7 +22,6 @@ namespace ngraph
     {
         class AssignTensors;
     }
-    class Node;
 }
 
 class ngraph::pass::AssignTensors : public CallGraphPass

src/ngraph/pass/dump_sorted.cpp

@@ -14,7 +14,8 @@
 
 #include <fstream>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph/descriptor/input.hpp"
+#include "ngraph/descriptor/output.hpp"
 #include "ngraph/pass/dump_sorted.hpp"
 #include "ngraph/util.hpp"
 

src/ngraph/pass/dump_sorted.hpp

@@ -24,7 +24,6 @@ namespace ngraph
     {
         class DumpSorted;
     }
-    class Node;
 }
 
 class ngraph::pass::DumpSorted : public ModulePass

src/ngraph/pass/liveness.cpp

@@ -16,9 +16,10 @@
 #include <sstream>
 #include <unordered_set>
 
+#include "ngraph/descriptor/input.hpp"
+#include "ngraph/descriptor/output.hpp"
 #include "ngraph/log.hpp"
-#include "ngraph/log.hpp"
-#include "ngraph/ngraph.hpp"
+#include "ngraph/node.hpp"
 #include "ngraph/pass/assign_tensors.hpp"
 #include "ngraph/pass/liveness.hpp"
 #include "ngraph/util.hpp"

src/ngraph/pass/liveness.hpp

@@ -23,7 +23,6 @@ namespace ngraph
     {
         class Liveness;
     }
-    class Node;
 }
 
 class ngraph::pass::Liveness : public CallGraphPass

src/ngraph/pass/manager.hpp

@@ -28,9 +28,6 @@ namespace ngraph
         class Manager;
         class ManagerState;
     }
-
-    class Node;
-    class Function;
 }
 
 class ngraph::pass::Manager

src/ngraph/pass/manager_state.hpp

@@ -17,15 +17,14 @@
 #include <memory>
 #include <vector>
 
+#include "ngraph/function.hpp"
+
 namespace ngraph
 {
     namespace pass
     {
         class ManagerState;
     }
-
-    class Node;
-    class Function;
 }
 
 class ngraph::pass::ManagerState

src/ngraph/pass/memory_layout.cpp

@@ -17,7 +17,6 @@
 
 #include "ngraph/log.hpp"
 #include "ngraph/log.hpp"
-#include "ngraph/ngraph.hpp"
 #include "ngraph/pass/liveness.hpp"
 #include "ngraph/pass/manager.hpp"
 #include "ngraph/pass/memory_layout.hpp"

src/ngraph/pass/memory_layout.hpp

@@ -28,7 +28,6 @@ namespace ngraph
         class MemoryNode;
         class MemoryManager;
     }
-    class Node;
 }
 
 class ngraph::pass::MemoryLayout : public CallGraphPass

src/ngraph/pass/memory_visualize.hpp

@@ -26,7 +26,6 @@ namespace ngraph
     {
         class MemoryVisualize;
     }
-    class Node;
 }
 
 class ngraph::pass::MemoryVisualize : public ModulePass

src/ngraph/pass/pass.hpp

@@ -18,7 +18,9 @@
 #include <memory>
 #include <vector>
 
+#include "ngraph/function.hpp"
 #include "ngraph/node.hpp"
+#include "ngraph/pass/manager_state.hpp"
 
 namespace ngraph
 {
@@ -30,9 +32,7 @@ namespace ngraph
         class NodePass;
         class CallGraphPass;
         class Manager;
-        class ManagerState;
     }
-    class Function;
 }
 
 class ngraph::pass::PassBase

src/ngraph/pass/propagate_types.hpp

@@ -22,7 +22,6 @@ namespace ngraph
     {
         class PropagateTypes;
     }
-    class Node;
 }
 
 class ngraph::pass::PropagateTypes : public CallGraphPass

src/ngraph/pass/topological_sort.hpp

@@ -25,7 +25,6 @@ namespace ngraph
     {
         class TopologicalSort;
     }
-    class Node;
 }
 
 class ngraph::pass::TopologicalSort : public FunctionPass

src/ngraph/pass/visualize_tree.hpp

@@ -26,7 +26,6 @@ namespace ngraph
     {
         class VisualizeTree;
     }
-    class Node;
 }
 
 class ngraph::pass::VisualizeTree : public ModulePass