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

5 files changed, 9 insertions, 41 deletions

diff --git a/src/armnn/Half.hpp b/src/armnn/Half.hpp
deleted file mode 100644
index c4b47a3609..0000000000
--- a/src/armnn/Half.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-//
-// Copyright © 2017 Arm Ltd. All rights reserved.
-// SPDX-License-Identifier: MIT
-//
-
-#pragma once
-
-#include <type_traits>
-#include <half/half.hpp>
-
-namespace armnn
-{
-    using Half = half_float::half; //import half float implementation
-} //namespace armnn
-
-
-namespace std
-{
-
-template<>
-struct is_floating_point<armnn::Half>
-    : integral_constant< bool, true >
-{};
-
-template<>
-struct is_floating_point<const armnn::Half>
-    : integral_constant< bool, true >
-{};
-
-template<>
-struct is_floating_point<volatile armnn::Half>
-    : integral_constant< bool, true >
-{};
-
-} //namespace std
\ No newline at end of file
diff --git a/src/armnn/TypeUtils.hpp b/src/armnn/TypeUtils.hpp
index e159d1fd07..cd19211a66 100644
--- a/src/armnn/TypeUtils.hpp
+++ b/src/armnn/TypeUtils.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "armnn/Types.hpp"
-#include "Half.hpp"
+#include "armnnUtils/Half.hpp"
 
 namespace armnn
 {
@@ -37,4 +37,4 @@ template<DataType DT>
 using ResolveType = typename ResolveTypeImpl<DT>::Type;
 
 
-} //namespace armnn
\ No newline at end of file
+} //namespace armnn
diff --git a/src/armnn/optimizations/ConvertConstants.hpp b/src/armnn/optimizations/ConvertConstants.hpp
index 9306a53bf4..d92ea28717 100644
--- a/src/armnn/optimizations/ConvertConstants.hpp
+++ b/src/armnn/optimizations/ConvertConstants.hpp
@@ -6,10 +6,12 @@
 #pragma once
 
 #include "Optimization.hpp"
+
 #include <backends/CpuTensorHandle.hpp>
-#include <Half.hpp>
 #include <FloatingPointConverter.hpp>
 
+#include <armnnUtils/Half.hpp>
+
 namespace armnn
 {
 namespace optimizations
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>