COMPMID-2336: Account for padding in NEIm2ColKernel for NHWC.
Change-Id: I494c4acc95cb431b1718ae62c1504522a115ba10
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1312
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Giuseppe Rossini <giuseppe.rossini@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
diff --git a/tests/validation/NEON/Im2Col.cpp b/tests/validation/NEON/Im2Col.cpp
index 0d00c0a..f4b2cc7 100644
--- a/tests/validation/NEON/Im2Col.cpp
+++ b/tests/validation/NEON/Im2Col.cpp
@@ -137,6 +137,68 @@
}
TEST_SUITE_END() // QASYMM8
+TEST_SUITE(SpecialCases)
+TEST_CASE(PaddedChannelNHWC, framework::DatasetMode::PRECOMMIT)
+{
+ // Const data
+ const TensorShape src_shape = TensorShape(7U, 27U, 13U);
+ const DataType data_type = DataType::F32;
+ const DataLayout data_layout = DataLayout::NHWC;
+ const bool has_bias = false;
+ const unsigned int num_groups = 1;
+ const Size2D spatial_kernel(3, 3);
+ const QuantizationInfo qinfo{};
+ const PadStrideInfo conv_info(1U, 1U, 0U, 0U);
+
+ // Calculate destination shape
+ TensorInfo src_info(src_shape, 1, data_type);
+ src_info.set_data_layout(data_layout);
+ const TensorShape dst_shape = compute_im2col_conv_shape(&src_info, spatial_kernel, conv_info, has_bias, Size2D(1U, 1U), false, num_groups);
+
+ // Compute target
+ Tensor src_target = create_tensor<Tensor>(src_shape, data_type, 1, qinfo, data_layout);
+ Tensor dst_target = create_tensor<Tensor>(dst_shape, data_type, 1, qinfo);
+
+ // Configure target function
+ NEIm2Col im2col_func;
+ im2col_func.configure(&src_target, &dst_target, spatial_kernel, conv_info, has_bias);
+
+ // Extend padding
+ src_target.info()->extend_padding(PaddingSize(3, 5, 9, 1));
+ dst_target.info()->extend_padding(PaddingSize(8, 1, 1, 3));
+
+ // Validate and allocate tensors
+ ARM_COMPUTE_EXPECT(src_target.info()->is_resizable(), framework::LogLevel::ERRORS);
+ ARM_COMPUTE_EXPECT(dst_target.info()->is_resizable(), framework::LogLevel::ERRORS);
+
+ src_target.allocator()->allocate();
+ dst_target.allocator()->allocate();
+
+ ARM_COMPUTE_EXPECT(!src_target.info()->is_resizable(), framework::LogLevel::ERRORS);
+ ARM_COMPUTE_EXPECT(!dst_target.info()->is_resizable(), framework::LogLevel::ERRORS);
+
+ // Fill target source
+ library->fill_tensor_uniform(Accessor(src_target), 0);
+
+ // Run target function
+ im2col_func.run();
+
+ // Calculate Reference
+ SimpleTensor<float> src_ref{ src_shape, data_type, 1, qinfo, data_layout };
+ SimpleTensor<float> dst_ref{ dst_shape, data_type, 1, qinfo, DataLayout::NCHW };
+
+ // Fill reference source
+ library->fill_tensor_uniform(src_ref, 0);
+
+#ifndef DOXYGEN_SKIP_THIS
+ // Run reference function
+ reference::im2col(src_ref, dst_ref, spatial_kernel, conv_info, has_bias, num_groups);
+#endif // DOXYGEN_SKIP_THIS
+
+ // Validate
+ validate(Accessor(dst_target), dst_ref);
+}
+TEST_SUITE_END() // Special Cases
TEST_SUITE_END() // Im2Col
TEST_SUITE_END() // NEON
} // namespace validation
diff --git a/tests/validation/reference/Im2Col.cpp b/tests/validation/reference/Im2Col.cpp
index 4d63696..4b41cdb 100644
--- a/tests/validation/reference/Im2Col.cpp
+++ b/tests/validation/reference/Im2Col.cpp
@@ -139,7 +139,7 @@
}
template <typename T>
-void im2col(const SimpleTensor<T> &src, SimpleTensor<T> &dst, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, const unsigned int num_groups)
+void im2col(const SimpleTensor<T> &src, SimpleTensor<T> &dst, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, unsigned int num_groups)
{
switch(src.data_layout())
{
diff --git a/tests/validation/reference/Im2Col.h b/tests/validation/reference/Im2Col.h
index f519d0e..34b8476 100644
--- a/tests/validation/reference/Im2Col.h
+++ b/tests/validation/reference/Im2Col.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2018 ARM Limited.
+ * Copyright (c) 2017-2019 ARM Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -35,7 +35,7 @@
namespace reference
{
template <typename T>
-void im2col(const SimpleTensor<T> &src, SimpleTensor<T> &dst, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, const unsigned int num_groups);
+void im2col(const SimpleTensor<T> &src, SimpleTensor<T> &dst, const Size2D &kernel_dims, const PadStrideInfo &conv_info, bool has_bias, unsigned int num_groups);
} // namespace reference
} // namespace validation
} // namespace test