From d0ae8b8ac8a371fd552c46d4b3be3db8628a5ade Mon Sep 17 00:00:00 2001 From: Moritz Pflanzer Date: Thu, 29 Jun 2017 14:51:57 +0100 Subject: COMPMID-417: Extract common toolchain support file The support file is needed as Android toolchains are missing some C++11 functions. It further includes functions that have been introduced in C++14 but which we already need. Eventually the support file might become unnecessary if the Android compilers improve and we switch to C++14. Change-Id: Ib5ec506f1a17c78149c315ab2096b901b852c180 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79247 Reviewed-by: Georgios Pinitas Tested-by: Kaizen Reviewed-by: Pablo Tello --- tests/validation/TensorOperations.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/validation/TensorOperations.h') diff --git a/tests/validation/TensorOperations.h b/tests/validation/TensorOperations.h index 5557cfc2df..4f7765613c 100644 --- a/tests/validation/TensorOperations.h +++ b/tests/validation/TensorOperations.h @@ -28,6 +28,7 @@ #include "Tensor.h" #include "Types.h" #include "Utils.h" +#include "support/ToolchainSupport.h" #include "FixedPoint.h" #include "Types.h" @@ -257,7 +258,7 @@ void apply_2d_spatial_filter(Coordinates coord, const Tensor &in, Tensor } coord.set(0, x); coord.set(1, y); - const double rounded_val = cpp11::trunc(val * static_cast(scale)); + const double rounded_val = support::cpp11::trunc(val * static_cast(scale)); out[coord2index(in.shape(), coord)] = saturate_cast(rounded_val); } } // namespace @@ -790,13 +791,13 @@ void pixel_wise_multiplication(const Tensor &in1, const Tensor &in2, Ten switch(rounding_policy) { case(RoundingPolicy::TO_ZERO): - rounded_val = cpp11::trunc(val); + rounded_val = support::cpp11::trunc(val); break; case(RoundingPolicy::TO_NEAREST_UP): - rounded_val = cpp11::round_half_up(val); + rounded_val = round_half_up(val); break; case(RoundingPolicy::TO_NEAREST_EVEN): - rounded_val = cpp11::round_half_even(val); + rounded_val = round_half_even(val); break; default: ARM_COMPUTE_ERROR("Unsupported rounding policy"); -- cgit v1.2.1