diff options
author | SiCong Li <sicong.li@arm.com> | 2023-07-21 18:16:13 +0100 |
---|---|---|
committer | SiCong Li <sicong.li@arm.com> | 2023-07-28 15:25:06 +0000 |
commit | 9129549110527fd53655d3e6b61e8e59bed6f97f (patch) | |
tree | c42e6c7bf2928897b82b7f8457ea540cf2b74a2e /arm_compute/core/ActivationLayerInfo.h | |
parent | 0b23e0e6402cb18ddf621d36454cadbb73959518 (diff) | |
download | ComputeLibrary-9129549110527fd53655d3e6b61e8e59bed6f97f.tar.gz |
Retain back-compatibility for arm_compute/core/Types.h
* Some symbols have been moved from core/Types.h. This patch retains
back compatibility so that the user can still include this header
for those symbols
* A new header core/CoreTypes.h is created to avoid circular dependency.
This header includes essential small types that are used across
functions
* Move all function info types into function_info folder for easier
tracking
Resolves COMPMID-6330
Related to https://review.mlplatform.org/c/ml/ComputeLibrary/+/9757
Signed-off-by: SiCong Li <sicong.li@arm.com>
Change-Id: I4739175c2d4d184a9bc8e28b881b497fab03ca60
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/9979
Reviewed-by: Jakub Sujak <jakub.sujak@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'arm_compute/core/ActivationLayerInfo.h')
-rw-r--r-- | arm_compute/core/ActivationLayerInfo.h | 111 |
1 files changed, 0 insertions, 111 deletions
diff --git a/arm_compute/core/ActivationLayerInfo.h b/arm_compute/core/ActivationLayerInfo.h deleted file mode 100644 index d9dc0a0702..0000000000 --- a/arm_compute/core/ActivationLayerInfo.h +++ /dev/null @@ -1,111 +0,0 @@ -/* - * Copyright (c) 2016-2023 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_ACTIVATIONLAYERINFO_H -#define ARM_COMPUTE_ACTIVATIONLAYERINFO_H - -#include "arm_compute/core/Coordinates.h" -#include "arm_compute/core/QuantizationInfo.h" -#include "arm_compute/core/Size2D.h" -#include "arm_compute/core/Size3D.h" -#include "arm_compute/core/Strides.h" -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/core/experimental/IPostOp.h" -#include "arm_compute/core/utils/misc/Macros.h" -#include "support/Bfloat16.h" -#include "support/Half.h" - -#include <cmath> -#include <cstddef> -#include <cstdint> -#include <map> -#include <string> -#include <utility> - -namespace arm_compute -{ -/** Activation Layer Information class */ -class ActivationLayerInfo -{ -public: - typedef arm_compute::ActivationFunction ActivationFunction; - - /** Lookup table */ - using LookupTable256 = std::array<qasymm8_t, 256>; - - ActivationLayerInfo() = default; - /** Default Constructor - * - * @param[in] f The activation function to use. - * @param[in] a (Optional) The alpha parameter used by some activation functions - * (@ref ActivationFunction::BOUNDED_RELU, @ref ActivationFunction::LU_BOUNDED_RELU, @ref ActivationFunction::LINEAR, @ref ActivationFunction::TANH). - * @param[in] b (Optional) The beta parameter used by some activation functions (@ref ActivationFunction::LINEAR, @ref ActivationFunction::LU_BOUNDED_RELU, @ref ActivationFunction::TANH). - */ - ActivationLayerInfo(ActivationFunction f, float a = 0.0f, float b = 0.0f) - : _act(f), _a(a), _b(b), _enabled(true) - { - } - /** Get the type of activation function */ - ActivationFunction activation() const - { - return _act; - } - /** Get the alpha value */ - float a() const - { - return _a; - } - /** Get the beta value */ - float b() const - { - return _b; - } - /** Check if initialised */ - bool enabled() const - { - return _enabled; - } - -#ifdef __aarch64__ - const LookupTable256 &lut() const - { - return _lut; - } - void setLookupTable256(LookupTable256 &lut) - { - _lut = std::move(lut); - } -#endif // __aarch64__ -private: - ActivationFunction _act = { ActivationLayerInfo::ActivationFunction::IDENTITY }; - float _a = {}; - float _b = {}; - bool _enabled = { false }; - -#ifdef __aarch64__ - LookupTable256 _lut = {}; -#endif // __aarch64__ -}; -} // namespace arm_compute -#endif /* ARM_COMPUTE_ACTIVATIONLAYERINFO_H */ |