COMPMID-417 - Adding support for rectangular kernels
Change-Id: I4dde0929bc689c83582b95856dd0253228125df2
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/78994
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
diff --git a/tests/validation/CL/PoolingLayer.cpp b/tests/validation/CL/PoolingLayer.cpp
index 1d0e745..dabc21e 100644
--- a/tests/validation/CL/PoolingLayer.cpp
+++ b/tests/validation/CL/PoolingLayer.cpp
@@ -82,9 +82,8 @@
const std::pair<unsigned int, unsigned int> scaled_dims = arm_compute::scaled_dimensions(in_shape.x(),
in_shape.y(),
pool_info.pool_size(),
- pool_info.pad_stride_info().stride().first, pool_info.pad_stride_info().stride().second,
- pool_info.pad_stride_info().pad().first, pool_info.pad_stride_info().pad().second,
- pool_info.pad_stride_info().round());
+ pool_info.pool_size(),
+ pool_info.pad_stride_info());
out_shape.set(0, scaled_dims.first);
out_shape.set(1, scaled_dims.second);
return out_shape;
diff --git a/tests/validation/NEON/ConvolutionLayerDirect.cpp b/tests/validation/NEON/ConvolutionLayerDirect.cpp
index 4e36e33..3ddb010 100644
--- a/tests/validation/NEON/ConvolutionLayerDirect.cpp
+++ b/tests/validation/NEON/ConvolutionLayerDirect.cpp
@@ -116,9 +116,8 @@
const std::pair<unsigned int, unsigned int> scaled_dims = arm_compute::scaled_dimensions(in_shape.x(),
in_shape.y(),
kernel_shape.x(),
- conv_info.stride().first, conv_info.stride().second,
- conv_info.pad().first, conv_info.pad().second,
- conv_info.round());
+ kernel_shape.y(),
+ conv_info);
out_shape.set(0, scaled_dims.first);
out_shape.set(1, scaled_dims.second);
out_shape.set(2, kernel_shape[3]);
diff --git a/tests/validation/NEON/PoolingLayer.cpp b/tests/validation/NEON/PoolingLayer.cpp
index 489c5b6..b29cd3e 100644
--- a/tests/validation/NEON/PoolingLayer.cpp
+++ b/tests/validation/NEON/PoolingLayer.cpp
@@ -99,9 +99,8 @@
const std::pair<unsigned int, unsigned int> scaled_dims = arm_compute::scaled_dimensions(in_shape.x(),
in_shape.y(),
pool_info.pool_size(),
- pool_info.pad_stride_info().stride().first, pool_info.pad_stride_info().stride().second,
- pool_info.pad_stride_info().pad().first, pool_info.pad_stride_info().pad().second,
- pool_info.pad_stride_info().round());
+ pool_info.pool_size(),
+ pool_info.pad_stride_info());
out_shape.set(0, scaled_dims.first);
out_shape.set(1, scaled_dims.second);
return out_shape;