diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-01-08 17:25:55 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-01-11 16:48:31 +0000 |
commit | f8f0442e9a6105be0e32f4defec5fbc10248ea6e (patch) | |
tree | d4e77c82f57df175dcec6c46ed2f74f4a8b72d7a /arm_compute/runtime/NEON/functions | |
parent | 4f77ba9f2dccbae1b46b2d4e17d862560f858050 (diff) | |
download | ComputeLibrary-f8f0442e9a6105be0e32f4defec5fbc10248ea6e.tar.gz |
Make CpuActivation stateless
- Rename NEActivationLayer to CpuActivation
- Add member function to generate execution window
Partially Resolves: COMPMID-3992
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I4e1ae15cf456b860d3080b2fedc4dbcce7d1bb79
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4791
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
Diffstat (limited to 'arm_compute/runtime/NEON/functions')
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEActivationLayer.h | 49 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEFloor.h | 1 | ||||
-rw-r--r-- | arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h | 3 |
3 files changed, 10 insertions, 43 deletions
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 <memory> 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> _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 */ diff --git a/arm_compute/runtime/NEON/functions/NEFloor.h b/arm_compute/runtime/NEON/functions/NEFloor.h index 92993503da..739225cdce 100644 --- a/arm_compute/runtime/NEON/functions/NEFloor.h +++ b/arm_compute/runtime/NEON/functions/NEFloor.h @@ -32,6 +32,7 @@ namespace arm_compute { +// Forward declarations class ITensor; class ITensorInfo; diff --git a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h index 8bf3e95f81..4a192688c7 100644 --- a/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h +++ b/arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -25,6 +25,7 @@ #define ARM_COMPUTE_NEFULLYCONNECTEDLAYER_H #include "arm_compute/runtime/IFunction.h" +#include "arm_compute/runtime/NEON/INESimpleFunctionNoBorder.h" #include "arm_compute/runtime/MemoryGroup.h" #include "arm_compute/runtime/NEON/functions/NEConvertFullyConnectedWeights.h" |