Merge pull request #120 from NervanaSystems/cyphers/abc

Function execution

src/CMakeLists.txt

@@ -19,6 +19,7 @@ set (SRC
     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
@@ -31,6 +32,7 @@ set (SRC
     ngraph/pass/topological_sort.cpp
     ngraph/pass/tree_pass.cpp
     ngraph/runtime/call_frame.cpp
+    ngraph/runtime/eigen/external_function.cpp
     ngraph/runtime/eigen/tensor_view.cpp
     ngraph/shape.cpp
     ngraph/visualize.cpp
@@ -42,7 +44,6 @@ set (SRC
     ops/constant.cpp
     ops/convert.cpp
     ops/dot.cpp
-    ops/function.cpp
     ops/op.cpp
     ops/parameter.cpp
     ops/tuple.cpp

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

@@ -12,12 +12,14 @@
 // See the License for the specific language governing permissions and
 // ----------------------------------------------------------------------------
 
-#include "ngraph/ngraph.hpp"
+#include <memory>
+
+#include "ngraph/function.hpp"
 
 using namespace std;
 using namespace ngraph;
 
-Function::Function(const std::shared_ptr<Node>&                           result,
+Function::Function(const std::shared_ptr<Node>&                       result,
                    const std::vector<std::shared_ptr<op::Parameter>>& parameters)
     : m_result(result)
     , m_parameters(parameters)

src/ngraph/function.hpp

@@ -14,9 +14,11 @@
 
 #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"
 
 namespace ngraph
@@ -34,7 +36,6 @@ namespace ngraph
             return m_parameters;
         }
         std::string get_name() const { return m_name; }
-
     protected:
         std::shared_ptr<Node>                               m_result;
         std::vector<std::shared_ptr<ngraph::op::Parameter>> m_parameters;

src/ngraph/ngraph.hpp

@@ -56,6 +56,7 @@
 #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"

src/ngraph/runtime/call_frame.hpp

@@ -17,6 +17,7 @@
 #include <memory>
 #include <vector>
 
+#include "ngraph/runtime/tensor_view.hpp"
 #include "ngraph/function.hpp"
 #include "ngraph/runtime/instruction.hpp"
 
@@ -24,8 +25,6 @@ namespace ngraph
 {
     namespace runtime
     {
-        using PTVs = std::vector<std::shared_ptr<ngraph::runtime::PrimaryTensorView>>;
-
         class PrimaryTensorView;
 
         // A VM for executing lightly-compiled graph functions.
@@ -39,8 +38,8 @@ namespace ngraph
                 size_t                                                            initial_pc,
                 const std::shared_ptr<std::vector<std::shared_ptr<Instruction>>>& instructions);
 
-            void operator()(const PTVs& inputs, const PTVs& outpus);
-            void set_return() { m_return = true; }
+            void                               operator()(const PTVs& inputs, const PTVs& outpus);
+            void                               set_return() { m_return = true; }
             std::shared_ptr<PrimaryTensorView> get_tensor(size_t i) { return m_tensors[i]; }
 
         protected:

src/ngraph/runtime/eigen/add.hpp

@@ -15,6 +15,7 @@
 #pragma once
 
 #include "ngraph/runtime/call_frame.hpp"
+#include "ngraph/runtime/eigen/tensor_view.hpp"
 #include "ngraph/runtime/instruction.hpp"
 
 namespace ngraph

src/ngraph/runtime/eigen/external_function.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 <memory>
+#include <tuple>
+#include <typeindex>
+#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"
+
+using namespace std;
+using namespace ngraph::runtime::eigen;
+
+ExternalFunction::ExternalFunction()
+    : m_instructions(make_shared<std::vector<std::shared_ptr<ngraph::runtime::Instruction>>>())
+{
+}
+
+// Define code generators for handled ops.
+std::unordered_map<std::type_index,
+                   std::function<void(ngraph::Node*,
+                                      ExternalFunction*,
+                                      const std::vector<size_t>& inputs,
+                                      const std::vector<size_t>& outputs)>>&
+    ExternalFunction::get_op_map()
+{
+    static bool initialized = false;
+    static std::unordered_map<std::type_index,
+                              std::function<void(Node*,
+                                                 ExternalFunction*,
+                                                 const std::vector<size_t>& inputs,
+                                                 const std::vector<size_t>& outputs)>>
+        op_map;
+    if (!initialized)
+    {
+        op_map[type_index(typeid(op::Add))] = [](Node*                      n,
+                                                 ExternalFunction*          ef,
+                                                 const std::vector<size_t>& in,
+                                                 const std::vector<size_t>& out) {
+            ef->get_instructions()->push_back(
+                make_shared<runtime::eigen::AddInstruction<element::Float32>>(
+                    in[0], in[1], out[0]));
+        };
+
+        op_map[type_index(typeid(op::Multiply))] = [](Node*                      n,
+                                                      ExternalFunction*          ef,
+                                                      const std::vector<size_t>& in,
+                                                      const std::vector<size_t>& out) {
+            ef->get_instructions()->push_back(
+                make_shared<runtime::eigen::MultiplyInstruction<element::Float32>>(
+                    in[0], in[1], out[0]));
+        };
+
+        op_map[type_index(typeid(op::Parameter))] = [](Node*                      n,
+                                                       ExternalFunction*          ef,
+                                                       const std::vector<size_t>& in,
+                                                       const std::vector<size_t>& out) {};
+
+        initialized = true;
+    }
+    return op_map;
+}
+
+void ExternalFunction::compile(std::shared_ptr<ngraph::Function> f)
+{
+    // This will be replaced with the pass manager
+    // Get the ordered list of ops in execution order
+    pass::TopologicalSort ts;
+    ts.run_on_tree(f->get_result());
+    auto nodes = ts.get_call_graph();
+    // Types
+    for (auto node : nodes)
+    {
+        node->propagate_types();
+    }
+    // Determine tensors
+    for (auto node : nodes)
+    {
+        node->assign_tensors();
+    }
+
+    // Determine tensor requirements for  the call frame
+    unordered_map<shared_ptr<ngraph::descriptor::TensorView>, size_t> tensor_index;
+    // First come the function inputs
+    for (auto param : f->get_parameters())
+    {
+        for (auto output : param->get_outputs())
+        {
+            auto   tv        = output.get_tensor_view();
+            size_t index     = tensor_index.size();
+            tensor_index[tv] = index;
+        }
+    }
+    m_n_inputs = tensor_index.size();
+
+    // Next are the function outputs
+    for (auto output : f->get_result()->get_outputs())
+    {
+        auto   tv        = output.get_tensor_view();
+        size_t index     = tensor_index.size();
+        tensor_index[tv] = index;
+    }
+    m_n_outputs = tensor_index.size() - m_n_inputs;
+
+    // All remaining tensor views
+    for (auto node : nodes)
+    {
+        for (auto output : node->get_outputs())
+        {
+            auto tv = output.get_tensor_view();
+            if (0 == tensor_index.count(tv))
+            {
+                size_t index     = tensor_index.size();
+                tensor_index[tv] = index;
+                m_temp_views.push_back(tv);
+            }
+        }
+    }
+
+    // Now we build the eigen-VM instructions
+    auto op_map = get_op_map();
+    for (auto node : nodes)
+    {
+        auto handler_it = op_map.find(type_index(typeid(*node)));
+        if (handler_it == op_map.end())
+        {
+            throw ngraph_error("Unhandled op during code generation");
+        }
+        std::vector<size_t> in;
+        for (auto input : node->get_inputs())
+        {
+            auto output = input.get_output();
+            auto tv     = output.get_tensor_view();
+            in.push_back(tensor_index.at(tv));
+        }
+        std::vector<size_t> out;
+        for (auto output : node->get_outputs())
+        {
+            auto tv = output.get_tensor_view();
+            out.push_back(tensor_index.at(tv));
+        }
+        handler_it->second(node, this, in, out);
+    }
+    m_instructions->push_back(make_shared<runtime::eigen::ReturnInstruction>());
+}
+
+shared_ptr<ngraph::runtime::CallFrame> ExternalFunction::make_call_frame()
+{
+    std::vector<std::shared_ptr<ngraph::runtime::PrimaryTensorView>> temps;
+    for (auto tv : m_temp_views)
+    {
+        temps.push_back(ngraph::runtime::eigen::make_tensor_view(tv));
+    }
+    return make_shared<ngraph::runtime::CallFrame>(
+        m_n_inputs, m_n_outputs, temps, 0, m_instructions);
+}

src/ngraph/runtime/eigen/external_function.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
+// ----------------------------------------------------------------------------
+
+#pragma once
+
+#include <memory>
+#include <typeindex>
+#include <typeinfo>
+#include <unordered_map>
+
+#include "ngraph/function.hpp"
+
+namespace ngraph
+{
+    namespace runtime
+    {
+        namespace eigen
+        {
+            class ExternalFunction
+            {
+            public:
+                ExternalFunction();
+
+                void compile(std::shared_ptr<ngraph::Function> f);
+                std::shared_ptr<ngraph::runtime::CallFrame> make_call_frame();
+                std::shared_ptr<std::vector<std::shared_ptr<ngraph::runtime::Instruction>>>
+                    get_instructions()
+                {
+                    return m_instructions;
+                }
+
+            protected:
+                size_t m_n_inputs;
+                size_t m_n_outputs;
+                std::shared_ptr<std::vector<std::shared_ptr<ngraph::runtime::Instruction>>>
+                                                                             m_instructions;
+                std::vector<std::shared_ptr<ngraph::descriptor::TensorView>> m_temp_views;
+
+                static std::unordered_map<std::type_index,
+                                          std::function<void(ngraph::Node*,
+                                                             ExternalFunction*,
+                                                             const std::vector<size_t>& inputs,
+                                                             const std::vector<size_t>& outputs)>>&
+                    get_op_map();
+            };
+        }
+    }
+}

src/ngraph/runtime/eigen/tensor_view.cpp

@@ -13,6 +13,7 @@
 // ----------------------------------------------------------------------------
 
 #include <Eigen/Dense>
+#include <memory>
 
 #include "ngraph.hpp"
 
@@ -27,3 +28,11 @@ template void ngraph::runtime::eigen::add<Float32>(const PrimaryTensorView<Float
 template void ngraph::runtime::eigen::multiply<Float32>(const PrimaryTensorView<Float32>& arg0,
                                                         const PrimaryTensorView<Float32>& arg1,
                                                         PrimaryTensorView<Float32>&       out);
+
+std::shared_ptr<ngraph::runtime::PrimaryTensorView> ngraph::runtime::eigen::make_tensor_view(
+    std::shared_ptr<ngraph::descriptor::TensorView> tensor_view)
+{
+    // For now, we only support Float32 primary tensor views
+    return std::make_shared<PrimaryTensorView<Float32>>(
+        tensor_view->get_tensor_view_type()->get_shape());
+}

src/ngraph/runtime/eigen/tensor_view.hpp

@@ -19,6 +19,7 @@
 
 #include "ngraph/shape.hpp"
 #include "ngraph/runtime/tensor_view.hpp"
+#include "ngraph/descriptor/tensor_view.hpp"
 
 namespace ngraph
 {
@@ -26,6 +27,8 @@ namespace ngraph
     {
         namespace eigen
         {
+            std::shared_ptr<ngraph::runtime::PrimaryTensorView> make_tensor_view(std::shared_ptr<ngraph::descriptor::TensorView>);
+
             template <typename ET>
             class PrimaryTensorView : public ngraph::runtime::PrimaryTensorView
             {

src/ngraph/runtime/tensor_view.hpp

@@ -22,7 +22,9 @@ namespace ngraph
         class PrimaryTensorView
         {
         public:
-            virtual ~PrimaryTensorView(){}
+            virtual ~PrimaryTensorView() {}
         };
+
+        using PTVs = std::vector<std::shared_ptr<ngraph::runtime::PrimaryTensorView>>;
     }
 }

src/ngraph/type.hpp

@@ -30,6 +30,12 @@ namespace ngraph
     ///   | TupleType(ValueType[])
     class ValueType
     {
+        ValueType(const ValueType&) = delete;
+        ValueType& operator=(const ValueType&) = delete;
+
+    protected:
+        ValueType() {}
+
     public:
         virtual ~ValueType() {}
         virtual bool operator==(const ValueType& that) const = 0;
@@ -48,7 +54,8 @@ namespace ngraph
         /// /param element_type The type of the tensor elements.
         /// /param shape The shape of the tensor.
         TensorViewType(const element::Type& element_type, const Shape& shape)
-            : m_element_type(element_type)
+            : ValueType()
+            , m_element_type(element_type)
             , m_shape(shape)
         {
         }

test/CMakeLists.txt

@@ -25,6 +25,7 @@ set (SRC
     build_graph.cpp
     eigen.cpp
     element_type.cpp
+    execute.cpp
     input_output_assign.cpp
     main.cpp
     op.cpp

test/execute.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 "gtest/gtest.h"
+
+#include "ngraph/ngraph.hpp"
+
+using namespace std;
+using namespace ngraph;
+
+TEST(execute, test_abc)
+{
+    auto shape = Shape{2, 2};
+    auto A     = make_shared<op::Parameter>(element::Float32::element_type(), shape);
+    auto B     = make_shared<op::Parameter>(element::Float32::element_type(), shape);
+    auto C     = make_shared<op::Parameter>(element::Float32::element_type(), shape);
+    auto f     = make_shared<Function>(make_shared<op::Multiply>(make_shared<op::Add>(A, B), C),
+                                   op::Parameters{A, B, C});
+
+    auto external = make_shared<ngraph::runtime::eigen::ExternalFunction>();
+    external->compile(f);
+    auto cf = external->make_call_frame();
+
+    // Create some tensors for input/output
+    auto a      = make_shared<runtime::eigen::PrimaryTensorView<element::Float32>>(shape);
+    *a          = vector<float>{1, 2, 3, 4};
+    auto b      = make_shared<runtime::eigen::PrimaryTensorView<element::Float32>>(shape);
+    *b          = vector<float>{5, 6, 7, 8};
+    auto c      = make_shared<runtime::eigen::PrimaryTensorView<element::Float32>>(shape);
+    *c          = vector<float>{9, 10, 11, 12};
+    auto result = make_shared<runtime::eigen::PrimaryTensorView<element::Float32>>(shape);
+
+    (*cf)(runtime::PTVs{a, b, c}, runtime::PTVs{result});
+    ASSERT_EQ((vector<float>{54, 80, 110, 144}), result->get_vector());
+
+    (*cf)(runtime::PTVs{b, a, c}, runtime::PTVs{result});
+    ASSERT_EQ((vector<float>{54, 80, 110, 144}), result->get_vector());
+
+    (*cf)(runtime::PTVs{a, c, b}, runtime::PTVs{result});
+    ASSERT_EQ((vector<float>{50, 72, 98, 128}), result->get_vector());
+}

test/type_prop.cpp

@@ -351,7 +351,7 @@ TEST(type_prop, comparison_good)
     auto tv0_2_4_param_1 = make_shared<op::Parameter>(
         make_shared<TensorViewType>(element::Float32::element_type(), Shape{2, 4}));
     auto eq = make_shared<op::Equal>(tv0_2_4_param_0,tv0_2_4_param_1);
-    auto expected_type = TensorViewType(element::Bool::element_type(), Shape{2, 4});
+    TensorViewType expected_type{element::Bool::element_type(), Shape{2, 4}};
     eq->propagate_types();
     EXPECT_EQ(*eq->get_value_type(),expected_type);
 }