From 616e775763280992de92287b129dc335be91a24c Mon Sep 17 00:00:00 2001
From: arovir01 <Aron.Virginas-Tar@arm.com>
Date: Mon, 1 Oct 2018 17:08:59 +0100
Subject: 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
---
 src/backends/neon/workloads/NeonBaseConstantWorkload.hpp      | 2 +-
 src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp | 2 +-
 src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp | 3 +--
 src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp | 2 +-
 4 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/backends/neon')

diff --git a/src/backends/neon/workloads/NeonBaseConstantWorkload.hpp b/src/backends/neon/workloads/NeonBaseConstantWorkload.hpp
index 6bb275ac13..828e476d29 100644
--- a/src/backends/neon/workloads/NeonBaseConstantWorkload.hpp
+++ b/src/backends/neon/workloads/NeonBaseConstantWorkload.hpp
@@ -6,12 +6,12 @@
 #pragma once
 
 #include <arm_compute/core/Types.h>
+#include <armnnUtils/Half.hpp>
 #include <backends/aclCommon/ArmComputeTensorUtils.hpp>
 #include <backends/neon/NeonTensorHandle.hpp>
 #include <backends/neon/workloads/NeonWorkloadUtils.hpp>
 #include <backends/CpuTensorHandle.hpp>
 #include <backends/Workload.hpp>
-#include <Half.hpp>
 
 #include <boost/cast.hpp>
 
diff --git a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp
index 84e341fe64..c8a3f27352 100644
--- a/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp
+++ b/src/backends/neon/workloads/NeonConvertFp16ToFp32Workload.cpp
@@ -4,9 +4,9 @@
 //
 
 #include "NeonConvertFp16ToFp32Workload.hpp"
-#include <Half.hpp>
 #include <FloatingPointConverter.hpp>
 
+#include <armnnUtils/Half.hpp>
 #include <backends/WorkloadUtils.hpp>
 
 namespace armnn
diff --git a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp
index 261de3d0ce..6bcf6e082c 100644
--- a/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp
+++ b/src/backends/neon/workloads/NeonConvertFp32ToFp16Workload.cpp
@@ -5,9 +5,8 @@
 
 #include "NeonConvertFp32ToFp16Workload.hpp"
 
-#include <Half.hpp>
+#include <armnnUtils/Half.hpp>
 #include <FloatingPointConverter.hpp>
-
 #include <Profiling.hpp>
 #include <backends/WorkloadUtils.hpp>
 
diff --git a/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp b/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp
index 547f563d59..3b9626d7d3 100644
--- a/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp
+++ b/src/backends/neon/workloads/NeonConvolution2dBaseWorkload.cpp
@@ -10,7 +10,7 @@
 #include "NeonConvolution2dBaseWorkload.hpp"
 
 #include <armnn/Types.hpp>
-#include <Half.hpp>
+#include <armnnUtils/Half.hpp>
 
 namespace armnn
 {
-- 
cgit v1.2.1