aboutsummaryrefslogtreecommitdiff
path: root/src/armnn/test
diff options
context:
space:
mode:
authorarovir01 <Aron.Virginas-Tar@arm.com>2018-10-01 17:08:59 +0100
committerMatthew Bentham <matthew.bentham@arm.com>2018-10-10 16:16:57 +0100
commit616e775763280992de92287b129dc335be91a24c (patch)
tree5b7ced2fa8005f4371fe8005ee98cb88d16e0e09 /src/armnn/test
parent29cadb3ff3066d6feb1801a921be326bf5ed8f47 (diff)
downloadarmnn-616e775763280992de92287b129dc335be91a24c.tar.gz
IVGCVSW-1913: Fix for ValidationTest.concat_float_3_relaxed
* Added RefPermuteFloat16Workload to serve as a fallback when CL does not support the required permute configuration for FP16 * Move Half.hpp to armnnUtils as the utils library should not be including private header files from the armnn library Change-Id: Ibf0f698451e8406f7ed7cce470dab60b6d16361d
Diffstat (limited to 'src/armnn/test')
-rw-r--r--src/armnn/test/FP16SupportTest.cpp5
-rw-r--r--src/armnn/test/FloatingPointConverterTest.cpp2
2 files changed, 4 insertions, 3 deletions
diff --git a/src/armnn/test/FP16SupportTest.cpp b/src/armnn/test/FP16SupportTest.cpp
index 6baadc4c77..2706d1f363 100644
--- a/src/armnn/test/FP16SupportTest.cpp
+++ b/src/armnn/test/FP16SupportTest.cpp
@@ -7,6 +7,8 @@
#include <armnn/Descriptors.hpp>
#include <armnn/IRuntime.hpp>
#include <armnn/INetwork.hpp>
+#include <armnnUtils/Half.hpp>
+
#include <Graph.hpp>
#include <Optimizer.hpp>
#include <backends/CpuTensorHandle.hpp>
@@ -15,7 +17,6 @@
#include <boost/core/ignore_unused.hpp>
#include <boost/test/unit_test.hpp>
-#include <Half.hpp>
#include <set>
using namespace armnn;
@@ -111,4 +112,4 @@ BOOST_AUTO_TEST_CASE(Fp16AdditionTest)
BOOST_TEST(outputData == std::vector<Half>({ 101.0_h, 202.0_h, 303.0_h, 404.0_h})); // Add
}
-BOOST_AUTO_TEST_SUITE_END() \ No newline at end of file
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/armnn/test/FloatingPointConverterTest.cpp b/src/armnn/test/FloatingPointConverterTest.cpp
index 3c7c8bdbf3..ec4288c438 100644
--- a/src/armnn/test/FloatingPointConverterTest.cpp
+++ b/src/armnn/test/FloatingPointConverterTest.cpp
@@ -4,7 +4,7 @@
//
#include "FloatingPointConverter.hpp"
-#include "Half.hpp"
+#include <armnnUtils/Half.hpp>
#include <malloc.h>
#include <iostream>