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 /tests | |
| 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 'tests')
| -rw-r--r-- | tests/validation/NEON/ActivationLayer.cpp | 4 | ||||
| -rw-r--r-- | tests/validation/reference/Convolution3d.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tests/validation/NEON/ActivationLayer.cpp b/tests/validation/NEON/ActivationLayer.cpp index f8f35f0a8e..45e09fb94f 100644 --- a/tests/validation/NEON/ActivationLayer.cpp +++ b/tests/validation/NEON/ActivationLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -159,7 +159,7 @@ const auto NeonActivationFunctionsDataset = concat(datasets::ActivationFunctions /** Input data sets. */ const auto ActivationDataset = combine(combine(framework::dataset::make("InPlace", { false, true }), NeonActivationFunctionsDataset), framework::dataset::make("AlphaBeta", { 0.5f, 1.f })); -template <typename T, REQUIRES_TA(arm_compute::utils::traits::is_floating_point<T>::value)> +template <typename T, ARM_COMPUTE_REQUIRES_TA(arm_compute::utils::traits::is_floating_point<T>::value)> void test_float_sqrt_boundary_value() { constexpr auto vector_size = uint32_t{ 16 }; diff --git a/tests/validation/reference/Convolution3d.h b/tests/validation/reference/Convolution3d.h index 34e27f499b..1666e3857b 100644 --- a/tests/validation/reference/Convolution3d.h +++ b/tests/validation/reference/Convolution3d.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2020 Arm Limited. + * Copyright (c) 2017-2021 Arm Limited. * * SPDX-License-Identifier: MIT * @@ -95,8 +95,8 @@ inline void convolution3d(const SimpleTensor<T> &in, const SimpleTensor<TW> &wei } // 3D convolution for QASYMM8 type -template < typename T, typename TW, typename TB, REQUIRES_TA((std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) &&(std::is_same<TW, uint8_t>::value - || std::is_same<TW, int8_t>::value)) > +template < typename T, typename TW, typename TB, ARM_COMPUTE_REQUIRES_TA((std::is_same<T, uint8_t>::value || std::is_same<T, int8_t>::value) &&(std::is_same<TW, uint8_t>::value + || std::is_same<TW, int8_t>::value)) > inline void convolution3d(const SimpleTensor<T> &in, const SimpleTensor<TW> &weights, const SimpleTensor<TB> &bias, SimpleTensor<T> &out, int i_offset, int w_offset, int b_offset, int o_offset, int xi, int yi, int width_in, int height_in, int depth_in, int width_weights, int height_weights, int dilation_x = 1, int dilation_y = 1, int filter_id = 0) |