From 0cb3da671b652641deff909a21f6e45a550452f1 Mon Sep 17 00:00:00 2001 From: Sang-Hoon Park Date: Wed, 15 Jan 2020 12:39:56 +0000 Subject: COMPMID-2985 change PoolingLayerInfo to struct Change-Id: I489205c2b65ec82c6d3da4df39c356a53265556b Signed-off-by: Sang-Hoon Park Reviewed-on: https://review.mlplatform.org/c/2597 Tested-by: Arm Jenkins Reviewed-by: Giorgio Arena Comments-Addressed: Arm Jenkins --- tests/validation/reference/PoolingLayer.cpp | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tests') diff --git a/tests/validation/reference/PoolingLayer.cpp b/tests/validation/reference/PoolingLayer.cpp index 40dd6fa505..8ba5e4270d 100644 --- a/tests/validation/reference/PoolingLayer.cpp +++ b/tests/validation/reference/PoolingLayer.cpp @@ -41,21 +41,21 @@ template pooling_layer_internal(const SimpleTensor &src, const PoolingLayerInfo &info, const QuantizationInfo &output_qinfo) { ARM_COMPUTE_UNUSED(output_qinfo); // requantization occurs in pooling_layer - ARM_COMPUTE_ERROR_ON(info.is_global_pooling() && (src.shape().x() != src.shape().y())); + ARM_COMPUTE_ERROR_ON(info.is_global_pooling && (src.shape().x() != src.shape().y())); // Create reference SimpleTensor dst{ compute_pool_shape(TensorInfo(src.shape(), 1, src.data_type()), info), src.data_type(), 1 }; - const int pool_size_x = info.is_global_pooling() ? src.shape().x() : info.pool_size().width; - const int pool_size_y = info.is_global_pooling() ? src.shape().y() : info.pool_size().height; - PoolingType type = info.pool_type(); - int pool_stride_x = info.pad_stride_info().stride().first; - int pool_stride_y = info.pad_stride_info().stride().second; - int pad_left = info.pad_stride_info().pad_left(); - int pad_top = info.pad_stride_info().pad_top(); - int pad_right = info.pad_stride_info().pad_right(); - int pad_bottom = info.pad_stride_info().pad_bottom(); - bool exclude_padding = info.exclude_padding(); + const int pool_size_x = info.is_global_pooling ? src.shape().x() : info.pool_size.width; + const int pool_size_y = info.is_global_pooling ? src.shape().y() : info.pool_size.height; + PoolingType type = info.pool_type; + int pool_stride_x = info.pad_stride_info.stride().first; + int pool_stride_y = info.pad_stride_info.stride().second; + int pad_left = info.pad_stride_info.pad_left(); + int pad_top = info.pad_stride_info.pad_top(); + int pad_right = info.pad_stride_info.pad_right(); + int pad_bottom = info.pad_stride_info.pad_bottom(); + bool exclude_padding = info.exclude_padding; const auto w_src = static_cast(src.shape()[0]); const auto h_src = static_cast(src.shape()[1]); @@ -183,7 +183,7 @@ SimpleTensor pooling_layer(const SimpleTensor &src, cons template <> SimpleTensor pooling_layer(const SimpleTensor &src, const PoolingLayerInfo &info, const QuantizationInfo &output_qinfo) { - if(src.data_type() == DataType::F16 && info.fp_mixed_precision()) + if(src.data_type() == DataType::F16 && info.fp_mixed_precision) { return pooling_layer_internal(src, info, output_qinfo); } -- cgit v1.2.1