Introduce BATCH_TO_SPACE_ND in runtime. (#3058)

This patch introduces BATCH_TO_SPACE_ND in PACL runtime.

Signed-off-by: prasannar <prasanna.r@samsung.com>

diff --git a/runtimes/pure_arm_compute/src/compilation.cc b/runtimes/pure_arm_compute/src/compilation.cc
index af062c8..f4f0aa4 100644 (file)
--- a/runtimes/pure_arm_compute/src/compilation.cc
+++ b/runtimes/pure_arm_compute/src/compilation.cc
@@ -496,6 +496,7 @@ public:
   void visit(const ::internal::tflite::op::Pad::Node &node) override;
   void visit(const ::internal::tflite::op::SpaceToDepth::Node &node) override;
   void visit(const ::internal::tflite::op::SpaceToBatchND::Node &node) override;
+  void visit(const ::internal::tflite::op::BatchToSpaceNd::Node &node) override;
   void visit(const ::internal::tflite::op::L2Pool2D::Implicit::Node &node) override;
   void visit(const ::internal::tflite::op::L2Pool2D::Explicit::Node &node) override;
   void visit(const ::internal::tflite::op::EmbeddingLookup::Node &node) override;
@@ -3652,6 +3653,12 @@ void Planner::visit(const ::internal::tflite::op::SpaceToBatchND::Node &node)
   _builder.addStage(stage);
 }
 
+void Planner::visit(const ::internal::tflite::op::BatchToSpaceNd::Node &node)
+{
+  // TODO Implement BatchToSpace op
+  throw std::runtime_error("Not supported, yet");
+}
+
 void Planner::visit(const ::internal::tflite::op::L2Normalization::Node &node)
 {
   const ::internal::tflite::operand::Index ofm_index{node.param().ofm_index};

diff --git a/runtimes/pure_arm_compute/src/internal/op/BatchToSpaceNd.cc b/runtimes/pure_arm_compute/src/internal/op/BatchToSpaceNd.cc
new file mode 100644 (file)
index 0000000..a4e0e2d
--- /dev/null
+++ b/runtimes/pure_arm_compute/src/internal/op/BatchToSpaceNd.cc
@@ -0,0 +1,64 @@
+/*Copyright (c) 2018 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 <iostream>
+#include "internal/op/BatchToSpaceNd.h"
+#include "internal/op/NodeVisitor.h"
+
+#include <cassert>
+
+namespace internal
+{
+namespace tflite
+{
+namespace op
+{
+namespace BatchToSpaceNd
+{
+
+void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
+
+} // namespace BatchToSpaceNd
+} // namespace op
+} // namespace tflite
+} // namespace internal
+
+namespace internal
+{
+namespace tflite
+{
+namespace op
+{
+namespace BatchToSpaceNd
+{
+
+Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount,
+             const uint32_t *outputs)
+{
+  assert(inputCount == 2 && outputCount == 1);
+
+  output_index = outputs[0];
+
+  // Each input should be interpreted as follows:
+  //
+  //  0 -> Input Tensor Index
+  //  1 -> Block size Index
+  input_index = inputs[0];
+  block_size_index = inputs[1];
+}
+
+} // namespace BatchToSpaceNd
+} // namespace op
+} // namespace tflite
+} // namespace internal

diff --git a/runtimes/pure_arm_compute/src/internal/op/BatchToSpaceNd.h b/runtimes/pure_arm_compute/src/internal/op/BatchToSpaceNd.h
new file mode 100644 (file)
index 0000000..a514cb4
--- /dev/null
+++ b/runtimes/pure_arm_compute/src/internal/op/BatchToSpaceNd.h
@@ -0,0 +1,83 @@
+/*
+ * Copyright (c) 2018 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.
+ */
+
+#ifndef __INTERNAL_OP_BATCHTOSPACE_ND_H__
+#define __INTERNAL_OP_BATCHTOSPACE_ND_H__
+
+#include "internal/op/Node.h"
+
+#include <cstdint>
+
+namespace internal
+{
+namespace tflite
+{
+namespace op
+{
+namespace BatchToSpaceNd
+{
+
+struct Param
+{
+  int32_t output_index;
+
+  int32_t input_index;
+  int32_t block_size_index;
+
+  Param() = default;
+  Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, const uint32_t *outputs);
+};
+
+} // namespace BatchToSpaceNd
+} // namespace op
+} // namespace tflite
+} // namespace internal
+
+namespace internal
+{
+namespace tflite
+{
+namespace op
+{
+namespace BatchToSpaceNd
+{
+class Node final : public op::Node
+{
+public:
+  Node(const Param &param) : _param(param)
+  {
+    // DO NOTHING
+  }
+
+public:
+  virtual ~Node() = default;
+
+public:
+  const Param &param(void) const { return _param; }
+
+public:
+  void accept(NodeVisitor &&) const override;
+
+private:
+  const Param _param;
+};
+
+} // namespace BatchToSpaceNd
+} // namespace op
+} // namespace tflite
+} // namespace internal
+
+#endif // __INTERNAL_OP_BATCHTOSPACE_Nd_H__

diff --git a/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h b/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h
index 099c4f9..fbaea00 100644 (file)
--- a/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h
+++ b/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h
@@ -63,6 +63,7 @@
 #include "internal/op/Exp.h"
 #include "internal/op/ReduceSum.h"
 #include "internal/op/Equal.h"
+#include "internal/op/BatchToSpaceNd.h"
 #include "internal/op/TransposeConv.h"
 #include "internal/op/Abs.h"
 
@@ -128,6 +129,7 @@ struct NodeVisitor
   virtual void visit(const Exp::Node &) = 0;
   virtual void visit(const ReduceSum::Node &) = 0;
   virtual void visit(const Equal::Node &) = 0;
+  virtual void visit(const BatchToSpaceNd::Node &) = 0;
   virtual void visit(const TransposeConv::Node &) = 0;
   virtual void visit(const Abs::Node &) = 0;
 };

diff --git a/runtimes/pure_arm_compute/src/model.cc b/runtimes/pure_arm_compute/src/model.cc
index 706c8e6..900d010 100644 (file)
--- a/runtimes/pure_arm_compute/src/model.cc
+++ b/runtimes/pure_arm_compute/src/model.cc
@@ -613,6 +613,17 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model,
 
       break;
     }
+    case ANEURALNETWORKS_BATCH_TO_SPACE_ND:
+    {
+      using internal::tflite::op::BatchToSpaceNd::Param;
+      using internal::tflite::op::BatchToSpaceNd::Node;
+
+      auto &operations = model->deref().operations();
+
+      operations.emplace_back<Node>(Param{inputCount, inputs, outputCount, outputs});
+
+      break;
+    }
     case ANEURALNETWORKS_L2_POOL_2D:
     {
       // Input count is 7 for Implicit Padding