IVGCVSW-2947 Remove boost dependency from include/TypesUtils.hpp

!android-nn-driver:968

Signed-off-by: Aron Virginas-Tar <Aron.Virginas-Tar@arm.com>
Change-Id: I03ccb4842b060a9893567542bfcadc180bbc7311

14 files changed, 15 insertions, 12 deletions

diff --git a/src/backends/backendsCommon/MemCopyWorkload.cpp b/src/backends/backendsCommon/MemCopyWorkload.cpp
index 0fa04f8f46..c4e6f52eec 100644
--- a/src/backends/backendsCommon/MemCopyWorkload.cpp
+++ b/src/backends/backendsCommon/MemCopyWorkload.cpp
@@ -7,7 +7,7 @@
 
 #include "CpuTensorHandle.hpp"
 
-#include <TypeUtils.hpp>
+#include <ResolveType.hpp>
 
 #include <boost/cast.hpp>
 
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp
index ec163b59c3..df66b4e4c1 100644
--- a/src/backends/backendsCommon/WorkloadData.cpp
+++ b/src/backends/backendsCommon/WorkloadData.cpp
@@ -14,6 +14,7 @@
 #include <sstream>
 
 #include <boost/format.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 
 using namespace armnnUtils;
 
diff --git a/src/backends/backendsCommon/test/ArithmeticTestImpl.hpp b/src/backends/backendsCommon/test/ArithmeticTestImpl.hpp
index 5a65c32918..29dafd36b4 100644
--- a/src/backends/backendsCommon/test/ArithmeticTestImpl.hpp
+++ b/src/backends/backendsCommon/test/ArithmeticTestImpl.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 #include <armnn/INetwork.hpp>
 
diff --git a/src/backends/backendsCommon/test/BatchNormTestImpl.hpp b/src/backends/backendsCommon/test/BatchNormTestImpl.hpp
index ded4a067b4..d34a54f992 100644
--- a/src/backends/backendsCommon/test/BatchNormTestImpl.hpp
+++ b/src/backends/backendsCommon/test/BatchNormTestImpl.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 #include "WorkloadTestUtils.hpp"
 
 #include <armnn/ArmNN.hpp>
diff --git a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp
index 24f0825504..c2e539b20f 100755
--- a/src/backends/backendsCommon/test/Conv2dTestImpl.hpp
+++ b/src/backends/backendsCommon/test/Conv2dTestImpl.hpp
@@ -6,7 +6,7 @@
 
 #include "WorkloadTestUtils.hpp"
 #include "TensorUtils.hpp"
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 #include <Permute.hpp>
 #include <DataLayoutIndexed.hpp>
diff --git a/src/backends/backendsCommon/test/DetectionPostProcessLayerTestImpl.hpp b/src/backends/backendsCommon/test/DetectionPostProcessLayerTestImpl.hpp
index 2a2c1f92e2..092ce26696 100644
--- a/src/backends/backendsCommon/test/DetectionPostProcessLayerTestImpl.hpp
+++ b/src/backends/backendsCommon/test/DetectionPostProcessLayerTestImpl.hpp
@@ -5,7 +5,7 @@
 #pragma once
 
 #include "TensorCopyUtils.hpp"
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 #include "WorkloadTestUtils.hpp"
 
 #include <armnn/Types.hpp>
diff --git a/src/backends/backendsCommon/test/DetectionPostProcessTestImpl.hpp b/src/backends/backendsCommon/test/DetectionPostProcessTestImpl.hpp
index 5f4d2a480f..9a53456e81 100644
--- a/src/backends/backendsCommon/test/DetectionPostProcessTestImpl.hpp
+++ b/src/backends/backendsCommon/test/DetectionPostProcessTestImpl.hpp
@@ -7,7 +7,7 @@
 
 #include <armnn/INetwork.hpp>
 #include <backendsCommon/test/CommonTestUtils.hpp>
-#include <TypeUtils.hpp>
+#include <ResolveType.hpp>
 
 namespace{
 
diff --git a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
index a04fdf72e7..f8673d691e 100644
--- a/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/EndToEndTestImpl.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 #include <armnn/ArmNN.hpp>
 #include <armnn/INetwork.hpp>
diff --git a/src/backends/backendsCommon/test/FullyConnectedTestImpl.hpp b/src/backends/backendsCommon/test/FullyConnectedTestImpl.hpp
index cfdae63c26..ac2595b6bf 100644
--- a/src/backends/backendsCommon/test/FullyConnectedTestImpl.hpp
+++ b/src/backends/backendsCommon/test/FullyConnectedTestImpl.hpp
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 #include "WorkloadTestUtils.hpp"
 
 #include <backendsCommon/IBackendInternal.hpp>
diff --git a/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp b/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp
index 4ef1ef30ee..ce689d7ab3 100644
--- a/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp
+++ b/src/backends/backendsCommon/test/GatherEndToEndTestImpl.hpp
@@ -7,7 +7,7 @@
 
 #include <armnn/INetwork.hpp>
 #include <backendsCommon/test/CommonTestUtils.hpp>
-#include <TypeUtils.hpp>
+#include <ResolveType.hpp>
 
 namespace{
 
diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp
index cba4d3d93a..525ac1780a 100644
--- a/src/backends/backendsCommon/test/LayerTests.cpp
+++ b/src/backends/backendsCommon/test/LayerTests.cpp
@@ -5,7 +5,7 @@
 #include "LayerTests.hpp"
 #include "WorkloadTestUtils.hpp"
 #include "TensorUtils.hpp"
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 #include "test/TensorHelpers.hpp"
 #include "TensorCopyUtils.hpp"
diff --git a/src/backends/backendsCommon/test/MergerTestImpl.hpp b/src/backends/backendsCommon/test/MergerTestImpl.hpp
index de03c1096a..2511bd44ba 100644
--- a/src/backends/backendsCommon/test/MergerTestImpl.hpp
+++ b/src/backends/backendsCommon/test/MergerTestImpl.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 
 #include <armnn/INetwork.hpp>
 
diff --git a/src/backends/backendsCommon/test/QuantizeHelper.hpp b/src/backends/backendsCommon/test/QuantizeHelper.hpp
index bb4e561d59..b3b0631e18 100644
--- a/src/backends/backendsCommon/test/QuantizeHelper.hpp
+++ b/src/backends/backendsCommon/test/QuantizeHelper.hpp
@@ -10,7 +10,9 @@
 #include <initializer_list>
 #include <iterator>
 #include <vector>
+
 #include <boost/core/ignore_unused.hpp>
+#include <boost/numeric/conversion/cast.hpp>
 
 template<typename T, bool DoQuantize=true>
 struct SelectiveQuantizer
diff --git a/src/backends/backendsCommon/test/StridedSliceTestImpl.hpp b/src/backends/backendsCommon/test/StridedSliceTestImpl.hpp
index 1bf5c642ad..f15602c37b 100644
--- a/src/backends/backendsCommon/test/StridedSliceTestImpl.hpp
+++ b/src/backends/backendsCommon/test/StridedSliceTestImpl.hpp
@@ -4,7 +4,7 @@
 //
 #pragma once
 
-#include "TypeUtils.hpp"
+#include <ResolveType.hpp>
 #include "WorkloadTestUtils.hpp"
 
 #include <armnn/ArmNN.hpp>