Imported Upstream version 0.3upstream/0.3

1 files changed, 18 insertions, 19 deletions

diff --git a/runtimes/neurun/src/kernel/cpu/MaxPoolLayer.cc b/runtimes/neurun/src/kernel/cpu/MaxPoolLayer.cc
index 3d96bb401..c4a288b07 100644
--- a/runtimes/neurun/src/kernel/cpu/MaxPoolLayer.cc
+++ b/runtimes/neurun/src/kernel/cpu/MaxPoolLayer.cc
@@ -26,14 +26,14 @@ namespace kernel
 namespace cpu
 {
 
-#define MAXPOOLING_PARAMETERS                               \
-  uint32_t height = getSizeOfDimension(_inputShape, 1);     \
-  uint32_t width = getSizeOfDimension(_inputShape, 2);      \
-  uint32_t outHeight = getSizeOfDimension(_outputShape, 1); \
-  uint32_t outWidth = getSizeOfDimension(_outputShape, 2);  \
-                                                            \
-  uint32_t paddingHeight = (uint32_t)_paddingTop;           \
-  uint32_t paddingWidth = (uint32_t)_paddingLeft;
+#define MAXPOOLING_PARAMETERS                            \
+  tflite::PoolParams op_params;                          \
+  op_params.stride_height = _strideHeight;               \
+  op_params.stride_width = _strideWidth;                 \
+  op_params.filter_height = _kernelHeight;               \
+  op_params.filter_width = _kernelWidth;                 \
+  op_params.padding_values.height = (int8_t)_paddingTop; \
+  op_params.padding_values.width = (int8_t)_paddingLeft;
 
 MaxPoolLayer::MaxPoolLayer()
     : _inputData(nullptr), _outputData(nullptr), _inputShape(), _outputShape(), _paddingLeft(0),
@@ -46,31 +46,30 @@ MaxPoolLayer::MaxPoolLayer()
 
 bool MaxPoolLayer::maxPoolFloat32()
 {
-
   MAXPOOLING_PARAMETERS
   float output_activation_min, output_activation_max;
   CalculateActivationRangeFloat(_activation, &output_activation_min, &output_activation_max);
+  op_params.float_activation_min = output_activation_min;
+  op_params.float_activation_max = output_activation_max;
 
-  ::tflite::optimized_ops::MaxPool(
-      reinterpret_cast<const float *>(_inputData), convertShapeToDims(_inputShape), _strideWidth,
-      _strideHeight, paddingWidth, paddingHeight, _kernelWidth, _kernelHeight,
-      output_activation_min, output_activation_max, reinterpret_cast<float *>(_outputData),
-      convertShapeToDims(_outputShape));
+  ::tflite::optimized_ops::MaxPool(op_params, convertShapeToTFLiteShape(_inputShape),
+                                   reinterpret_cast<const float *>(_inputData),
+                                   convertShapeToTFLiteShape(_outputShape),
+                                   reinterpret_cast<float *>(_outputData));
   return true;
 }
 bool MaxPoolLayer::maxPoolQuant8()
 {
-
   MAXPOOLING_PARAMETERS
   int32_t output_activation_min = 0;
   int32_t output_activation_max = 0;
   CalculateActivationRangeUint8(_activation, _outputShape, &output_activation_min,
                                 &output_activation_max);
+  op_params.quantized_activation_min = output_activation_min;
+  op_params.quantized_activation_max = output_activation_max;
 
-  ::tflite::optimized_ops::MaxPool(_inputData, convertShapeToDims(_inputShape), _strideWidth,
-                                   _strideHeight, paddingWidth, paddingHeight, _kernelWidth,
-                                   _kernelHeight, output_activation_min, output_activation_max,
-                                   _outputData, convertShapeToDims(_outputShape));
+  ::tflite::optimized_ops::MaxPool(op_params, convertShapeToTFLiteShape(_inputShape), _inputData,
+                                   convertShapeToTFLiteShape(_outputShape), _outputData);
   return true;
 }