diff options
author | Usama Arif <usama.arif@arm.com> | 2019-03-14 15:36:54 +0000 |
---|---|---|
committer | Pablo Marquez <pablo.tello@arm.com> | 2019-03-27 09:22:04 +0000 |
commit | 8cf8c1123440c2002ee108d1949529bf21eac944 (patch) | |
tree | cc61d9ed5ee805c4356b8497b2e81f67b194b36a /arm_compute/runtime/NEON/functions/NEPadLayer.h | |
parent | adc2186c06ca27f368dfe6ceadce449551259efc (diff) | |
download | ComputeLibrary-8cf8c1123440c2002ee108d1949529bf21eac944.tar.gz |
COMPMID-1944 Add support for "reflect" padding mode in NEPad
Change-Id: I56c42524497d37d44708648571fa211ac1afbd98
Signed-off-by: Usama Arif <usama.arif@arm.com>
Reviewed-on: https://review.mlplatform.org/c/885
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Diffstat (limited to 'arm_compute/runtime/NEON/functions/NEPadLayer.h')
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEPadLayer.h | 44 |
1 files changed, 36 insertions, 8 deletions
diff --git a/arm_compute/runtime/NEON/functions/NEPadLayer.h b/arm_compute/runtime/NEON/functions/NEPadLayer.h index 3a0863802a..78dbc1f1f9 100644 --- a/arm_compute/runtime/NEON/functions/NEPadLayer.h +++ b/arm_compute/runtime/NEON/functions/NEPadLayer.h @@ -25,17 +25,17 @@ #define __ARM_COMPUTE_NEPADLAYER_H__ #include "arm_compute/runtime/IFunction.h" +#include "arm_compute/runtime/NEON/functions/NEConcatenateLayer.h" +#include "arm_compute/runtime/NEON/functions/NEStridedSlice.h" #include "arm_compute/runtime/SubTensor.h" #include "arm_compute/core/NEON/kernels/NECopyKernel.h" #include "arm_compute/core/NEON/kernels/NEMemsetKernel.h" #include "arm_compute/core/Types.h" +#include "arm_compute/runtime/Tensor.h" namespace arm_compute { -// Forward declarations -class ITensor; - /** Basic function to pad a tensor. This function calls the following NEON kernels: * * -# @ref NEMemsetKernel @@ -53,8 +53,10 @@ public: * @param[in] padding The padding for each spatial dimension of the input tensor. The pair padding[i] * specifies the front and the end padding in the i-th dimension. * @param[in] constant_value (Optional) Constant value to be used for the padding + * @param[in] mode (Optional) Controls whether the padding should be filled with @p constant_value using CONSTANT, + * or reflect the input, either including the border values (SYMMETRIC) or not (REFLECT). */ - void configure(ITensor *input, ITensor *output, const PaddingList &padding, PixelValue constant_value = PixelValue()); + void configure(ITensor *input, ITensor *output, const PaddingList &padding, const PixelValue constant_value = PixelValue(), const PaddingMode mode = PaddingMode::CONSTANT); /** Static function to check if given info will lead to a valid configuration of @ref NEPadLayer. * * @param[in] input Source tensor info. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32. @@ -62,18 +64,44 @@ public: * @param[in] padding The padding for each spatial dimension of the input tensor. The pair padding[i] * specifies the front and the end padding in the i-th dimension. * @param[in] constant_value (Optional) Constant value to be used for the padding + * @param[in] mode (Optional) Controls whether the padding should be filled with @p constant_value using CONSTANT, + * or reflect the input, either including the border values (SYMMETRIC) or not (REFLECT). * * @return a status */ - static Status validate(const ITensorInfo *input, const ITensorInfo *output, const PaddingList &padding, PixelValue constant_value = PixelValue()); + static Status validate(const ITensorInfo *input, const ITensorInfo *output, const PaddingList &padding, const PixelValue constant_value = PixelValue(), const PaddingMode mode = PaddingMode::CONSTANT); // Inherited methods overridden: void run() override; private: - NEMemsetKernel _memset_kernel; - NECopyKernel _copy_kernel; - SubTensor _output_subtensor; + /** Configure kernels for when constant padding is used. + * + * @param[in] input Source tensor. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32. + * @param[out] output Output tensor. Data type supported: same as @p input + * @param[in] padding The padding for each spatial dimension of the input tensor. The pair padding[i] + * specifies the front and the end padding in the i-th dimension. + * @param[in] constant_value Constant value to be used for the padding + */ + void configure_constant_mode(ITensor *input, ITensor *output, const PaddingList &padding, const PixelValue constant_value); + /** Configure functions for when reflect or symmetric padding is used. + * + * @param[in] input Source tensor. Data types supported: U8/S8/QASYMM8/U16/S16/F16/U32/S32/F32. + * @param[out] output Output tensor. Data type supported: same as @p input + */ + void configure_reflect_symmetric_mode(ITensor *input, ITensor *output); + +private: + NECopyKernel _copy_kernel; + PaddingMode _mode; + PaddingList _padding; + NEMemsetKernel _memset_kernel; + uint32_t _num_dimensions; + std::unique_ptr<NEStridedSlice[]> _slice_functions; + std::unique_ptr<NEConcatenateLayer[]> _concat_functions; + std::unique_ptr<Tensor[]> _slice_results; + std::unique_ptr<Tensor[]> _concat_results; + SubTensor _output_subtensor; }; } // namespace arm_compute #endif /*__ARM_COMPUTE_NEPADLAYER_H__ */ |