From f8f0442e9a6105be0e32f4defec5fbc10248ea6e Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Fri, 8 Jan 2021 17:25:55 +0000 Subject: Make CpuActivation stateless - Rename NEActivationLayer to CpuActivation - Add member function to generate execution window Partially Resolves: COMPMID-3992 Signed-off-by: Georgios Pinitas Change-Id: I4e1ae15cf456b860d3080b2fedc4dbcce7d1bb79 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4791 Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins Reviewed-by: Michalis Spyrou --- .../runtime/NEON/functions/NEActivationLayer.h | 49 ++++------------------ 1 file changed, 7 insertions(+), 42 deletions(-) (limited to 'arm_compute/runtime/NEON/functions/NEActivationLayer.h') diff --git a/arm_compute/runtime/NEON/functions/NEActivationLayer.h b/arm_compute/runtime/NEON/functions/NEActivationLayer.h index 3f410fcd8c..3d89355be5 100644 --- a/arm_compute/runtime/NEON/functions/NEActivationLayer.h +++ b/arm_compute/runtime/NEON/functions/NEActivationLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -24,15 +24,18 @@ #ifndef ARM_COMPUTE_NEACTIVATIONLAYER_H #define ARM_COMPUTE_NEACTIVATIONLAYER_H -#include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h" +#include "arm_compute/runtime/IFunction.h" #include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/INEOperator.h" +#include "arm_compute/runtime/IRuntimeContext.h" + +#include namespace arm_compute { // Forward declarations class ITensor; +class ITensorInfo; /** Basic function to run @ref NEActivationLayerKernel * @@ -86,43 +89,5 @@ private: struct Impl; std::unique_ptr _impl; }; - -namespace experimental -{ -/** Basic function to run @ref NEActivationLayerKernel */ -class NEActivationLayer : public INEOperator -{ -public: - /** Constructor */ - NEActivationLayer() = default; - /** Prevent instances of this class from being copied */ - NEActivationLayer(const NEActivationLayer &) = delete; - /** Default move constructor */ - NEActivationLayer(NEActivationLayer &&) = default; - /** Prevent instances of this class from being copied */ - NEActivationLayer &operator=(const NEActivationLayer &) = delete; - /** Default move assignment operator */ - NEActivationLayer &operator=(NEActivationLayer &&) = default; - /** Destructor */ - ~NEActivationLayer(); - - /** Set the input and output tensor. - * - * @param[in] input Source tensor info. Data types supported: QASYMM8/QASYMM8_SIGNED/QSYMM16/F16/F32. - * @param[out] output Destination tensor info. Data type supported: same as @p input - * @param[in] activation_info Activation layer parameters. - */ - void configure(const ITensorInfo *input, ITensorInfo *output, const ActivationLayerInfo &activation_info); - /** Static function to check if given info will lead to a valid configuration of @ref NEActivationLayer - * - * @param[in] input Source tensor info. Data types supported: QASYMM8/QASYMM8_SIGNED/QSYMM16/F16/F32. - * @param[in] output Destination tensor info. Data type supported: same as @p input - * @param[in] act_info Activation layer information. - * - * @return a status - */ - static Status validate(const ITensorInfo *input, const ITensorInfo *output, const ActivationLayerInfo &act_info); -}; -} // namespace experimental -} // namespace arm_compute +} // namespace arm_computes #endif /* ARM_COMPUTE_NEACTIVATIONLAYER_H */ -- cgit v1.2.1