diff options
| author | Giorgio Arena <giorgio.arena@arm.com> | 2021-01-06 15:13:08 +0000 |
|---|---|---|
| committer | Giorgio Arena <giorgio.arena@arm.com> | 2021-01-07 09:56:31 +0000 |
| commit | c5a613982c12977cef2e2e16aaf9c50fa1629a88 (patch) | |
| tree | 6686d4f27083d23cc598abd60d8d75921a86ea4d /src/core/NEON | |
| parent | ee82d349a53d8f70cc2481581849575291872842 (diff) | |
| download | ComputeLibrary-c5a613982c12977cef2e2e16aaf9c50fa1629a88.tar.gz | |
Clean up macro definitions in arm_compute headers
- Expose loose macros by prefixing "ARM_COMPUTE_"
Resolves: COMPMID-3701
Signed-off-by: Giorgio Arena <giorgio.arena@arm.com>
Change-Id: I4334b01c1a5cd8585f4a1ba2d870be956c61a83d
Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/4769
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'src/core/NEON')
| -rw-r--r-- | src/core/NEON/NETracePoint.cpp | 10 | ||||
| -rw-r--r-- | src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/core/NEON/NETracePoint.cpp b/src/core/NEON/NETracePoint.cpp index bf48b411ec..756451d230 100644 --- a/src/core/NEON/NETracePoint.cpp +++ b/src/core/NEON/NETracePoint.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Arm Limited. + * Copyright (c) 2020-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -37,11 +37,11 @@ std::string to_string(const PaddingType &arg) return ((arg == PADDING_SAME) ? "PADDING_SAME" : "PADDING_VALID"); } -TRACE_TO_STRING(INELKInternalKeypointArray) -TRACE_TO_STRING(std::unique_ptr<INEGEMMWrapperKernel>) +ARM_COMPUTE_TRACE_TO_STRING(INELKInternalKeypointArray) +ARM_COMPUTE_TRACE_TO_STRING(std::unique_ptr<INEGEMMWrapperKernel>) -CONST_PTR_CLASS(INELKInternalKeypointArray) -CONST_PTR_CLASS(std::unique_ptr<INEGEMMWrapperKernel>) +ARM_COMPUTE_CONST_PTR_CLASS(INELKInternalKeypointArray) +ARM_COMPUTE_CONST_PTR_CLASS(std::unique_ptr<INEGEMMWrapperKernel>) template <> TracePoint::Args &&operator<<(TracePoint::Args &&tp, const PaddingType &arg) diff --git a/src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h b/src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h index 59f5c6c6b3..bc592193bf 100644 --- a/src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h +++ b/src/core/NEON/kernels/detail/NEDirectConvolutionDetail.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -64,7 +64,7 @@ inline float32x4x3_t load_matrix_row(const float *ptr, int weights_offset = 0) * * @return The loaded matrix. */ -template < typename T, REQUIRES_TA(std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) > +template < typename T, ARM_COMPUTE_REQUIRES_TA(std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) > inline int32x4x3_t load_matrix_row(const T *ptr, int weights_offset = 0) { const int32x4_t v_weights_offset = vdupq_n_s32(weights_offset); @@ -463,7 +463,7 @@ inline void convolve_3x3(const float *in_top, const float *in_mid, const float * * @param[in] input_offset Input quantization offset. * */ -template < typename T, REQUIRES_TA(std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) > +template < typename T, ARM_COMPUTE_REQUIRES_TA(std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) > inline int32x4_t single_convolve_3x3_dilation(const T *in_top, const T *in_mid, const T *in_low, const int32x4x3_t &m0, const int32x4x3_t &m1, const int32x4x3_t &m2, size_t dilation_x, int32_t input_offset) @@ -551,7 +551,7 @@ inline int32x4_t single_convolve_3x3_dilation(const T *in_top, const T *in_mid, * @param[in] input_offset Input quantization offset. * */ -template < typename T, REQUIRES_TA(std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) > +template < typename T, ARM_COMPUTE_REQUIRES_TA(std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) > inline int32x4x2_t convolve_3x3_dilation(const T *in_top, const T *in_mid, const T *in_low, const int32x4x3_t &m0, const int32x4x3_t &m1, const int32x4x3_t &m2, const size_t dilation_x, unsigned int stridex, int input_offset) { @@ -590,7 +590,7 @@ inline int32x4x2_t convolve_3x3_dilation(const T *in_top, const T *in_mid, const * @param[in] input_offset Input quantization offset. * */ -template < bool accumulate, typename T1, typename T2, REQUIRES_TA(std::is_same<T1, uint8_t>::value || std::is_same<T1, int8_t>::value) > +template < bool accumulate, typename T1, typename T2, ARM_COMPUTE_REQUIRES_TA(std::is_same<T1, uint8_t>::value || std::is_same<T1, int8_t>::value) > void convolve_3x3(const T1 *in_top, const T1 *in_mid, const T1 *in_low, T2 *out_ptr, const int32x4x3_t &m0, const int32x4x3_t &m1, const int32x4x3_t &m2, unsigned int stridex, int32_t input_offset) |