Fix for Max_pool_float_* Gtest Failure (#2283)

This is fix for max_pool_float_*.Batches are now set correctly in arm_compute::tensorshape

Signed-off-by: Shubham <shub98.gupta@samsung.com>

diff --git a/runtimes/neurun/src/internal/Model.cc b/runtimes/neurun/src/internal/Model.cc
index 93fc365..015d8f4 100644 (file)
--- a/runtimes/neurun/src/internal/Model.cc
+++ b/runtimes/neurun/src/internal/Model.cc
@@ -27,13 +27,12 @@ nnfw::util::feature::Shape Shape::asFeature(void) const
   //  - Dimension(1) -> Height
   //  - Dimension(2) -> Width
   //  - Dimension(3) -> Depth
-  assert(dim(0) == 1);
-
+  const auto batch = dim(0);
   const auto depth = dim(3);
   const auto height = dim(1);
   const auto width = dim(2);
 
-  return nnfw::util::feature::Shape(depth, height, width);
+  return nnfw::util::feature::Shape(batch, depth, height, width);
 }
 
 nnfw::util::kernel::Shape Shape::asKernel(void) const

diff --git a/runtimes/pure_arm_compute/src/internal/arm_compute/Cast.h b/runtimes/pure_arm_compute/src/internal/arm_compute/Cast.h
index 35b07e9..4add3d7 100644 (file)
--- a/runtimes/pure_arm_compute/src/internal/arm_compute/Cast.h
+++ b/runtimes/pure_arm_compute/src/internal/arm_compute/Cast.h
@@ -12,7 +12,7 @@
 
 ::arm_compute::TensorShape asTensorShape(const nnfw::util::feature::Shape &shape)
 {
-  return ::arm_compute::TensorShape(shape.W, shape.H, shape.C, 1);
+  return ::arm_compute::TensorShape(shape.W, shape.H, shape.C, shape.N);
 }
 
 ::arm_compute::TensorShape asTensorShape(const nnfw::util::kernel::Shape &shape)