aboutsummaryrefslogtreecommitdiff
path: root/tests/validation/reference
diff options
context:
space:
mode:
authorDiego Lopez Recas <Diego.LopezRecas@arm.com>2017-12-19 15:42:25 +0000
committerAnthony Barbier <anthony.barbier@arm.com>2018-11-02 16:42:33 +0000
commit490b3d839808cbd088ab567dec991dcefb08f718 (patch)
tree72ddb43ddef562ffb3008d9e421b08c7ecab0c3a /tests/validation/reference
parent53a6ec5944132000e2c6779c04d722b3b2d2501c (diff)
downloadComputeLibrary-490b3d839808cbd088ab567dec991dcefb08f718.tar.gz
IVGCVSW-863 Move clamp, for_each, foldl to misc/utility.h
Also, improve for_each, foldl, and related changes. Change-Id: I0cf0c7dbf88f26bb70cc734ba9fb5725d405585f Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/114014 Reviewed-by: Anthony Barbier <anthony.barbier@arm.com> Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com> Tested-by: Jenkins <bsgcomp@arm.com>
Diffstat (limited to 'tests/validation/reference')
-rw-r--r--tests/validation/reference/ConvolutionLayer.cpp2
-rw-r--r--tests/validation/reference/FullyConnectedLayer.cpp2
-rw-r--r--tests/validation/reference/Scale.cpp7
3 files changed, 5 insertions, 6 deletions
diff --git a/tests/validation/reference/ConvolutionLayer.cpp b/tests/validation/reference/ConvolutionLayer.cpp
index 10664119fb..567fac0f5e 100644
--- a/tests/validation/reference/ConvolutionLayer.cpp
+++ b/tests/validation/reference/ConvolutionLayer.cpp
@@ -210,7 +210,7 @@ void convolution3d(const SimpleTensor<uint8_t> &in, const SimpleTensor<uint8_t>
acc = asymm_rounding_divide_by_pow2(asymm_int_mult(acc, output_multiplier), output_shift);
acc += output_offset;
- acc = clamp<int32_t>(acc, 0, 255);
+ acc = utility::clamp<int32_t>(acc, 0, 255);
// Store the result
*out_ptr = acc;
diff --git a/tests/validation/reference/FullyConnectedLayer.cpp b/tests/validation/reference/FullyConnectedLayer.cpp
index c24881e2b4..5384715ace 100644
--- a/tests/validation/reference/FullyConnectedLayer.cpp
+++ b/tests/validation/reference/FullyConnectedLayer.cpp
@@ -138,7 +138,7 @@ void vector_matrix_multiply(const SimpleTensor<uint8_t> &src, const SimpleTensor
acc = asymm_rounding_divide_by_pow2(asymm_int_mult(acc, output_multiplier), output_shift);
acc += output_offset;
- acc = clamp<int32_t>(acc, 0, 255);
+ acc = utility::clamp<int32_t>(acc, 0, 255);
// Store the result
dst_ptr[y] = static_cast<uint8_t>(acc);
diff --git a/tests/validation/reference/Scale.cpp b/tests/validation/reference/Scale.cpp
index 727325f675..0cc96abcf3 100644
--- a/tests/validation/reference/Scale.cpp
+++ b/tests/validation/reference/Scale.cpp
@@ -22,10 +22,9 @@
* SOFTWARE.
*/
-#include "arm_compute/core/Helpers.h"
-
#include "Scale.h"
#include "Utils.h"
+#include "arm_compute/core/utils/misc/utility.h"
#include "support/ToolchainSupport.h"
namespace arm_compute
@@ -119,8 +118,8 @@ SimpleTensor<T> scale(const SimpleTensor<T> &in, float scale_x, float scale_y, I
}
else if(border_mode == BorderMode::REPLICATE)
{
- id.set(0, clamp(static_cast<int>(x_src), 0, width - 1));
- id.set(1, clamp(static_cast<int>(y_src), 0, height - 1));
+ id.set(0, utility::clamp<int>(x_src, 0, width - 1));
+ id.set(1, utility::clamp<int>(y_src, 0, height - 1));
out[element_idx] = in[coord2index(in.shape(), id)];
}
}