Merge pull request #130 from NervanaSystems/bob/new_directory

new directory layout

src/CMakeLists.txt

@@ -15,29 +15,29 @@ include_directories(SYSTEM ${EIGEN_INCLUDE_DIR})
 
 set (SRC
     log.cpp
-    ngraph/descriptor/input.cpp
-    ngraph/descriptor/output.cpp
-    ngraph/descriptor/tensor_view.cpp
-    ngraph/descriptor/tensor.cpp
-    ngraph/function.cpp
-    ngraph/node.cpp
-    ngraph/shape.cpp
-    ngraph/pass/assign_tensors.cpp
-    ngraph/pass/call_pass.cpp
-    ngraph/pass/dump_sorted.cpp
-    ngraph/pass/liveness.cpp
-    ngraph/pass/manager.cpp
-    ngraph/pass/memory_layout.cpp
-    ngraph/pass/pass.cpp
-    ngraph/pass/propagate_types.cpp
-    ngraph/pass/topological_sort.cpp
-    ngraph/pass/tree_pass.cpp
-    ngraph/pass/visualize_tree.cpp
-    ngraph/runtime/call_frame.cpp
-    ngraph/runtime/eigen/external_function.cpp
-    ngraph/runtime/eigen/tensor_view.cpp
-    ngraph/shape.cpp
-    ngraph/visualize.cpp
+    descriptor/input.cpp
+    descriptor/output.cpp
+    descriptor/tensor_view.cpp
+    descriptor/tensor.cpp
+    function.cpp
+    node.cpp
+    shape.cpp
+    pass/assign_tensors.cpp
+    pass/call_pass.cpp
+    pass/dump_sorted.cpp
+    pass/liveness.cpp
+    pass/manager.cpp
+    pass/memory_layout.cpp
+    pass/pass.cpp
+    pass/propagate_types.cpp
+    pass/topological_sort.cpp
+    pass/tree_pass.cpp
+    pass/visualize_tree.cpp
+    runtime/call_frame.cpp
+    runtime/eigen/external_function.cpp
+    runtime/eigen/tensor_view.cpp
+    shape.cpp
+    visualize.cpp
     ops/binary_elementwise_arithmetic.cpp
     ops/binary_elementwise_builtin.cpp
     ops/binary_elementwise_comparison.cpp

src/ngraph/descriptor/call_frame.hpp → src/descriptor/call_frame.hpp

@@ -17,8 +17,8 @@
 #include <memory>
 #include <vector>
 
-#include "ngraph/descriptor/tensor_view.hpp"
-#include "ngraph/function.hpp"
+#include "descriptor/tensor_view.hpp"
+#include "function.hpp"
 
 namespace ngraph
 {

src/ngraph/descriptor/input.cpp → src/descriptor/input.cpp

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

src/ngraph/descriptor/input.hpp → src/descriptor/input.hpp

@@ -16,7 +16,7 @@
 
 #include <memory>
 
-#include "ngraph/descriptor/tensor.hpp"
+#include "descriptor/tensor.hpp"
 
 namespace ngraph
 {

src/ngraph/descriptor/output.cpp → src/descriptor/output.cpp

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

src/ngraph/descriptor/output.hpp → src/descriptor/output.hpp

@@ -17,7 +17,7 @@
 #include <memory>
 #include <set>
 
-#include "ngraph/descriptor/tensor_view.hpp"
+#include "descriptor/tensor_view.hpp"
 
 namespace ngraph
 {

src/descriptor/tensor.cpp

+// ----------------------------------------------------------------------------
+// Copyright 2017 Nervana Systems Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// ----------------------------------------------------------------------------
+
+#include "descriptor/tensor.hpp"
+#include "node.hpp"
+
+namespace ngraph
+{
+    namespace descriptor
+    {
+        Tensor::Tensor(const element::Type& element_type,
+                       PrimaryTensorView*   primary_tensor_view,
+                       const Node*          parent,
+                       size_t               value_index)
+            : m_element_type(element_type)
+            , m_primary_tensor_view(primary_tensor_view)
+            , m_is_output{false}
+            , m_is_input{parent->is_parameter()}
+            , m_is_persistent{false}
+            , m_name{parent->get_node_id() + "_" + std::to_string(value_index)}
+            , m_next_view_id{0}
+        {
+        }
+
+        std::string Tensor::get_next_view_name()
+        {
+            return m_name + "_TV" + std::to_string(m_next_view_id++);
+        }
+
+        std::ostream& operator<<(std::ostream& out, const Tensor& tensor)
+        {
+            out << "Tensor(" << tensor.get_name() << ")";
+            return out;
+        }
+    }
+}

src/ngraph/descriptor/tensor.hpp → src/descriptor/tensor.hpp

@@ -14,9 +14,9 @@
 
 #pragma once
 
+#include <iostream>
 #include <memory>
 #include <vector>
-#include <iostream>
 
 namespace ngraph
 {
@@ -40,8 +40,10 @@ namespace ngraph
             Tensor(const Tensor&) = delete;
             Tensor& operator=(const Tensor&) = delete;
 
-            Tensor(const element::Type& element_type, PrimaryTensorView* tensor_view,
-                const Node* parent, size_t value_index);
+            Tensor(const element::Type& element_type,
+                   PrimaryTensorView*   tensor_view,
+                   const Node*          parent,
+                   size_t               value_index);
 
             std::string get_next_view_name();
 
@@ -50,9 +52,6 @@ namespace ngraph
             bool               is_input() const { return m_is_input; }
             bool               is_persistent() const { return m_is_persistent; }
             const std::string& get_name() const { return m_name; }
-
-            friend std::ostream& operator<<(std::ostream&, const Tensor&);
-
         protected:
             const element::Type& m_element_type;
             PrimaryTensorView*   m_primary_tensor_view;
@@ -62,5 +61,7 @@ namespace ngraph
             std::string          m_name;
             size_t               m_next_view_id;
         };
+
+        std::ostream& operator<<(std::ostream&, const Tensor&);
     }
 }

src/ngraph/descriptor/tensor_view.cpp → src/descriptor/tensor_view.cpp

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

src/ngraph/descriptor/tensor_view.hpp → src/descriptor/tensor_view.hpp

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "ngraph/descriptor/tensor.hpp"
-#include "ngraph/shape.hpp"
-#include "ngraph/type.hpp"
+#include "descriptor/tensor.hpp"
+#include "shape.hpp"
+#include "types/type.hpp"
 #include "log.hpp"
 
 namespace ngraph

src/ngraph/function.cpp → src/function.cpp

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

src/ngraph/function.hpp → src/function.hpp

@@ -14,12 +14,12 @@
 
 #pragma once
 
-#include "ngraph/descriptor/tensor_view.hpp"
-#include "ngraph/node.hpp"
-#include "ngraph/op.hpp"
-#include "ngraph/ops/parameter.hpp"
-#include "ngraph/runtime/instruction.hpp"
-#include "ngraph/type.hpp"
+#include "descriptor/tensor_view.hpp"
+#include "node.hpp"
+#include "ops/op.hpp"
+#include "ops/parameter.hpp"
+#include "runtime/instruction.hpp"
+#include "types/type.hpp"
 
 namespace ngraph
 {

src/ngraph.hpp

+// ----------------------------------------------------------------------------
+// Copyright 2017 Nervana Systems Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// ----------------------------------------------------------------------------
+
+//
+// The public API for ngraph++
+//
+
+#pragma once
+
+#include "common.hpp"
+#include "descriptor/buffer.hpp"
+#include "descriptor/call_frame.hpp"
+#include "descriptor/input.hpp"
+#include "descriptor/output.hpp"
+#include "descriptor/tensor.hpp"
+#include "descriptor/tensor_view.hpp"
+#include "descriptor/tensor_view_layout.hpp"
+#include "types/element_type.hpp"
+#include "except.hpp"
+#include "function.hpp"
+#include "node.hpp"
+#include "ops/abs.hpp"
+#include "ops/add.hpp"
+#include "ops/broadcast.hpp"
+#include "ops/ceiling.hpp"
+#include "ops/concatenate.hpp"
+#include "ops/constant.hpp"
+#include "ops/convert.hpp"
+#include "ops/divide.hpp"
+#include "ops/dot.hpp"
+#include "ops/equal.hpp"
+#include "ops/exp.hpp"
+#include "ops/floor.hpp"
+#include "ops/greater.hpp"
+#include "ops/less.hpp"
+#include "ops/log.hpp"
+#include "ops/maximum.hpp"
+#include "ops/minimum.hpp"
+#include "ops/multiply.hpp"
+#include "ops/negative.hpp"
+#include "ops/op.hpp"
+#include "ops/parameter.hpp"
+#include "ops/power.hpp"
+#include "ops/remainder.hpp"
+#include "ops/subtract.hpp"
+#include "ops/tuple.hpp"
+#include "runtime/eigen/add.hpp"
+#include "runtime/eigen/external_function.hpp"
+#include "runtime/eigen/multiply.hpp"
+#include "runtime/eigen/return.hpp"
+#include "runtime/eigen/tensor_view.hpp"
+#include "runtime/call_frame.hpp"
+#include "function.hpp"
+#include "runtime/instruction.hpp"
+#include "runtime/tensor_view.hpp"
+#include "shape.hpp"
+#include "types/type.hpp"

src/ngraph/descriptor/tensor.cpp

-// ----------------------------------------------------------------------------
-// Copyright 2017 Nervana Systems Inc.
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// ----------------------------------------------------------------------------
-
-#include "ngraph/descriptor/tensor.hpp"
-#include "ngraph/node.hpp"
-
-using namespace ngraph;
-using namespace descriptor;
-
-Tensor::Tensor(const element::Type& element_type, PrimaryTensorView* primary_tensor_view,
-    const Node* parent, size_t value_index)
-    : m_element_type(element_type)
-    , m_primary_tensor_view(primary_tensor_view)
-    , m_is_output{false}
-    , m_is_input{parent->is_parameter()}
-    , m_is_persistent{false}
-    , m_name{parent->get_node_id()+"_"+std::to_string(value_index)}
-    , m_next_view_id{0}
-{
-}
-
-std::string Tensor::get_next_view_name()
-{
-    return m_name + "_TV" + std::to_string(m_next_view_id++);
-}
-
-std::ostream& ngraph::descriptor::operator<<(std::ostream& out, const Tensor& tensor)
-{
-    out << "Tensor(" << tensor.get_name() << ")";
-    return out;
-}

src/ngraph/ngraph.hpp

-// ----------------------------------------------------------------------------
-// Copyright 2017 Nervana Systems Inc.
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// ----------------------------------------------------------------------------
-
-//
-// The public API for ngraph++
-//
-
-#pragma once
-
-#include "ngraph/common.hpp"
-#include "ngraph/descriptor/buffer.hpp"
-#include "ngraph/descriptor/call_frame.hpp"
-#include "ngraph/descriptor/input.hpp"
-#include "ngraph/descriptor/output.hpp"
-#include "ngraph/descriptor/tensor.hpp"
-#include "ngraph/descriptor/tensor_view.hpp"
-#include "ngraph/descriptor/tensor_view_layout.hpp"
-#include "ngraph/element_type.hpp"
-#include "ngraph/except.hpp"
-#include "ngraph/function.hpp"
-#include "ngraph/node.hpp"
-#include "ngraph/op.hpp"
-#include "ngraph/ops/abs.hpp"
-#include "ngraph/ops/add.hpp"
-#include "ngraph/ops/broadcast.hpp"
-#include "ngraph/ops/ceiling.hpp"
-#include "ngraph/ops/concatenate.hpp"
-#include "ngraph/ops/constant.hpp"
-#include "ngraph/ops/convert.hpp"
-#include "ngraph/ops/divide.hpp"
-#include "ngraph/ops/dot.hpp"
-#include "ngraph/ops/equal.hpp"
-#include "ngraph/ops/exp.hpp"
-#include "ngraph/ops/floor.hpp"
-#include "ngraph/ops/greater.hpp"
-#include "ngraph/ops/less.hpp"
-#include "ngraph/ops/log.hpp"
-#include "ngraph/ops/maximum.hpp"
-#include "ngraph/ops/minimum.hpp"
-#include "ngraph/ops/multiply.hpp"
-#include "ngraph/ops/negative.hpp"
-#include "ngraph/ops/parameter.hpp"
-#include "ngraph/ops/power.hpp"
-#include "ngraph/ops/remainder.hpp"
-#include "ngraph/ops/subtract.hpp"
-#include "ngraph/ops/tuple.hpp"
-#include "ngraph/runtime/eigen/add.hpp"
-#include "ngraph/runtime/eigen/external_function.hpp"
-#include "ngraph/runtime/eigen/multiply.hpp"
-#include "ngraph/runtime/eigen/return.hpp"
-#include "ngraph/runtime/eigen/tensor_view.hpp"
-#include "ngraph/runtime/call_frame.hpp"
-#include "ngraph/function.hpp"
-#include "ngraph/runtime/instruction.hpp"
-#include "ngraph/runtime/tensor_view.hpp"
-#include "ngraph/shape.hpp"
-#include "ngraph/type.hpp"

src/ngraph/node.hpp → src/node.hpp

@@ -21,8 +21,8 @@
 
 #include <iostream>
 
-#include "ngraph/common.hpp"
-#include "ngraph/type.hpp"
+#include "common.hpp"
+#include "types/type.hpp"
 
 namespace ngraph
 {

src/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.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ops/binary_elementwise_builtin.cpp

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

src/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.hpp"
 
 using namespace std;
 using namespace ngraph;

src/ops/broadcast.cpp

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

src/ops/concatenate.cpp

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

src/ops/constant.cpp

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

src/ngraph/ops/constant.hpp → src/ops/constant.hpp

@@ -16,8 +16,8 @@
 
 #include <sstream>
 
-#include "ngraph/element_type.hpp"
-#include "ngraph/runtime/eigen/tensor_view.hpp"
+#include "types/element_type.hpp"
+#include "runtime/eigen/tensor_view.hpp"
 
 namespace ngraph
 {

src/ops/convert.cpp

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

src/ops/dot.cpp

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

src/ops/op.cpp

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

src/ngraph/op.hpp → src/ops/op.hpp

@@ -16,9 +16,9 @@
 
 #include <memory>
 
-#include "ngraph/node.hpp"
-#include "ngraph/ops/parameter.hpp"
-#include "ngraph/type.hpp"
+#include "node.hpp"
+#include "ops/parameter.hpp"
+#include "types/type.hpp"
 
 namespace ngraph
 {

src/ops/parameter.cpp

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

src/ngraph/ops/parameter.hpp → src/ops/parameter.hpp

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "ngraph/node.hpp"
-#include "ngraph/type.hpp"
+#include "node.hpp"
+#include "types/type.hpp"
 
 namespace ngraph
 {

src/ops/tuple.cpp

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

src/ops/unary_elementwise_arithmetic.cpp

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

src/ops/unary_elementwise_builtin.cpp

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

src/ngraph/pass/assign_tensors.cpp → src/pass/assign_tensors.cpp

@@ -18,7 +18,7 @@
 #include <sstream>
 
 #include "log.hpp"
-#include "ngraph/ngraph.hpp"
+#include "ngraph.hpp"
 #include "propagate_types.hpp"
 
 using namespace std;

src/ngraph/pass/dump_sorted.cpp → src/pass/dump_sorted.cpp

@@ -15,7 +15,7 @@
 #include <fstream>
 
 #include "dump_sorted.hpp"
-#include "ngraph/ngraph.hpp"
+#include "ngraph.hpp"
 #include "util.hpp"
 
 using namespace ngraph;

src/ngraph/pass/liveness.cpp → src/pass/liveness.cpp

@@ -17,9 +17,9 @@
 #include <unordered_set>
 
 #include "log.hpp"
-#include "ngraph/ngraph.hpp"
-#include "ngraph/pass/assign_tensors.hpp"
-#include "ngraph/pass/liveness.hpp"
+#include "ngraph.hpp"
+#include "pass/assign_tensors.hpp"
+#include "pass/liveness.hpp"
 #include "util.hpp"
 #include "log.hpp"
 

src/ngraph/pass/liveness.hpp → src/pass/liveness.hpp

@@ -15,7 +15,7 @@
 #pragma once
 
 #include "call_pass.hpp"
-#include "ngraph/descriptor/tensor.hpp"
+#include "descriptor/tensor.hpp"
 
 namespace ngraph
 {

src/ngraph/pass/manager.cpp → src/pass/manager.cpp

@@ -17,7 +17,7 @@
 
 #include "log.hpp"
 #include "manager.hpp"
-#include "ngraph/node.hpp"
+#include "node.hpp"
 
 using namespace std;
 

src/ngraph/pass/memory_layout.cpp → src/pass/memory_layout.cpp

@@ -16,9 +16,9 @@
 #include <sstream>
 
 #include "log.hpp"
-#include "ngraph/ngraph.hpp"
-#include "ngraph/pass/liveness.hpp"
-#include "ngraph/pass/memory_layout.hpp"
+#include "ngraph.hpp"
+#include "pass/liveness.hpp"
+#include "pass/memory_layout.hpp"
 #include "log.hpp"
 
 using namespace std;

src/ngraph/pass/propagate_types.cpp → src/pass/propagate_types.cpp

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

src/ngraph/pass/topological_sort.cpp → src/pass/topological_sort.cpp

@@ -16,8 +16,8 @@
 #include <unordered_map>
 
 #include "log.hpp"
-#include "ngraph/node.hpp"
-#include "ngraph/pass/topological_sort.hpp"
+#include "node.hpp"
+#include "pass/topological_sort.hpp"
 #include "util.hpp"
 
 using namespace ngraph;

src/ngraph/pass/topological_sort.hpp → src/pass/topological_sort.hpp

@@ -17,7 +17,7 @@
 #include <list>
 #include <memory>
 
-#include "ngraph/pass/tree_pass.hpp"
+#include "pass/tree_pass.hpp"
 
 namespace ngraph
 {

src/ngraph/pass/visualize_tree.cpp → src/pass/visualize_tree.cpp

@@ -15,7 +15,7 @@
 #include <fstream>
 
 #include "visualize_tree.hpp"
-#include "ngraph/node.hpp"
+#include "node.hpp"
 #include "util.hpp"
 
 using namespace ngraph;

src/ngraph/pass/visualize_tree.hpp → src/pass/visualize_tree.hpp

@@ -18,7 +18,7 @@
 #include <string>
 #include <set>
 
-#include "ngraph/pass/tree_pass.hpp"
+#include "pass/tree_pass.hpp"
 
 namespace ngraph
 {

src/ngraph/runtime/call_frame.cpp → src/runtime/call_frame.cpp

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

src/ngraph/runtime/call_frame.hpp → src/runtime/call_frame.hpp

@@ -17,9 +17,9 @@
 #include <memory>
 #include <vector>
 
-#include "ngraph/runtime/tensor_view.hpp"
-#include "ngraph/function.hpp"
-#include "ngraph/runtime/instruction.hpp"
+#include "runtime/tensor_view.hpp"
+#include "function.hpp"
+#include "runtime/instruction.hpp"
 
 namespace ngraph
 {

src/ngraph/runtime/eigen/add.hpp → src/runtime/eigen/add.hpp

@@ -14,9 +14,9 @@
 
 #pragma once
 
-#include "ngraph/runtime/call_frame.hpp"
-#include "ngraph/runtime/eigen/tensor_view.hpp"
-#include "ngraph/runtime/instruction.hpp"
+#include "runtime/call_frame.hpp"
+#include "runtime/eigen/tensor_view.hpp"
+#include "runtime/instruction.hpp"
 
 namespace ngraph
 {

src/ngraph/runtime/eigen/external_function.cpp → src/runtime/eigen/external_function.cpp

@@ -18,17 +18,17 @@
 #include <typeinfo>
 #include <unordered_map>
 
-#include "ngraph/descriptor/input.hpp"
-#include "ngraph/descriptor/output.hpp"
-#include "ngraph/function.hpp"
-#include "ngraph/node.hpp"
-#include "ngraph/ops/add.hpp"
-#include "ngraph/ops/multiply.hpp"
-#include "ngraph/pass/topological_sort.hpp"
-#include "ngraph/runtime/eigen/add.hpp"
-#include "ngraph/runtime/eigen/external_function.hpp"
-#include "ngraph/runtime/eigen/multiply.hpp"
-#include "ngraph/runtime/eigen/return.hpp"
+#include "descriptor/input.hpp"
+#include "descriptor/output.hpp"
+#include "function.hpp"
+#include "node.hpp"
+#include "ops/add.hpp"
+#include "ops/multiply.hpp"
+#include "pass/topological_sort.hpp"
+#include "runtime/eigen/add.hpp"
+#include "runtime/eigen/external_function.hpp"
+#include "runtime/eigen/multiply.hpp"
+#include "runtime/eigen/return.hpp"
 
 using namespace std;
 using namespace ngraph::runtime::eigen;

src/ngraph/runtime/eigen/external_function.hpp → src/runtime/eigen/external_function.hpp

@@ -19,7 +19,7 @@
 #include <typeinfo>
 #include <unordered_map>
 
-#include "ngraph/function.hpp"
+#include "function.hpp"
 
 namespace ngraph
 {

src/ngraph/runtime/eigen/multiply.hpp → src/runtime/eigen/multiply.hpp

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "ngraph/runtime/call_frame.hpp"
-#include "ngraph/runtime/instruction.hpp"
+#include "runtime/call_frame.hpp"
+#include "runtime/instruction.hpp"
 
 namespace ngraph
 {

src/ngraph/runtime/eigen/return.hpp → src/runtime/eigen/return.hpp

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "ngraph/runtime/call_frame.hpp"
-#include "ngraph/runtime/instruction.hpp"
+#include "runtime/call_frame.hpp"
+#include "runtime/instruction.hpp"
 
 namespace ngraph
 {

src/ngraph/runtime/eigen/tensor_view.hpp → src/runtime/eigen/tensor_view.hpp

@@ -17,9 +17,9 @@
 #include <Eigen/Dense>
 #include <vector>
 
-#include "ngraph/shape.hpp"
-#include "ngraph/runtime/tensor_view.hpp"
-#include "ngraph/descriptor/tensor_view.hpp"
+#include "shape.hpp"
+#include "runtime/tensor_view.hpp"
+#include "descriptor/tensor_view.hpp"
 
 namespace ngraph
 {

src/ngraph/shape.cpp → src/shape.cpp

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

src/types/element_type.cpp

@@ -16,7 +16,7 @@
 #include <cmath>
 #include <iostream>
 
-#include "ngraph/element_type.hpp"
+#include "element_type.hpp"
 #include "log.hpp"
 
 using namespace ngraph;

src/ngraph/element_type.hpp → src/types/element_type.hpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <type_traits>
 
-#include "ngraph/except.hpp"
+#include "except.hpp"
 
 namespace ngraph
 {

src/types/type.cpp

@@ -14,7 +14,7 @@
 
 #include <memory>
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph.hpp"
 #include "log.hpp"
 #include "util.hpp"
 

src/ngraph/type.hpp → src/types/type.hpp

@@ -17,8 +17,8 @@
 #include <memory>
 #include <vector>
 
-#include "ngraph/element_type.hpp"
-#include "ngraph/shape.hpp"
+#include "types/element_type.hpp"
+#include "shape.hpp"
 
 namespace ngraph
 {

src/util.cpp

@@ -19,7 +19,7 @@
 #include <unordered_set>
 
 #include "util.hpp"
-#include "ngraph/node.hpp"
+#include "node.hpp"
 #include "log.hpp"
 
 using namespace std;

src/ngraph/visualize.cpp → src/visualize.cpp

@@ -16,8 +16,8 @@
 #include <fstream>
 #include <list>
 
-#include "ngraph/node.hpp"
-#include "ngraph/visualize.hpp"
+#include "node.hpp"
+#include "visualize.hpp"
 #include "util.hpp"
 
 using namespace ngraph;

test/build_graph.cpp

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

test/element_type.cpp

@@ -18,6 +18,6 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/element_type.hpp"
+#include "types/element_type.hpp"
 
 using namespace ngraph;

test/execute.cpp

@@ -14,7 +14,7 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph.hpp"
 
 using namespace std;
 using namespace ngraph;

test/input_output_assign.cpp

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

test/op.cpp

@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph.hpp"
 
 using namespace std;
 using namespace ngraph;

test/pass_liveness.cpp

@@ -19,15 +19,15 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/pass/liveness.hpp"
-#include "ngraph/pass/assign_tensors.hpp"
-#include "ngraph/pass/manager.hpp"
-#include "ngraph/pass/propagate_types.hpp"
-#include "ngraph/pass/topological_sort.hpp"
-#include "ngraph/pass/liveness.hpp"
-#include "ngraph/pass/visualize_tree.hpp"
-#include "ngraph/pass/dump_sorted.hpp"
-#include "ngraph/ngraph.hpp"
+#include "pass/liveness.hpp"
+#include "pass/assign_tensors.hpp"
+#include "pass/manager.hpp"
+#include "pass/propagate_types.hpp"
+#include "pass/topological_sort.hpp"
+#include "pass/liveness.hpp"
+#include "pass/visualize_tree.hpp"
+#include "pass/dump_sorted.hpp"
+#include "ngraph.hpp"
 #include "test_tools.hpp"
 #include "log.hpp"
 

test/pass_manager.cpp

@@ -19,11 +19,11 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/ngraph.hpp"
-#include "ngraph/pass/assign_tensors.hpp"
-#include "ngraph/pass/manager.hpp"
-#include "ngraph/pass/propagate_types.hpp"
-#include "ngraph/pass/topological_sort.hpp"
+#include "ngraph.hpp"
+#include "pass/assign_tensors.hpp"
+#include "pass/manager.hpp"
+#include "pass/propagate_types.hpp"
+#include "pass/topological_sort.hpp"
 #include "test_tools.hpp"
 
 using namespace ngraph;

test/pass_memory_layout.cpp

@@ -19,8 +19,8 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/ngraph.hpp"
-#include "ngraph/pass/memory_layout.hpp"
+#include "ngraph.hpp"
+#include "pass/memory_layout.hpp"
 #include "test_tools.hpp"
 
 using namespace ngraph;

test/runtime.cpp

@@ -17,7 +17,7 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph.hpp"
 
 using namespace std;
 using namespace ngraph;

test/shape.cpp

@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/ngraph.hpp"
+#include "ngraph.hpp"
 
 using namespace std;
 using namespace ngraph;

test/test_tools.cpp

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

test/topological_sort.cpp

@@ -19,9 +19,9 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph/ngraph.hpp"
-#include "ngraph/pass/topological_sort.hpp"
-#include "ngraph/visualize.hpp"
+#include "ngraph.hpp"
+#include "pass/topological_sort.hpp"
+#include "visualize.hpp"
 #include "util.hpp"
 #include "log.hpp"
 #include "test_tools.hpp"

test/type_prop.cpp

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