From 75eea338eb232ebdafa2fb84d22e711b5f964785 Mon Sep 17 00:00:00 2001 From: Sang-Hoon Park Date: Fri, 13 Nov 2020 13:44:13 +0000 Subject: COMPMID-3961: Add Logical OR/AND/NOT operator on CL Change-Id: I612aeed6affa17624fb9044964dd59c41a5c9888 Signed-off-by: Sang-Hoon Park Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4448 Reviewed-by: Pablo Marquez Tello Tested-by: Arm Jenkins Comments-Addressed: Arm Jenkins --- arm_compute/core/Types.h | 15 +-- arm_compute/runtime/CL/CLFunctions.h | 3 + arm_compute/runtime/CL/functions/CLLogicalAnd.h | 121 ++++++++++++++++++++++++ arm_compute/runtime/CL/functions/CLLogicalNot.h | 112 ++++++++++++++++++++++ arm_compute/runtime/CL/functions/CLLogicalOr.h | 121 ++++++++++++++++++++++++ 5 files changed, 365 insertions(+), 7 deletions(-) create mode 100644 arm_compute/runtime/CL/functions/CLLogicalAnd.h create mode 100644 arm_compute/runtime/CL/functions/CLLogicalNot.h create mode 100644 arm_compute/runtime/CL/functions/CLLogicalOr.h (limited to 'arm_compute') diff --git a/arm_compute/core/Types.h b/arm_compute/core/Types.h index 2e639c4be4..39cc29b0da 100644 --- a/arm_compute/core/Types.h +++ b/arm_compute/core/Types.h @@ -546,13 +546,14 @@ enum class ArithmeticOperation /** Available element wise unary operations */ enum class ElementWiseUnary { - RSQRT, /**< Reverse square root */ - EXP, /**< Exponential */ - NEG, /**< Negate */ - LOG, /**< Natural Logarithm */ - ABS, /**< Absolute value */ - SIN, /**< Sine */ - ROUND, /**< Round */ + RSQRT, /**< Reverse square root */ + EXP, /**< Exponential */ + NEG, /**< Negate */ + LOG, /**< Natural Logarithm */ + ABS, /**< Absolute value */ + SIN, /**< Sine */ + ROUND, /**< Round */ + LOGICAL_NOT, /**< Logical Not */ }; /** The normalization type used for the normalization layer */ diff --git a/arm_compute/runtime/CL/CLFunctions.h b/arm_compute/runtime/CL/CLFunctions.h index f909cc30c5..4e32831bc6 100644 --- a/arm_compute/runtime/CL/CLFunctions.h +++ b/arm_compute/runtime/CL/CLFunctions.h @@ -99,6 +99,9 @@ #include "arm_compute/runtime/CL/functions/CLLaplacianPyramid.h" #include "arm_compute/runtime/CL/functions/CLLaplacianReconstruct.h" #include "arm_compute/runtime/CL/functions/CLLocallyConnectedLayer.h" +#include "arm_compute/runtime/CL/functions/CLLogicalAnd.h" +#include "arm_compute/runtime/CL/functions/CLLogicalNot.h" +#include "arm_compute/runtime/CL/functions/CLLogicalOr.h" #include "arm_compute/runtime/CL/functions/CLMagnitude.h" #include "arm_compute/runtime/CL/functions/CLMaxUnpoolingLayer.h" #include "arm_compute/runtime/CL/functions/CLMeanStdDev.h" diff --git a/arm_compute/runtime/CL/functions/CLLogicalAnd.h b/arm_compute/runtime/CL/functions/CLLogicalAnd.h new file mode 100644 index 0000000000..1a6ccf35a5 --- /dev/null +++ b/arm_compute/runtime/CL/functions/CLLogicalAnd.h @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2020 Arm Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ARM_COMPUTE_CLLOGICALAND_H +#define ARM_COMPUTE_CLLOGICALAND_H + +#include "arm_compute/core/Error.h" +#include "arm_compute/runtime/CL/ICLOperator.h" +#include "arm_compute/runtime/IFunction.h" + +namespace arm_compute +{ +class CLCompileContext; +class ICLTensor; +class ITensorInfo; + +namespace experimental +{ +class CLLogicalAnd : public ICLOperator +{ +public: + /** Default Constructor */ + CLLogicalAnd() = default; + /** Initialise the kernel's inputs, output and conversion policy. + * + * @param[in] compile_context The compile context to be used. + * @param[in, out] input1 First tensor input. Data types supported: U8. + * The input tensor is [in, out] because its TensorInfo might be modified inside the kernel in case of broadcasting of dimension 0. + * @param[in, out] input2 Second tensor input. Data types supported: U8. + * The input tensor is [in, out] because its TensorInfo might be modified inside the kernel in case of broadcasting of dimension 0. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output); + /** Static function to check if given info will lead to a valid configuration of @ref CLLogicalBinaryKernel + * + * @param[in] input1 First tensor input info. Data types supported: U8. + * @param[in] input2 Second tensor input info. Data types supported: U8. + * @param[in] output Output tensor info. Data types supported: U8. + * + * @return a status + */ + static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output); + // Inherited methods overridden: + void run(ITensorPack &tensors) override; +}; +} // namespace experimental + +/** Basic function to run @ref CLLogicalBinaryKernel. + * + * @note The tensor data type for the inputs must be U8. + * @note The function performs a logical AND operation using the two input tensors. + */ +class CLLogicalAnd : public IFunction +{ +public: + /** Default Constructor */ + CLLogicalAnd(); + /** Default Destructor */ + ~CLLogicalAnd(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLLogicalAnd(const CLLogicalAnd &) = delete; + /** Default move constructor */ + CLLogicalAnd(CLLogicalAnd &&); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLLogicalAnd &operator=(const CLLogicalAnd &) = delete; + /** Default move assignment operator */ + CLLogicalAnd &operator=(CLLogicalAnd &&); + /** Initialize the function + * + * @param[in] input1 Input tensor. Data types supported: U8. + * @param[in] input2 Input tensor. Data types supported: U8. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(ICLTensor *input1, ICLTensor *input2, ICLTensor *output); + /** Initialize the function + * + * @param[in] compile_context The compile context to be used. + * @param[in] input1 Input tensor. Data types supported: U8. + * @param[in] input2 Input tensor. Data types supported: U8. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(const CLCompileContext &compile_context, ICLTensor *input1, ICLTensor *input2, ICLTensor *output); + /** Static function to check if given info will lead to a valid configuration + * + * @param[in] input1 First tensor input info. Data types supported: U8. + * @param[in] input2 Second tensor input info. Data types supported: U8. + * @param[in] output Output tensor info. Data types supported: U8. + * + * @return a status + */ + static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output); + + // Inherited methods overridden: + void run() override; + +private: + struct Impl; + std::unique_ptr _impl; +}; +} // namespace arm_compute +#endif /* ARM_COMPUTE_CLLOGICALAND_H */ diff --git a/arm_compute/runtime/CL/functions/CLLogicalNot.h b/arm_compute/runtime/CL/functions/CLLogicalNot.h new file mode 100644 index 0000000000..4fdf39ed70 --- /dev/null +++ b/arm_compute/runtime/CL/functions/CLLogicalNot.h @@ -0,0 +1,112 @@ +/* + * Copyright (c) 2020 Arm Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ARM_COMPUTE_CLLOGICALNOT_H +#define ARM_COMPUTE_CLLOGICALNOT_H + +#include "arm_compute/core/Error.h" +#include "arm_compute/runtime/CL/ICLOperator.h" +#include "arm_compute/runtime/IFunction.h" + +namespace arm_compute +{ +class CLCompileContext; +class ICLTensor; +class ITensorInfo; + +namespace experimental +{ +class CLLogicalNot : public ICLOperator +{ +public: + /** Default Constructor */ + CLLogicalNot() = default; + /** Initialise the kernel's inputs, output and conversion policy. + * + * @param[in] compile_context The compile context to be used. + * @param[in, out] input Tensor input. Data types supported: U8. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(const CLCompileContext &compile_context, const ITensorInfo *input, ITensorInfo *output); + /** Static function to check if given info will lead to a valid configuration of @ref CLElementWiseUnaryLayerKernel + * + * @param[in] input Tensor input info. Data types supported: U8. + * @param[in] output Output tensor info. Data types supported: U8. + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *output); + // Inherited methods overridden: + void run(ITensorPack &tensors) override; +}; +} // namespace experimental + +/** Basic function to do logical NOT operation + * + * @note The tensor data type for the inputs must be U8. + * @note The function performs a logical NOT operation on input tensor. + */ +class CLLogicalNot : public IFunction +{ +public: + /** Default Constructor */ + CLLogicalNot(); + /** Default Destructor */ + ~CLLogicalNot(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLLogicalNot(const CLLogicalNot &) = delete; + /** Default move constructor */ + CLLogicalNot(CLLogicalNot &&); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLLogicalNot &operator=(const CLLogicalNot &) = delete; + /** Default move assignment operator */ + CLLogicalNot &operator=(CLLogicalNot &&); + /** Initialize the function + * + * @param[in] input Input tensor. Data types supported: U8. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(const ICLTensor *input, ICLTensor *output); + /** Initialize the function + * + * @param[in] compile_context The compile context to be used. + * @param[in] input Input tensor. Data types supported: U8. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(const CLCompileContext &compile_context, const ICLTensor *input, ICLTensor *output); + /** Static function to check if given info will lead to a valid configuration + * + * @param[in] input Tensor input info. Data types supported: U8. + * @param[in] output Output tensor info. Data types supported: U8. + * + * @return a status + */ + static Status validate(const ITensorInfo *input, const ITensorInfo *output); + void run() override; + +private: + struct Impl; + std::unique_ptr _impl; +}; +} // namespace arm_compute +#endif /* ARM_COMPUTE_CLLOGICALNOT_H */ diff --git a/arm_compute/runtime/CL/functions/CLLogicalOr.h b/arm_compute/runtime/CL/functions/CLLogicalOr.h new file mode 100644 index 0000000000..a50551e1dd --- /dev/null +++ b/arm_compute/runtime/CL/functions/CLLogicalOr.h @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2020 Arm Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ARM_COMPUTE_CLLOGICALOR_H +#define ARM_COMPUTE_CLLOGICALOR_H + +#include "arm_compute/core/Error.h" +#include "arm_compute/runtime/CL/ICLOperator.h" +#include "arm_compute/runtime/IFunction.h" + +namespace arm_compute +{ +class CLCompileContext; +class ICLTensor; +class ITensorInfo; + +namespace experimental +{ +class CLLogicalOr : public ICLOperator +{ +public: + /** Default Constructor */ + CLLogicalOr() = default; + /** Initialise the kernel's inputs, output and conversion policy. + * + * @param[in] compile_context The compile context to be used. + * @param[in, out] input1 First tensor input. Data types supported: U8. + * The input tensor is [in, out] because its TensorInfo might be modified inside the kernel in case of broadcasting of dimension 0. + * @param[in, out] input2 Second tensor input. Data types supported: U8. + * The input tensor is [in, out] because its TensorInfo might be modified inside the kernel in case of broadcasting of dimension 0. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(const CLCompileContext &compile_context, ITensorInfo *input1, ITensorInfo *input2, ITensorInfo *output); + /** Static function to check if given info will lead to a valid configuration of @ref CLLogicalBinaryKernel + * + * @param[in] input1 First tensor input info. Data types supported: U8. + * @param[in] input2 Second tensor input info. Data types supported: U8. + * @param[in] output Output tensor info. Data types supported: U8. + * + * @return a status + */ + static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output); + // Inherited methods overridden: + void run(ITensorPack &tensors) override; +}; +} // namespace experimental + +/** Basic function to run @ref CLLogicalBinaryKernel. + * + * @note The tensor data type for the inputs must be U8. + * @note The function performs a logical OR operation using the two input tensors. + */ +class CLLogicalOr : public IFunction +{ +public: + /** Default Constructor */ + CLLogicalOr(); + /** Default Destructor */ + ~CLLogicalOr(); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLLogicalOr(const CLLogicalOr &) = delete; + /** Default move constructor */ + CLLogicalOr(CLLogicalOr &&); + /** Prevent instances of this class from being copied (As this class contains pointers) */ + CLLogicalOr &operator=(const CLLogicalOr &) = delete; + /** Default move assignment operator */ + CLLogicalOr &operator=(CLLogicalOr &&); + /** Initialize the function + * + * @param[in] input1 Input tensor. Data types supported: U8. + * @param[in] input2 Input tensor. Data types supported: U8. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(ICLTensor *input1, ICLTensor *input2, ICLTensor *output); + /** Initialize the function + * + * @param[in] compile_context The compile context to be used. + * @param[in] input1 Input tensor. Data types supported: U8. + * @param[in] input2 Input tensor. Data types supported: U8. + * @param[out] output Output tensor. Data types supported: U8. + */ + void configure(const CLCompileContext &compile_context, ICLTensor *input1, ICLTensor *input2, ICLTensor *output); + /** Static function to check if given info will lead to a valid configuration + * + * @param[in] input1 First tensor input info. Data types supported: U8. + * @param[in] input2 Second tensor input info. Data types supported: U8. + * @param[in] output Output tensor info. Data types supported: U8. + * + * @return a status + */ + static Status validate(const ITensorInfo *input1, const ITensorInfo *input2, const ITensorInfo *output); + + // Inherited methods overridden: + void run() override; + +private: + struct Impl; + std::unique_ptr _impl; +}; +} // namespace arm_compute +#endif /* ARM_COMPUTE_CLLOGICALOR_H */ -- cgit v1.2.1