[Pure CL] Inheric nnfw::utils::tensor::Shape (#1438)

This commit revises internal::tflite::operand::Shape to inherit
nnfw::utils::tensor::Shape (to reduce code duplication).

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/runtimes/pure_arm_compute/src/internal/Model.cc b/runtimes/pure_arm_compute/src/internal/Model.cc
index cd0e06d..04b2d8e 100644 (file)
--- a/runtimes/pure_arm_compute/src/internal/Model.cc
+++ b/runtimes/pure_arm_compute/src/internal/Model.cc
@@ -9,7 +9,10 @@ namespace tflite
 namespace operand
 {
 
-Shape::Shape(uint32_t rank) { _dims.resize(rank); }
+Shape::Shape(uint32_t rank) : nnfw::util::tensor::Shape(rank)
+{
+  // DO NOTHING
+}
 
 int32_t Shape::asVector(void) const
 {

diff --git a/runtimes/pure_arm_compute/src/internal/Model.h b/runtimes/pure_arm_compute/src/internal/Model.h
index 1750f92..c5e1e1e 100644 (file)
--- a/runtimes/pure_arm_compute/src/internal/Model.h
+++ b/runtimes/pure_arm_compute/src/internal/Model.h
@@ -32,6 +32,7 @@ private:
 
 #include "util/feature/Shape.h"
 #include "util/kernel/Shape.h"
+#include "util/tensor/Shape.h"
 
 namespace internal
 {
@@ -40,25 +41,15 @@ namespace tflite
 namespace operand
 {
 
-struct Shape
+struct Shape : public nnfw::util::tensor::Shape
 {
 public:
   Shape(uint32_t rank);
 
 public:
-  uint32_t rank(void) const { return _dims.size(); }
-
-public:
-  int32_t dim(uint32_t n) const { return _dims.at(n); }
-  int32_t &dim(uint32_t n) { return _dims.at(n); }
-
-public:
   int32_t asVector(void) const;
   nnfw::util::feature::Shape asFeature(void) const;
   nnfw::util::kernel::Shape asKernel(void) const;
-
-private:
-  std::vector<int32_t> _dims;
 };
 
 } // namespace operand