[locomotiv] Implement Push node execution (#3408)

This commit implements Push node execution and introduces related tests.

Signed-off-by: Cheongyo Bahk <ch.bahk@samsung.com>

diff --git a/contrib/locomotiv/CMakeLists.txt b/contrib/locomotiv/CMakeLists.txt
index d3a64a4..08846b3 100644 (file)
--- a/contrib/locomotiv/CMakeLists.txt
+++ b/contrib/locomotiv/CMakeLists.txt
@@ -21,6 +21,7 @@ endif(NOT ENABLE_TEST)
 nncc_find_package(GTest REQUIRED)
 
 GTest_AddTest(locomotiv_test ${TESTS})
+target_include_directories(locomotiv_test PRIVATE src)
 target_link_libraries(locomotiv_test locomotiv)
 
 add_test(locomotiv_test locomotiv_test)

diff --git a/contrib/locomotiv/src/Node/Push.cpp b/contrib/locomotiv/src/Node/Push.cpp
index c4c5fcd..1d545f7 100644 (file)
--- a/contrib/locomotiv/src/Node/Push.cpp
+++ b/contrib/locomotiv/src/Node/Push.cpp
@@ -16,15 +16,43 @@
 
 #include "NodeExecution.h"
 
+#include "NodeDataImpl.h"
+
 #include <stdexcept>
 
 namespace locomotiv
 {
 
-void NodeExecution::execute(loco::Push *)
+void NodeExecution::execute(loco::Push *push)
 {
-  // to be filled
-  throw std::runtime_error("NYI");
+  auto from_data = annot_data(push->from());
+
+  if (!from_data)
+  {
+    throw std::runtime_error("Ingredient not ready");
+  }
+
+  switch (from_data->dtype())
+  {
+  case loco::DataType::S32:
+  {
+    auto from_bufptr = from_data->as_s32_bufptr();
+    auto push_data = make_data(*from_bufptr);
+    erase_annot_data(push);
+    annot_data(push, std::move(push_data));
+    return;
+  }
+  case loco::DataType::FLOAT32:
+  {
+    auto from_bufptr = from_data->as_f32_bufptr();
+    auto push_data = make_data(*from_bufptr);
+    erase_annot_data(push);
+    annot_data(push, std::move(push_data));
+    return;
+  }
+  default:
+    throw std::runtime_error("NYI for this DataType");
+  }
 }
 
 } // namespace locomotiv

diff --git a/contrib/locomotiv/src/Node/Push.test.cpp b/contrib/locomotiv/src/Node/Push.test.cpp
new file mode 100644 (file)
index 0000000..6393d5a
--- /dev/null
+++ b/contrib/locomotiv/src/Node/Push.test.cpp
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2019 Samsung Electronics Co., Ltd. All Rights Reserved
+ *
+ * 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.
+ */
+
+#include "NodeExecution.h"
+
+#include "locomotiv/NodeData.h"
+#include "NodeDataImpl.h"
+
+#include <nncc/core/ADT/tensor/Shape.h>
+#include <nncc/core/ADT/tensor/Buffer.h>
+#include <nncc/core/ADT/tensor/LexicalLayout.h>
+
+#include <gtest/gtest.h>
+
+using nncc::core::ADT::tensor::Index;
+using nncc::core::ADT::tensor::Shape;
+using nncc::core::ADT::tensor::LexicalLayout;
+using nncc::core::ADT::tensor::make_buffer;
+
+TEST(NodeExecution_Push, s32)
+{
+  // Make pull-push graph
+  auto g = loco::make_graph();
+  auto pull = g->nodes()->create<loco::Pull>();
+  pull->dtype(loco::DataType::S32);
+  pull->rank(1);
+  pull->dim(0) = loco::make_dimension(1);
+  auto push = g->nodes()->create<loco::Push>();
+  push->from(pull);
+
+  // Make and assign data to pull node
+  auto pull_buf = make_buffer<int32_t, LexicalLayout>(Shape{1});
+  pull_buf.at(Index{0}) = 42;
+  auto pull_data = locomotiv::make_data(pull_buf);
+  locomotiv::annot_data(pull, std::move(pull_data));
+
+  locomotiv::NodeExecution::get().run(push);
+
+  auto push_data = locomotiv::annot_data(push);
+  ASSERT_NE(push_data, nullptr);
+  ASSERT_EQ(push_data->dtype(), loco::DataType::S32);
+  ASSERT_EQ(*(push_data->shape()), Shape{1});
+  ASSERT_EQ(push_data->as_s32_bufptr()->at(Index{0}), pull_buf.at(Index{0}));
+}
+
+TEST(NodeExecution_Push, f32)
+{
+  // Make pull-push graph
+  auto g = loco::make_graph();
+  auto pull = g->nodes()->create<loco::Pull>();
+  pull->dtype(loco::DataType::FLOAT32);
+  pull->rank(1);
+  pull->dim(0) = loco::make_dimension(1);
+  auto push = g->nodes()->create<loco::Push>();
+  push->from(pull);
+
+  // Make and assign data to pull node
+  auto pull_buf = make_buffer<float, LexicalLayout>(Shape{1});
+  pull_buf.at(Index{0}) = 3.14f;
+  auto pull_data = locomotiv::make_data(pull_buf);
+  locomotiv::annot_data(pull, std::move(pull_data));
+
+  locomotiv::NodeExecution::get().run(push);
+
+  auto push_data = locomotiv::annot_data(push);
+  ASSERT_NE(push_data, nullptr);
+  ASSERT_EQ(push_data->dtype(), loco::DataType::FLOAT32);
+  ASSERT_EQ(*(push_data->shape()), Shape{1});
+  ASSERT_FLOAT_EQ(push_data->as_f32_bufptr()->at(Index{0}), pull_buf.at(Index{0}));
+}