diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-04-30 03:18:37 +0100 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2021-05-04 08:35:42 +0000 |
commit | 0dc0d8eda87a01c11f9caabc0d2f2933737ba469 (patch) | |
tree | bd0dc48b694f4be70c0fb5ac4fbe95a6c25596f9 /src/runtime/gpu | |
parent | b699940f5a947f900859c084baa7333dc393e85e (diff) | |
download | ComputeLibrary-0dc0d8eda87a01c11f9caabc0d2f2933737ba469.tar.gz |
Rename PixelwiseMultiplications to Mul for simplicity
Changes the names of the following:
- PixelWiseMultiplicationKernel to MulKernel for all backends
- PixelWiseMultiplication to Mul for all backends
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Change-Id: I88108c2d22c888fce37ea1028863026160b9da97
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/5534
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michele Di Giorgio <michele.digiorgio@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/runtime/gpu')
-rw-r--r-- | src/runtime/gpu/cl/operators/ClMul.cpp (renamed from src/runtime/gpu/cl/operators/ClPixelWiseMultiplication.cpp) | 24 | ||||
-rw-r--r-- | src/runtime/gpu/cl/operators/ClMul.h (renamed from src/runtime/gpu/cl/operators/ClPixelWiseMultiplication.h) | 55 |
2 files changed, 27 insertions, 52 deletions
diff --git a/src/runtime/gpu/cl/operators/ClPixelWiseMultiplication.cpp b/src/runtime/gpu/cl/operators/ClMul.cpp index 137a0de6a7..d1e2bc806f 100644 --- a/src/runtime/gpu/cl/operators/ClPixelWiseMultiplication.cpp +++ b/src/runtime/gpu/cl/operators/ClMul.cpp @@ -21,40 +21,40 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#include "src/runtime/gpu/cl/operators/ClPixelWiseMultiplication.h" +#include "src/runtime/gpu/cl/operators/ClMul.h" #include "arm_compute/runtime/CL/CLScheduler.h" #include "src/core/gpu/cl/ClCompileContext.h" -#include "src/core/gpu/cl/kernels/ClPixelWiseMultiplicationKernel.h" +#include "src/core/gpu/cl/kernels/ClMulKernel.h" namespace arm_compute { namespace opencl { -void ClPixelWiseMultiplication::configure(const CLCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst, float scale, - ConvertPolicy overflow_policy, RoundingPolicy rounding_policy, const ActivationLayerInfo &act_info) +void ClMul::configure(const CLCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst, float scale, + ConvertPolicy overflow_policy, RoundingPolicy rounding_policy, const ActivationLayerInfo &act_info) { - auto k = std::make_unique<kernels::ClPixelWiseMultiplicationKernel>(); + auto k = std::make_unique<kernels::ClMulKernel>(); k->configure(compile_context, src1, src2, dst, scale, overflow_policy, rounding_policy, act_info); _kernel = std::move(k); } -Status ClPixelWiseMultiplication::validate(const ITensorInfo *src1, const ITensorInfo *src2, const ITensorInfo *dst, float scale, - ConvertPolicy overflow_policy, RoundingPolicy rounding_policy, const ActivationLayerInfo &act_info) +Status ClMul::validate(const ITensorInfo *src1, const ITensorInfo *src2, const ITensorInfo *dst, float scale, + ConvertPolicy overflow_policy, RoundingPolicy rounding_policy, const ActivationLayerInfo &act_info) { - return kernels::ClPixelWiseMultiplicationKernel::validate(src1, src2, dst, scale, overflow_policy, rounding_policy, act_info); + return kernels::ClMulKernel::validate(src1, src2, dst, scale, overflow_policy, rounding_policy, act_info); } -void ClComplexPixelWiseMultiplication::configure(const CLCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst, const ActivationLayerInfo &act_info) +void ClComplexMul::configure(const CLCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst, const ActivationLayerInfo &act_info) { - auto k = std::make_unique<kernels::ClComplexPixelWiseMultiplicationKernel>(); + auto k = std::make_unique<kernels::ClComplexMulKernel>(); k->configure(compile_context, src1, src2, dst, act_info); _kernel = std::move(k); } -Status ClComplexPixelWiseMultiplication::validate(const ITensorInfo *src1, const ITensorInfo *src2, const ITensorInfo *dst, const ActivationLayerInfo &act_info) +Status ClComplexMul::validate(const ITensorInfo *src1, const ITensorInfo *src2, const ITensorInfo *dst, const ActivationLayerInfo &act_info) { - return kernels::ClComplexPixelWiseMultiplicationKernel::validate(src1, src2, dst, act_info); + return kernels::ClComplexMulKernel::validate(src1, src2, dst, act_info); } } // namespace opencl } // namespace arm_compute
\ No newline at end of file diff --git a/src/runtime/gpu/cl/operators/ClPixelWiseMultiplication.h b/src/runtime/gpu/cl/operators/ClMul.h index e1598cb870..4a662b3276 100644 --- a/src/runtime/gpu/cl/operators/ClPixelWiseMultiplication.h +++ b/src/runtime/gpu/cl/operators/ClMul.h @@ -21,24 +21,22 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_CL_PIXELWISE_MULTIPLICATION_H -#define ARM_COMPUTE_CL_PIXELWISE_MULTIPLICATION_H +#ifndef ARM_COMPUTE_CL_MUL_H +#define ARM_COMPUTE_CL_MUL_H #include "src/core/gpu/cl/ClCompileContext.h" #include "src/runtime/gpu/cl/IClOperator.h" -#include <memory> - namespace arm_compute { namespace opencl { -/** Basic function to run @ref opencl::ClPixelWiseMultiplication. */ -class ClPixelWiseMultiplication : public IClOperator +/** Basic function to run @ref opencl::kernels::ClMulKernel */ +class ClMul : public IClOperator { public: /** Default Constructor */ - ClPixelWiseMultiplication() = default; + ClMul() = default; /** Initialise the kernel's sources, dst and convertion policy. * * Valid configurations (src1,src2) -> Output : @@ -69,31 +67,9 @@ public: */ void configure(const CLCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst, float scale, ConvertPolicy overflow_policy, RoundingPolicy rounding_policy, const ActivationLayerInfo &act_info = ActivationLayerInfo()); - /** Static function to check if given info will lead to a valid configuration of @ref ClPixelWiseMultiplication - * - * Valid configurations (src1,src2) -> Output : - * - * - (U8,U8) -> U8 - * - (U8,U8) -> S16 - * - (U8,S16) -> S16 - * - (S16,U8) -> S16 - * - (S16,S16) -> S16 - * - (F16,F16) -> F16 - * - (F32,F32) -> F32 - * - (QASYMM8,QASYMM8) -> QASYMM8 - * - (QASYMM8_SIGNED,QASYMM8_SIGNED) -> QASYMM8_SIGNED - * - (QSYMM16,QSYMM16) -> QSYMM16 - * - (QSYMM16,QSYMM16) -> S32 - * + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src1 An src tensor info. Data types supported: U8/QASYMM8/QASYMM8_SIGNED/S16/QSYMM16/F16/F32. - * @param[in] src2 An src tensor info. Data types supported: U8/QASYMM8/QASYMM8_SIGNED/S16/QSYMM16/F16/F32. - * @param[in] dst The dst tensor info. Data types supported: U8/QASYMM8/QASYMM8_SIGNED/S16/QSYMM16/F16/F32. - * @param[in] scale Scale to apply after multiplication. - * Scale must be positive and its value must be either 1/255 or 1/2^n where n is between 0 and 15. - * @param[in] overflow_policy Overflow policy. Supported overflow policies: Wrap, Saturate - * @param[in] rounding_policy Rounding policy. Supported rounding modes: to zero, to nearest even. - * @param[in] act_info (Optional) Activation layer information in case of a fused activation. + * Similar to @ref ClMul::configure() * * @return a status */ @@ -101,12 +77,12 @@ public: ConvertPolicy overflow_policy, RoundingPolicy rounding_policy, const ActivationLayerInfo &act_info = ActivationLayerInfo()); }; -/** Basic function to run @ref opencl::ClComplexPixelWiseMultiplication. */ -class ClComplexPixelWiseMultiplication : public IClOperator +/** Basic function to run @ref opencl::kernels::ClComplexMulKernel */ +class ClComplexMul : public IClOperator { public: /** Default Constructor */ - ClComplexPixelWiseMultiplication() = default; + ClComplexMul() = default; /** Initialise the kernel's sources, dst. * * @param[in] compile_context The compile context to be used. @@ -118,15 +94,14 @@ public: * @param[in] act_info (Optional) Activation layer information in case of a fused activation. */ void configure(const CLCompileContext &compile_context, ITensorInfo *src1, ITensorInfo *src2, ITensorInfo *dst, const ActivationLayerInfo &act_info = ActivationLayerInfo()); - /** Static function to check if given info will lead to a valid configuration of @ref ClComplexPixelWiseMultiplication + /** Static function to check if given info will lead to a valid configuration * - * @param[in] src1 An src tensor info. Data types supported: F16/F32. Number of channels supported: 2. - * @param[in] src2 An src tensor info. Data types supported: same as @p src1. Number of channels supported: same as @p src1. - * @param[in] dst The dst tensor info, Data types supported: same as @p src1. Number of channels supported: same as @p src1. - * @param[in] act_info (Optional) Activation layer information in case of a fused activation. + * Similar to @ref ClComplexMul::configure() + * + * @return a status */ static Status validate(const ITensorInfo *src1, const ITensorInfo *src2, const ITensorInfo *dst, const ActivationLayerInfo &act_info = ActivationLayerInfo()); }; } // namespace opencl } // namespace arm_compute -#endif /* ARM_COMPUTE_CL_PIXELWISE_MULTIPLICATION_H */
\ No newline at end of file +#endif /* ARM_COMPUTE_CL_MUL_H */
\ No newline at end of file |