diff options
author | Gunes Bayir <gunes.bayir@arm.com> | 2023-09-14 15:14:48 +0100 |
---|---|---|
committer | Gunes Bayir <gunes.bayir@arm.com> | 2023-09-15 13:23:31 +0000 |
commit | c071328414780e2c3841a1adaac1b1f45a411724 (patch) | |
tree | 1197d99a07ff950c73372ddf4b79154e7f08d0cf /src/core | |
parent | e87fa660e188007391f0584a56c8970665780684 (diff) | |
download | ComputeLibrary-c071328414780e2c3841a1adaac1b1f45a411724.tar.gz |
Fix include dependencies for mass reformatting patch
This patch fixes some include dependencies in certain files that caused build failures in https://review.mlplatform.org/c/ml/ComputeLibrary/+/10287.
It also circumvents some clang-format glitches.
Signed-off-by: Gunes Bayir <gunes.bayir@arm.com>
Change-Id: I8e9d3307edd2d1afd17c685c9bc9429624130e5a
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/10313
Benchmark: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: <felixjohnny.thomasmathibalan@arm.com>
Reviewed-by: Viet-Hoa Do <viet-hoa.do@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/NEON/kernels/NEQLSTMLayerNormalizationKernel.cpp | 5 | ||||
-rw-r--r-- | src/core/NEON/wrapper/traits.h | 17 | ||||
-rw-r--r-- | src/core/NEON/wrapper/wrapper.h | 10 |
3 files changed, 22 insertions, 10 deletions
diff --git a/src/core/NEON/kernels/NEQLSTMLayerNormalizationKernel.cpp b/src/core/NEON/kernels/NEQLSTMLayerNormalizationKernel.cpp index a88b193b31..46a0f625ce 100644 --- a/src/core/NEON/kernels/NEQLSTMLayerNormalizationKernel.cpp +++ b/src/core/NEON/kernels/NEQLSTMLayerNormalizationKernel.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020-2021 Arm Limited. + * Copyright (c) 2020-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -200,6 +200,7 @@ inline std::pair<int64_t, int64_t> NEQLSTMLayerNormalizationKernel::sum_qsymm16( sum_sq += static_cast<AccType>(vaddv(vmul(val_low, val_low))); sum_sq += static_cast<AccType>(vaddv(vmul(val_high, val_high))); #else // __aarch64__ + // only AArch64 supports vaddv const int64x2_t pair_sum_low = vpaddl(val_low); const int64x2_t pair_sum_high = vpaddl(val_high); @@ -317,4 +318,4 @@ void NEQLSTMLayerNormalizationKernel::compute_qsymm16() }, input_iterator, output_iterator); } -} // namespace arm_compute
\ No newline at end of file +} // namespace arm_compute diff --git a/src/core/NEON/wrapper/traits.h b/src/core/NEON/wrapper/traits.h index ebb64d9d76..729d9ff61a 100644 --- a/src/core/NEON/wrapper/traits.h +++ b/src/core/NEON/wrapper/traits.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2021 Arm Limited. + * Copyright (c) 2018-2021, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,14 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_WRAPPER_TRAITS_H -#define ARM_COMPUTE_WRAPPER_TRAITS_H +#ifndef ACL_SRC_CORE_NEON_WRAPPER_TRAITS_H +#define ACL_SRC_CORE_NEON_WRAPPER_TRAITS_H + +#include "arm_compute/core/CoreTypes.h" + +#if defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) +#include "src/cpu/CpuTypes.h" // required for float16_t +#endif // defined(__ARM_FEATURE_FP16_VECTOR_ARITHMETIC) #include <arm_neon.h> @@ -30,6 +36,9 @@ #include <arm_sve.h> #endif /* defined(ARM_COMPUTE_ENABLE_SVE) */ +#include <cmath> +#include <cstdint> + namespace arm_compute { namespace wrapper @@ -151,4 +160,4 @@ using promote_t = typename promote<T>::type; } // namespace traits } // namespace wrapper } // namespace arm_compute -#endif /* ARM_COMPUTE_WRAPPER_TRAITS_H */ +#endif // ACL_SRC_CORE_NEON_WRAPPER_TRAITS_H diff --git a/src/core/NEON/wrapper/wrapper.h b/src/core/NEON/wrapper/wrapper.h index e5467e98ff..f3f3c5d9e6 100644 --- a/src/core/NEON/wrapper/wrapper.h +++ b/src/core/NEON/wrapper/wrapper.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2020 Arm Limited. + * Copyright (c) 2018-2020, 2023 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -21,8 +21,10 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef ARM_COMPUTE_WRAPPER_H -#define ARM_COMPUTE_WRAPPER_H +#ifndef ACL_SRC_CORE_NEON_WRAPPER_WRAPPER_H +#define ACL_SRC_CORE_NEON_WRAPPER_WRAPPER_H + +#include "arm_compute/core/Error.h" // Traits #include "src/core/NEON/wrapper/traits.h" @@ -31,4 +33,4 @@ #include "src/core/NEON/wrapper/intrinsics/intrinsics.h" #include "src/core/NEON/wrapper/scalar/scalar.h" -#endif /* ARM_COMPUTE_WRAPPER_H */ +#endif // ACL_SRC_CORE_NEON_WRAPPER_WRAPPER_H |