diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2017-08-24 19:02:44 +0100 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:35:24 +0000 |
| commit | dc460f13ee65e27b2a428e44c2d80afb1f516a99 (patch) | |
| tree | 14eddbb68fb653f4b85e89ab54b070a4d99afcdd /src/core/NEON/kernels/NEPoolingLayerKernel.cpp | |
| parent | 32982d8129f53b612021660d3007e80a52d18898 (diff) | |
| download | ComputeLibrary-dc460f13ee65e27b2a428e44c2d80afb1f516a99.tar.gz | |
COMPMID-417: Port PoolingLayer to new validation.
Change-Id: I7f2f5f5f81ad9932661fc4c660bf90614288bc96
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/85270
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'src/core/NEON/kernels/NEPoolingLayerKernel.cpp')
| -rw-r--r-- | src/core/NEON/kernels/NEPoolingLayerKernel.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/core/NEON/kernels/NEPoolingLayerKernel.cpp b/src/core/NEON/kernels/NEPoolingLayerKernel.cpp index df56c23800..63c7c8ea47 100644 --- a/src/core/NEON/kernels/NEPoolingLayerKernel.cpp +++ b/src/core/NEON/kernels/NEPoolingLayerKernel.cpp @@ -111,9 +111,6 @@ void NEPoolingLayerKernel::configure(const ITensor *input, ITensor *output, cons ARM_COMPUTE_ERROR_ON_NULLPTR(output); ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(input, 1, DataType::QS8, DataType::QS16, DataType::F16, DataType::F32); - ARM_COMPUTE_ERROR_ON_DATA_TYPE_CHANNEL_NOT_IN(output, 1, DataType::QS8, DataType::QS16, DataType::F16, DataType::F32); - ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(input, output); - ARM_COMPUTE_ERROR_ON_MISMATCHING_FIXED_POINT(input, output); ARM_COMPUTE_ERROR_ON(supported_pool_sizes.find(pool_size) == supported_pool_sizes.end()); ARM_COMPUTE_ERROR_ON(7 == pool_size && input->info()->data_type() != DataType::F32); ARM_COMPUTE_ERROR_ON(pool_pad_x >= pool_size || pool_pad_y >= pool_size); @@ -341,7 +338,7 @@ void NEPoolingLayerKernel::pooling2_q8(const Window &window_input, const Window } if(pool_stride_x == 1) { - const qint8x8x2_t res = vzip_s8(lower_res, upper_res); + const qint8x8x2_t res = { { lower_res, upper_res } }; vst2_s8(reinterpret_cast<qint8_t *>(output.ptr()), res); } else @@ -405,7 +402,7 @@ void NEPoolingLayerKernel::pooling2_q16(const Window &window_input, const Window } if(pool_stride_x == 1) { - const qint16x4x2_t res = vzip_s16(lower_res, upper_res); + const qint16x4x2_t res = { { lower_res, upper_res } }; vst2_s16(reinterpret_cast<qint16_t *>(output.ptr()), res); } else |