diff options
| author | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-01-15 12:39:56 +0000 |
|---|---|---|
| committer | Sang-Hoon Park <sang-hoon.park@arm.com> | 2020-01-17 11:07:38 +0000 |
| commit | 0cb3da671b652641deff909a21f6e45a550452f1 (patch) | |
| tree | 0b90345b0c39288140a602104fd1b79ae07239b2 /tests | |
| parent | 0a958cbb48816a074303ae218a90414fb619efed (diff) | |
| download | ComputeLibrary-0cb3da671b652641deff909a21f6e45a550452f1.tar.gz | |
COMPMID-2985 change PoolingLayerInfo to struct
Change-Id: I489205c2b65ec82c6d3da4df39c356a53265556b
Signed-off-by: Sang-Hoon Park <sang-hoon.park@arm.com>
Reviewed-on: https://review.mlplatform.org/c/2597
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/validation/reference/PoolingLayer.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
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 <typename T, typename ACC_T, typename std::enable_if<is_floating_point< SimpleTensor<T> pooling_layer_internal(const SimpleTensor<T> &src, const PoolingLayerInfo &info, const QuantizationInfo &output_qinfo) { ARM_COMPUTE_UNUSED(output_qinfo); // requantization occurs in pooling_layer<uint8_t> - 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<T> 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<int>(src.shape()[0]); const auto h_src = static_cast<int>(src.shape()[1]); @@ -183,7 +183,7 @@ SimpleTensor<int8_t> pooling_layer<int8_t>(const SimpleTensor<int8_t> &src, cons template <> SimpleTensor<half> pooling_layer(const SimpleTensor<half> &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<half, float>(src, info, output_qinfo); } |