Add Logistic operator in pure acl runtime (#2230)

* Add Logistic operator in pure acl runtime

Define Logistic namespace, node and param
Set parameter for Logistic in compilation step

Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
* Enable logistic_float_* in GeneratedTests

Enable below two GeneratedTests:
logistic_float_1
logistic_float_2

Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>

diff --git a/runtimes/pure_arm_compute/src/compilation.cc b/runtimes/pure_arm_compute/src/compilation.cc
index c07527c..f894d59 100644 (file)
--- a/runtimes/pure_arm_compute/src/compilation.cc
+++ b/runtimes/pure_arm_compute/src/compilation.cc
@@ -367,6 +367,7 @@ public:
   void visit(const ::internal::tflite::op::ReLU1::Node &node) override;
   void visit(const ::internal::tflite::op::ReLU6::Node &node) override;
   void visit(const ::internal::tflite::op::Tanh::Node &node) override;
+  void visit(const ::internal::tflite::op::Logistic::Node &node) override;
 
 private:
   const ::internal::tflite::operand::Set &_ctx;
@@ -2560,6 +2561,47 @@ void Planner::visit(const ::internal::tflite::op::Tanh::Node &node)
   _builder.addStage(stage);
 }
 
+void Planner::visit(const ::internal::tflite::op::Logistic::Node &node)
+{
+  VERBOSE(Logistic) << "Configure Logistic operation" << std::endl;
+
+  const ::internal::tflite::operand::Index ofm_index{node.param().ofm_index};
+  const ::internal::tflite::operand::Index ifm_index{node.param().ifm_index};
+
+  // Set shape constraints
+  _builder.addShapeConstr(ofm_index,
+                          asTensorInfo(_ctx.at(ofm_index).shape(), _ctx.at(ofm_index).type()));
+  _builder.addShapeConstr(ifm_index,
+                          asTensorInfo(_ctx.at(ifm_index).shape(), _ctx.at(ifm_index).type()));
+
+  struct Param
+  {
+    int ofm_index;
+    int ifm_index;
+  };
+
+  Param param;
+
+  param.ofm_index = ofm_index.asInt();
+  param.ifm_index = ifm_index.asInt();
+
+  auto stage = [param](const IAllocationContext &ctx, IExecutionBuilder &builder) {
+    auto ofm_alloc = ctx.at(::internal::tflite::operand::Index{param.ofm_index});
+    auto ifm_alloc = ctx.at(::internal::tflite::operand::Index{param.ifm_index});
+
+    const ::arm_compute::ActivationLayerInfo act_info{
+        ::arm_compute::ActivationLayerInfo::ActivationFunction::LOGISTIC};
+
+    auto fn = nnfw::make_unique<::arm_compute::CLActivationLayer>();
+
+    fn->configure(ifm_alloc, ofm_alloc, act_info);
+
+    builder.append("Logistic", std::move(fn));
+  };
+
+  _builder.addStage(stage);
+}
+
 class AllocationContext final : public IAllocationContext
 {
 public:

diff --git a/runtimes/pure_arm_compute/src/internal/op/Logistic.cc b/runtimes/pure_arm_compute/src/internal/op/Logistic.cc
new file mode 100644 (file)
index 0000000..c55f477
--- /dev/null
+++ b/runtimes/pure_arm_compute/src/internal/op/Logistic.cc
@@ -0,0 +1,47 @@
+#include "internal/op/Logistic.h"
+#include "internal/op/NodeVisitor.h"
+
+#include <cassert>
+
+namespace internal
+{
+namespace tflite
+{
+namespace op
+{
+namespace Logistic
+{
+
+void Node::accept(NodeVisitor &&v) const { v.visit(*this); }
+
+} // namespace Logistic
+} // namespace op
+} // namespace tflite
+} // namespace internal
+
+namespace internal
+{
+namespace tflite
+{
+namespace op
+{
+namespace Logistic
+{
+
+Param::Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount,
+             const uint32_t *outputs)
+{
+  assert(inputCount == 1 && outputCount == 1);
+
+  ofm_index = outputs[0];
+
+  // Each input should be interpreted as follows:
+  //
+  //  0 -> Input Tensor Index
+  ifm_index = inputs[0];
+}
+
+} // namespace Logistic
+} // namespace op
+} // namespace tflite
+} // namespace internal

diff --git a/runtimes/pure_arm_compute/src/internal/op/Logistic.h b/runtimes/pure_arm_compute/src/internal/op/Logistic.h
new file mode 100644 (file)
index 0000000..4024135
--- /dev/null
+++ b/runtimes/pure_arm_compute/src/internal/op/Logistic.h
@@ -0,0 +1,53 @@
+#ifndef __INTERNAL_OP_LOGISTIC_H__
+#define __INTERNAL_OP_LOGISTIC_H__
+
+#include "internal/op/Node.h"
+
+#include <cstdint>
+
+namespace internal
+{
+namespace tflite
+{
+namespace op
+{
+namespace Logistic
+{
+
+struct Param
+{
+  int32_t ofm_index;
+
+  int32_t ifm_index;
+
+  Param() = default;
+  Param(uint32_t inputCount, const uint32_t *inputs, uint32_t outputCount, const uint32_t *outputs);
+};
+
+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 Logistic
+} // namespace op
+} // namespace tflite
+} // namespace internal
+
+#endif // __INTERNAL_OP_LOGISTIC_H__

diff --git a/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h b/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h
index 2884957..f68fd19 100644 (file)
--- a/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h
+++ b/runtimes/pure_arm_compute/src/internal/op/NodeVisitor.h
@@ -25,6 +25,7 @@
 #include "internal/op/ReLU6.h"
 #include "internal/op/Tanh.h"
 #include "internal/op/Squeeze.h"
+#include "internal/op/Logistic.h"
 
 namespace internal
 {
@@ -65,6 +66,7 @@ struct NodeVisitor
   virtual void visit(const ReLU6::Node &) = 0;
   virtual void visit(const Tanh::Node &) = 0;
   virtual void visit(const Squeeze::Node &) = 0;
+  virtual void visit(const Logistic::Node &) = 0;
 };
 
 } // namespace op

diff --git a/runtimes/pure_arm_compute/src/model.cc b/runtimes/pure_arm_compute/src/model.cc
index 0ad9eec..5313df5 100644 (file)
--- a/runtimes/pure_arm_compute/src/model.cc
+++ b/runtimes/pure_arm_compute/src/model.cc
@@ -437,6 +437,18 @@ int ANeuralNetworksModel_addOperation(ANeuralNetworksModel *model,
 
       break;
     }
+    case ANEURALNETWORKS_LOGISTIC:
+    {
+      using internal::tflite::op::Logistic::Param;
+      using internal::tflite::op::Logistic::Node;
+
+      // Add 'operations'
+      auto &operations = model->deref().operations();
+
+      operations.emplace_back<Node>(Param{inputCount, inputs, outputCount, outputs});
+
+      break;
+    }
     default:
       throw std::runtime_error{"Not supported operation"};
   };

diff --git a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux
index bf2aea0..62009c8 100644 (file)
--- a/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux
+++ b/runtimes/tests/neural_networks_test/runtime_run_android_nn_test.skip.armv7l-linux
@@ -104,8 +104,6 @@ GeneratedTests.fully_connected_quant8_weights_as_inputs
 GeneratedTests.l2_pool_float_2
 GeneratedTests.l2_pool_float_large
 GeneratedTests.l2_pool_float
-GeneratedTests.logistic_float_1
-GeneratedTests.logistic_float_2
 GeneratedTests.logistic_quant8_1
 GeneratedTests.logistic_quant8_2
 GeneratedTests.max_pool_float_2