[neurun/cpu] Enable squeeze operation (#9057)

Enable squeeze operation on neurun cpu backend
Squeeze operation use reshape kernel

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/runtime/neurun/backend/cpu/KernelGenerator.cc b/runtime/neurun/backend/cpu/KernelGenerator.cc
index 0433121..53de721 100644 (file)
--- a/runtime/neurun/backend/cpu/KernelGenerator.cc
+++ b/runtime/neurun/backend/cpu/KernelGenerator.cc
@@ -309,6 +309,28 @@ void KernelGenerator::visit(const model::operation::Reshape &node)
   _execution_builder->append(std::move(fn));
 }
 
+void KernelGenerator::visit(const model::operation::Squeeze &node)
+{
+  const auto output_index{node.getOutputs().at(0)};
+  const auto input_index{node.getInputs().at(model::operation::Squeeze::Input::INPUT)};
+
+  const auto ofm_backend_descr = ::neurun::backend::cpu::kernel::getTensorDescriptor(
+      _ctx.at(output_index), _current_subg_layout);
+  const auto ifm_backend_descr = ::neurun::backend::cpu::kernel::getTensorDescriptor(
+      _ctx.at(input_index), _current_subg_layout);
+
+  auto output_alloc = _tensor_builder->at(output_index).get();
+  auto input_alloc = _tensor_builder->at(input_index).get();
+
+  // Squeeze can share same kernel with reshape
+  auto fn = nnfw::cpp14::make_unique<::neurun::backend::cpu::kernel::ReshapeLayer>();
+
+  fn->configure(input_alloc->buffer(), ifm_backend_descr, output_alloc->buffer(),
+                ofm_backend_descr);
+
+  _execution_builder->append(std::move(fn));
+}
+
 void KernelGenerator::visit(const model::operation::Softmax &node)
 {
   const auto output_index{node.getOutputs().at(0)};

diff --git a/runtime/neurun/backend/cpu/KernelGenerator.h b/runtime/neurun/backend/cpu/KernelGenerator.h
index 6aa1f7f..2753aee 100644 (file)
--- a/runtime/neurun/backend/cpu/KernelGenerator.h
+++ b/runtime/neurun/backend/cpu/KernelGenerator.h
@@ -48,6 +48,7 @@ public:
   void visit(const model::operation::FullyConnected &) override;
   void visit(const model::operation::Mul &) override;
   void visit(const model::operation::Reshape &) override;
+  void visit(const model::operation::Squeeze &) override;
   void visit(const model::operation::Softmax &) override;
   void visit(const model::operation::Add &) override;
   void visit(const model::operation::Sub &) override;

diff --git a/runtime/neurun/backend/cpu/ShapeFixer.cc b/runtime/neurun/backend/cpu/ShapeFixer.cc
index cb1e032..9f483ce 100644 (file)
--- a/runtime/neurun/backend/cpu/ShapeFixer.cc
+++ b/runtime/neurun/backend/cpu/ShapeFixer.cc
@@ -72,6 +72,8 @@ void ShapeFixer::visit(const model::operation::Mul &) { throw std::runtime_error
 
 void ShapeFixer::visit(const model::operation::Reshape &) { /* DO NOTHING */}
 
+void ShapeFixer::visit(const model::operation::Squeeze &) { /* DO NOTHING */}
+
 void ShapeFixer::visit(const model::operation::Softmax &) { /* DO NOTHING */}
 
 void ShapeFixer::visit(const model::operation::Gather &) { /* DO NOTHING */}

diff --git a/runtime/neurun/backend/cpu/ShapeFixer.h b/runtime/neurun/backend/cpu/ShapeFixer.h
index cc98712..d52b76a 100644 (file)
--- a/runtime/neurun/backend/cpu/ShapeFixer.h
+++ b/runtime/neurun/backend/cpu/ShapeFixer.h
@@ -46,6 +46,7 @@ public:
   void visit(const model::operation::FullyConnected &) override;
   void visit(const model::operation::Mul &) override;
   void visit(const model::operation::Reshape &) override;
+  void visit(const model::operation::Squeeze &) override;
   void visit(const model::operation::Softmax &) override;
   void visit(const model::operation::Add &) override;
   void visit(const model::operation::Gather &) override;

diff --git a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu
index 5f8d406..ac5f130 100644 (file)
--- a/tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu
+++ b/tests/nnapi/nnapi_gtest.skip.armv7l-linux.cpu
@@ -59,7 +59,6 @@ GeneratedTests.tanh_
 GeneratedTests.batch_to_space*
 GeneratedTests.div_*
 GeneratedTests.space_to_batch*
-GeneratedTests.squeeze*
 GeneratedTests.strided_slice*
 GeneratedTests.sub_broadcast*
 GeneratedTests.sub_quant*

diff --git a/tests/nnapi/nnapi_gtest.skip.x86_64-linux b/tests/nnapi/nnapi_gtest.skip.x86_64-linux
index 151b164..d990298 100644 (file)
--- a/tests/nnapi/nnapi_gtest.skip.x86_64-linux
+++ b/tests/nnapi/nnapi_gtest.skip.x86_64-linux
@@ -60,7 +60,6 @@ GeneratedTests.tanh_
 GeneratedTests.batch_to_space*
 GeneratedTests.div_*
 GeneratedTests.space_to_batch*
-GeneratedTests.squeeze*
 GeneratedTests.strided_slice*
 GeneratedTests.sub_broadcast*
 GeneratedTests.sub_quant*

diff --git a/tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt b/tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt
index bbb9b68..1c55a00 100644 (file)
--- a/tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt
+++ b/tests/scripts/neurun_frameworktest_list.armv7l.cpu.txt
@@ -8,5 +8,6 @@ softmax
 reshape/reshape1
 add
 logistic
+squeeze
 MODELS/inception_module
 MODELS/mobilenet

diff --git a/tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt b/tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt
index f486f2d..f9055c2 100644 (file)
--- a/tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt
+++ b/tests/scripts/neurun_frameworktest_list.x86-64.cpu.txt
@@ -6,6 +6,7 @@ fullyconnected/fc1
 max_pool_2d
 softmax
 reshape/reshape1
+squeeze
 add
 logistic
 MODELS/inception_module