Merge pull request #133 from NervanaSystems/cconvey/move_src_under_ngraph

Moves src tree under `ngraph` dir

CMakeLists.txt

@@ -13,6 +13,10 @@
 
 cmake_minimum_required (VERSION 2.8)
 
+set(NGRAPH_INCLUDE_PATH
+    ${CMAKE_CURRENT_SOURCE_DIR}/src
+)
+
 # Suppress an OS X-specific warning.
 if (POLICY CMP0042)
     cmake_policy(SET CMP0042 OLD)

src/CMakeLists.txt

@@ -11,122 +11,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-include_directories(SYSTEM ${EIGEN_INCLUDE_DIR})
+add_subdirectory( ngraph )
 
-set (SRC
-    log.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
-    ops/broadcast.cpp
-    ops/concatenate.cpp
-    ops/constant.cpp
-    ops/convert.cpp
-    ops/dot.cpp
-    ops/op.cpp
-    ops/parameter.cpp
-    ops/tuple.cpp
-    ops/unary_elementwise_arithmetic.cpp
-    ops/unary_elementwise_builtin.cpp
-    tree.cpp
-    types/element_type.cpp
-    types/type.cpp
-    util.cpp
-    )
-
-set(NGRAPH_INCLUDE_PATH
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/ngraph
-)
-
-# find_program (GRAPHVIZ dot)
-# message (STATUS "graphviz '${GRAPHVIZ}'")
-find_package(Graphviz)
-if (GRAPHVIZ_FOUND)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGRAPHVIZ_FOUND")
-endif()
-
-include_directories("${NGRAPH_INCLUDE_PATH}")
-
-add_library(ngraph SHARED ${SRC})
-target_include_directories(ngraph PUBLIC "${NGRAPH_INCLUDE_PATH}")
-
-if (APPLE)
-    set_property(TARGET ngraph PROPERTY PREFIX "lib")
-    set_property(TARGET ngraph PROPERTY OUTPUT_NAME "ngraph.so")
-    set_property(TARGET ngraph PROPERTY SUFFIX "")
-endif()
-
-#-----------------------------------------------------------------------------------------------
-# Installation logic...
-#-----------------------------------------------------------------------------------------------
-
-# Default installation location for cmake usually is /usr/include or /usr/local/include
-# which requires sudo access on most servers. Also, this creates a problem for the shared
-# development systems (e.g., build servers).
-#
-# Therefore we are setting the installation directory so that by defult "make install"
-# won't override artifacts generated by other users.
-#
-# The user can always override this by using the cmake command listed below.
-set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/ngraph_dist" CACHE PATH "Install directory" FORCE)
-message (STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}")
-message (STATUS "To Override use: cmake -DCMAKE_INSTALL_PREFIX=/foo -P cmake_install.cmake")
-
-# Destinations
-set(CMAKE_INSTALL_LIB "${CMAKE_INSTALL_PREFIX}/lib")
-set(CMAKE_INSTALL_INCLUDE "${CMAKE_INSTALL_PREFIX}/include")
-
-# NGraph
-install(TARGETS ngraph DESTINATION ${CMAKE_INSTALL_LIB})  # libngraph.so
-install(DIRECTORY
-    ${CMAKE_CURRENT_SOURCE_DIR}/
-    DESTINATION "${CMAKE_INSTALL_INCLUDE}"
-    FILES_MATCHING PATTERN "*.hpp"
-)
-
-# External
-# Requirements:
-# - In NGraph, there are multiple include paths set for different external projects.
-# - However, we want one single include path for external projects from the TF bridge side, while
-#   making sure that the `#include` files can still be resolved.
-# - Therefore, when `make install`, the include directory will be "flattened" for each external
-#   projects respectively.
-
-install(DIRECTORY
-    ${EIGEN_INCLUDE_DIR}/
-    DESTINATION "${CMAKE_INSTALL_INCLUDE}"
-)
-install(DIRECTORY
-    ${MKLDNN_INCLUDE_DIR}/
-    DESTINATION "${CMAKE_INSTALL_INCLUDE}"
-)
-install(DIRECTORY
-    ${MKLDNN_LIB_DIR}/
-    DESTINATION "${CMAKE_INSTALL_LIB}"
-)
-
-add_dependencies(ngraph eigen)

src/ngraph/CMakeLists.txt

+# 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
+# limitations under the License.
+
+set (SRC
+    log.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
+    ops/broadcast.cpp
+    ops/concatenate.cpp
+    ops/constant.cpp
+    ops/convert.cpp
+    ops/dot.cpp
+    ops/op.cpp
+    ops/parameter.cpp
+    ops/tuple.cpp
+    ops/unary_elementwise_arithmetic.cpp
+    ops/unary_elementwise_builtin.cpp
+    tree.cpp
+    types/element_type.cpp
+    types/type.cpp
+    util.cpp
+    )
+
+# find_program (GRAPHVIZ dot)
+# message (STATUS "graphviz '${GRAPHVIZ}'")
+find_package(Graphviz)
+if (GRAPHVIZ_FOUND)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGRAPHVIZ_FOUND")
+endif()
+
+include_directories(
+    "${NGRAPH_INCLUDE_PATH}"
+    "${EIGEN_INCLUDE_DIR}"
+    "${MKLDNN_INCLUDE_DIR}"
+    )
+
+add_library(ngraph SHARED ${SRC})
+target_include_directories(ngraph PUBLIC "${NGRAPH_INCLUDE_PATH}")
+
+if (APPLE)
+    set_property(TARGET ngraph PROPERTY PREFIX "lib")
+    set_property(TARGET ngraph PROPERTY OUTPUT_NAME "ngraph.so")
+    set_property(TARGET ngraph PROPERTY SUFFIX "")
+endif()
+
+#-----------------------------------------------------------------------------------------------
+# Installation logic...
+#-----------------------------------------------------------------------------------------------
+
+# Default installation location for cmake usually is /usr/include or /usr/local/include
+# which requires sudo access on most servers. Also, this creates a problem for the shared
+# development systems (e.g., build servers).
+#
+# Therefore we are setting the installation directory so that by defult "make install"
+# won't override artifacts generated by other users.
+#
+# The user can always override this by using the cmake command listed below.
+set(CMAKE_INSTALL_PREFIX "$ENV{HOME}/ngraph_dist" CACHE PATH "Install directory" FORCE)
+message (STATUS "Installation directory: ${CMAKE_INSTALL_PREFIX}")
+message (STATUS "To Override use: cmake -DCMAKE_INSTALL_PREFIX=/foo -P cmake_install.cmake")
+
+# Destinations
+set(CMAKE_INSTALL_LIB "${CMAKE_INSTALL_PREFIX}/lib")
+set(CMAKE_INSTALL_INCLUDE "${CMAKE_INSTALL_PREFIX}/include")
+
+# NGraph
+install(TARGETS ngraph DESTINATION ${CMAKE_INSTALL_LIB})  # libngraph.so
+install(DIRECTORY
+    ${CMAKE_CURRENT_SOURCE_DIR}/
+    DESTINATION "${CMAKE_INSTALL_INCLUDE}/ngraph"
+    FILES_MATCHING PATTERN "*.hpp"
+)
+
+# External
+# Requirements:
+# - In NGraph, there are multiple include paths set for different external projects.
+# - However, we want one single include path for external projects from the TF bridge side, while
+#   making sure that the `#include` files can still be resolved.
+# - Therefore, when `make install`, the include directory will be "flattened" for each external
+#   projects respectively.
+
+install(DIRECTORY
+    ${EIGEN_INCLUDE_DIR}/
+    DESTINATION "${CMAKE_INSTALL_INCLUDE}"
+)
+install(DIRECTORY
+    ${MKLDNN_INCLUDE_DIR}/
+    DESTINATION "${CMAKE_INSTALL_INCLUDE}"
+)
+install(DIRECTORY
+    ${MKLDNN_LIB_DIR}/
+    DESTINATION "${CMAKE_INSTALL_LIB}"
+)
+
+add_dependencies(ngraph eigen)

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

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

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

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

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

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

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

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

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

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

src/descriptor/tensor.cpp → src/ngraph/descriptor/tensor.cpp

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "descriptor/tensor.hpp"
-#include "node.hpp"
+#include "ngraph/descriptor/tensor.hpp"
+#include "ngraph/node.hpp"
 
 namespace ngraph
 {

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

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

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

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

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

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

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

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

src/log.cpp → src/ngraph/log.cpp

@@ -21,7 +21,7 @@
 #include <mutex>
 #include <thread>
 
-#include "log.hpp"
+#include "ngraph/log.hpp"
 
 using namespace std;
 

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

@@ -18,51 +18,51 @@
 
 #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"
+#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/types/element_type.hpp"
+#include "ngraph/except.hpp"
+#include "ngraph/function.hpp"
+#include "ngraph/node.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/op.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/types/type.hpp"

src/node.cpp → src/ngraph/node.cpp

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

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

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

src/ops/binary_elementwise_arithmetic.cpp → src/ngraph/ops/binary_elementwise_arithmetic.cpp

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

src/ops/binary_elementwise_builtin.cpp → src/ngraph/ops/binary_elementwise_builtin.cpp

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

src/ops/binary_elementwise_comparison.cpp → src/ngraph/ops/binary_elementwise_comparison.cpp

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

src/ops/broadcast.cpp → src/ngraph/ops/broadcast.cpp

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

src/ops/concatenate.cpp → src/ngraph/ops/concatenate.cpp

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

src/ops/constant.cpp → src/ngraph/ops/constant.cpp

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

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

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

src/ops/convert.cpp → src/ngraph/ops/convert.cpp

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

src/ops/dot.cpp → src/ngraph/ops/dot.cpp

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

src/ops/op.cpp → src/ngraph/ops/op.cpp

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

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

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

src/ops/parameter.cpp → src/ngraph/ops/parameter.cpp

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

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

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

src/ops/tuple.cpp → src/ngraph/ops/tuple.cpp

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

src/ops/unary_elementwise_arithmetic.cpp → src/ngraph/ops/unary_elementwise_arithmetic.cpp

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

src/ops/unary_elementwise_builtin.cpp → src/ngraph/ops/unary_elementwise_builtin.cpp

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

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

@@ -12,14 +12,14 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "assign_tensors.hpp"
+#include "ngraph/pass/assign_tensors.hpp"
 
 #include <exception>
 #include <sstream>
 
-#include "log.hpp"
-#include "ngraph.hpp"
-#include "propagate_types.hpp"
+#include "ngraph/log.hpp"
+#include "ngraph/ngraph.hpp"
+#include "ngraph/pass/propagate_types.hpp"
 
 using namespace std;
 using namespace ngraph;

src/pass/assign_tensors.hpp → src/ngraph/pass/assign_tensors.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "call_pass.hpp"
+#include "ngraph/pass/call_pass.hpp"
 
 namespace ngraph
 {

src/pass/call_pass.cpp → src/ngraph/pass/call_pass.cpp

@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "call_pass.hpp"
+#include "ngraph/pass/call_pass.hpp"

src/pass/call_pass.hpp → src/ngraph/pass/call_pass.hpp

@@ -18,7 +18,7 @@
 #include <memory>
 #include <vector>
 
-#include "pass.hpp"
+#include "ngraph/pass/pass.hpp"
 
 namespace ngraph
 {

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

@@ -14,9 +14,9 @@
 
 #include <fstream>
 
-#include "dump_sorted.hpp"
-#include "ngraph.hpp"
-#include "util.hpp"
+#include "ngraph/pass/dump_sorted.hpp"
+#include "ngraph/ngraph.hpp"
+#include "ngraph/util.hpp"
 
 using namespace ngraph;
 using namespace std;

src/pass/dump_sorted.hpp → src/ngraph/pass/dump_sorted.hpp

@@ -16,7 +16,7 @@
 
 #include <string>
 
-#include "call_pass.hpp"
+#include "ngraph/pass/call_pass.hpp"
 
 namespace ngraph
 {

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

@@ -16,12 +16,12 @@
 #include <sstream>
 #include <unordered_set>
 
-#include "log.hpp"
-#include "ngraph.hpp"
-#include "pass/assign_tensors.hpp"
-#include "pass/liveness.hpp"
-#include "util.hpp"
-#include "log.hpp"
+#include "ngraph/log.hpp"
+#include "ngraph/ngraph.hpp"
+#include "ngraph/pass/assign_tensors.hpp"
+#include "ngraph/pass/liveness.hpp"
+#include "ngraph/util.hpp"
+#include "ngraph/log.hpp"
 
 using namespace std;
 using namespace ngraph;

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

@@ -14,8 +14,8 @@
 
 #pragma once
 
-#include "call_pass.hpp"
-#include "descriptor/tensor.hpp"
+#include "ngraph/pass/call_pass.hpp"
+#include "ngraph/descriptor/tensor.hpp"
 
 namespace ngraph
 {

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

@@ -15,9 +15,9 @@
 #include <iostream>
 #include <memory>
 
-#include "log.hpp"
-#include "manager.hpp"
-#include "node.hpp"
+#include "ngraph/log.hpp"
+#include "ngraph/pass/manager.hpp"
+#include "ngraph/node.hpp"
 
 using namespace std;
 

src/pass/manager.hpp → src/ngraph/pass/manager.hpp

@@ -16,8 +16,8 @@
 
 #include <vector>
 
-#include "call_pass.hpp"
-#include "tree_pass.hpp"
+#include "ngraph/pass/call_pass.hpp"
+#include "ngraph/pass/tree_pass.hpp"
 
 namespace ngraph
 {

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

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

src/pass/memory_layout.hpp → src/ngraph/pass/memory_layout.hpp

@@ -18,7 +18,7 @@
 #include <list>
 #include <sstream>
 
-#include "call_pass.hpp"
+#include "ngraph/pass/call_pass.hpp"
 
 namespace ngraph
 {

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

@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "pass.hpp"
+#include "ngraph/pass/pass.hpp"

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

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

src/pass/propagate_types.hpp → src/ngraph/pass/propagate_types.hpp

@@ -14,7 +14,7 @@
 
 #pragma once
 
-#include "call_pass.hpp"
+#include "ngraph/pass/call_pass.hpp"
 
 namespace ngraph
 {

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

@@ -15,10 +15,10 @@
 #include <deque>
 #include <unordered_map>
 
-#include "log.hpp"
-#include "node.hpp"
-#include "pass/topological_sort.hpp"
-#include "util.hpp"
+#include "ngraph/log.hpp"
+#include "ngraph/node.hpp"
+#include "ngraph/pass/topological_sort.hpp"
+#include "ngraph/util.hpp"
 
 using namespace ngraph;
 using namespace std;

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

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

src/pass/tree_pass.cpp → src/ngraph/pass/tree_pass.cpp

@@ -12,4 +12,4 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "tree_pass.hpp"
+#include "ngraph/pass/tree_pass.hpp"

src/pass/tree_pass.hpp → src/ngraph/pass/tree_pass.hpp

@@ -18,7 +18,7 @@
 #include <memory>
 #include <vector>
 
-#include "pass.hpp"
+#include "ngraph/pass/pass.hpp"
 
 namespace ngraph
 {

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

@@ -14,9 +14,9 @@
 
 #include <fstream>
 
-#include "visualize_tree.hpp"
-#include "node.hpp"
-#include "util.hpp"
+#include "ngraph/pass/visualize_tree.hpp"
+#include "ngraph/node.hpp"
+#include "ngraph/util.hpp"
 
 using namespace ngraph;
 using namespace std;

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

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

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

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

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

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

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

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

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

@@ -18,17 +18,17 @@
 #include <typeinfo>
 #include <unordered_map>
 
-#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"
+#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"
 
 using namespace std;
 using namespace ngraph::runtime::eigen;

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

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

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

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

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

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

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

@@ -15,7 +15,7 @@
 #include <Eigen/Dense>
 #include <memory>
 
-#include "ngraph.hpp"
+#include "ngraph/ngraph.hpp"
 
 using namespace Eigen;
 using namespace ngraph::runtime::eigen;

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

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

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

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

src/shape.hpp → src/ngraph/shape.hpp

@@ -18,7 +18,7 @@
 #include <iostream>
 #include <vector>
 
-#include "common.hpp"
+#include "ngraph/common.hpp"
 
 namespace ngraph
 {

src/tree.cpp → src/ngraph/tree.cpp

-#include "tree.hpp"
-#include "util.hpp"
+#include "ngraph/tree.hpp"
+#include "ngraph/util.hpp"
 
 //================================================================================================
 //

src/tree.hpp → src/ngraph/tree.hpp

@@ -6,7 +6,7 @@
 #include <iostream>
 #include <vector>
 
-#include "util.hpp"
+#include "ngraph/util.hpp"
 
 namespace ngraph
 {

src/types/element_type.cpp → src/ngraph/types/element_type.cpp

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

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

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

src/types/type.cpp → src/ngraph/types/type.cpp

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

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

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

src/util.cpp → src/ngraph/util.cpp

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

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

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

test/build_graph.cpp

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

test/element_type.cpp

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

test/execute.cpp

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

test/input_output_assign.cpp

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

test/main.cpp

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

test/ngraph.cpp

@@ -19,8 +19,8 @@
 #include <vector>
 
 #include "gtest/gtest.h"
-#include "log.hpp"
-#include "ngraph.hpp"
+#include "ngraph/log.hpp"
+#include "ngraph/ngraph.hpp"
 
 using namespace std;
 

test/op.cpp

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

test/pass_liveness.cpp

@@ -19,17 +19,18 @@
 
 #include "gtest/gtest.h"
 
-#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 "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 "ngraph/log.hpp"
+
 #include "test_tools.hpp"
-#include "log.hpp"
 
 using namespace std;
 using namespace ngraph;

test/pass_manager.cpp

@@ -19,11 +19,11 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph.hpp"
-#include "pass/assign_tensors.hpp"
-#include "pass/manager.hpp"
-#include "pass/propagate_types.hpp"
-#include "pass/topological_sort.hpp"
+#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 "test_tools.hpp"
 
 using namespace ngraph;

test/pass_memory_layout.cpp

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

test/runtime.cpp

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

test/shape.cpp

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

test/test_tools.cpp

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

test/topological_sort.cpp

@@ -19,11 +19,11 @@
 
 #include "gtest/gtest.h"
 
-#include "ngraph.hpp"
-#include "pass/topological_sort.hpp"
-#include "visualize.hpp"
-#include "util.hpp"
-#include "log.hpp"
+#include "ngraph/ngraph.hpp"
+#include "ngraph/pass/topological_sort.hpp"
+#include "ngraph/visualize.hpp"
+#include "ngraph/util.hpp"
+#include "ngraph/log.hpp"
 #include "test_tools.hpp"
 
 using namespace std;

test/type_prop.cpp

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

test/util.cpp

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

test/uuid.cpp

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