From 25ef7217ec4e13682bf37c87c0c6075a799ba1c0 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 2 Jun 2020 23:00:41 +0100 Subject: COMPMID-3180: Remove padding from NEThreshold - Removes padding from NEThresholdKernel - Alters configuration interface to use a descriptor Change-Id: I394d5e1375454813856d9d206e61dc9a87c2cadc Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/3300 Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins --- arm_compute/runtime/CL/functions/CLThreshold.h | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'arm_compute/runtime/CL/functions/CLThreshold.h') diff --git a/arm_compute/runtime/CL/functions/CLThreshold.h b/arm_compute/runtime/CL/functions/CLThreshold.h index d8ae6fbb34..e0449a047d 100644 --- a/arm_compute/runtime/CL/functions/CLThreshold.h +++ b/arm_compute/runtime/CL/functions/CLThreshold.h @@ -24,6 +24,7 @@ #ifndef ARM_COMPUTE_CLTHRESHOLD_H #define ARM_COMPUTE_CLTHRESHOLD_H +#include "arm_compute/core/KernelDescriptors.h" #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CL/ICLSimpleFunction.h" @@ -31,6 +32,7 @@ namespace arm_compute { +// Forward declarations class ICLTensor; /** Basic function to run @ref CLThresholdKernel */ @@ -47,23 +49,25 @@ public: * @param[in] type Thresholding type. Can either be BINARY or RANGE. * @param[in] upper Upper threshold. Only used with RANGE thresholding */ + ARM_COMPUTE_DEPRECATED_REL(20.08) void configure(const ICLTensor *input, ICLTensor *output, uint8_t threshold, uint8_t false_value = 0, uint8_t true_value = 0, ThresholdType type = ThresholdType::BINARY, uint8_t upper = 0); + /** Initialise the function's source, destination, thresholds and threshold type + * + * @param[in] input First tensor input. Data types supported: U8. + * @param[out] output Output tensor. Data types supported: U8. + * @param[in] info Threshold descriptor + */ + void configure(const ICLTensor *input, ICLTensor *output, const ThresholdKernelInfo &info); /** Initialise the function's source, destination, thresholds and threshold type * * @param[in] compile_context The compile context to be used. * @param[in] input First tensor input. Data types supported: U8. * @param[out] output Output tensor. Data types supported: U8. - * @param[in] threshold Threshold. If upper threshold is specified, this will be used as the lower threshold. - * @param[in] false_value Value to assign when the condition is false. - * @param[in] true_value value to assign when the condition is true. - * @param[in] type Thresholding type. Can either be BINARY or RANGE. - * @param[in] upper Upper threshold. Only used with RANGE thresholding + * @param[in] info Threshold descriptor */ - void configure(const CLCompileContext &compile_context, const ICLTensor *input, ICLTensor *output, uint8_t threshold, - uint8_t false_value = 0, uint8_t true_value = 0, - ThresholdType type = ThresholdType::BINARY, uint8_t upper = 0); + void configure(const CLCompileContext &compile_context, const ICLTensor *input, ICLTensor *output, const ThresholdKernelInfo &info); }; -} +} // namespace arm_compute #endif /*ARM_COMPUTE_CLTHRESHOLD_H */ -- cgit v1.2.1