From 0663d66c64d8f1cb2b6158f9018c9ba19e2c504b Mon Sep 17 00:00:00 2001
From: Matthew Sloyan <matthew.sloyan@arm.com>
Date: Mon, 14 Sep 2020 11:47:26 +0100
Subject: IVGCVSW-5303 Remove some boost::numeric_cast from rest of ArmNN

 * Replaced with armnn/utility/NumericCast.hpp
 * Exclusions in TypeUtils.cpp and QuantizerVisitor.cpp
 * Excluded as requires float implementation in NumericCast.hpp

Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: I5c4c60e7028e1a51bf9379457278d253fd37bc70
---
 src/armnnDeserializer/Deserializer.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/armnnDeserializer/Deserializer.cpp')

diff --git a/src/armnnDeserializer/Deserializer.cpp b/src/armnnDeserializer/Deserializer.cpp
index 7143cdbdcc..4c2f2f1397 100644
--- a/src/armnnDeserializer/Deserializer.cpp
+++ b/src/armnnDeserializer/Deserializer.cpp
@@ -15,12 +15,12 @@
 #include <armnnUtils/Transpose.hpp>
 #include <armnn/utility/Assert.hpp>
 #include <armnn/utility/IgnoreUnused.hpp>
+#include <armnn/utility/NumericCast.hpp>
 
 #include <ParserHelper.hpp>
 #include <VerificationHelpers.hpp>
 
 #include <boost/format.hpp>
-#include <boost/numeric/conversion/cast.hpp>
 
 #include <fstream>
 #include <algorithm>
@@ -885,7 +885,7 @@ void Deserializer::SetupInputLayers(GraphPtr graph)
         unsigned int inputLayerIndex = 0xFFFFFFFF;
         if (GetFeatureVersions(graph).m_BindingIdScheme == 0)
         {
-            const unsigned int inputId = boost::numeric_cast<unsigned int>(graph->inputIds()->Get(i));
+            const unsigned int inputId = armnn::numeric_cast<unsigned int>(graph->inputIds()->Get(i));
             inputLayerIndex = GetLayerIndexInVector(graph, inputId);
         }
         else
@@ -924,7 +924,7 @@ void Deserializer::SetupOutputLayers(GraphPtr graph)
         unsigned int outputLayerIndex = 0xFFFFFFFF;
         if (GetFeatureVersions(graph).m_BindingIdScheme == 0)
         {
-            const unsigned int outputId = boost::numeric_cast<unsigned int>(graph->outputIds()->Get(i));
+            const unsigned int outputId = armnn::numeric_cast<unsigned int>(graph->outputIds()->Get(i));
             outputLayerIndex = GetLayerIndexInVector(graph, outputId);
         }
         else
@@ -2006,7 +2006,7 @@ armnn::TensorInfo Deserializer::OutputShapeOfReshape(const armnn::TensorInfo& in
         }
 
         auto targetNumElements =
-           boost::numeric_cast<unsigned int>(
+           armnn::numeric_cast<unsigned int>(
                std::accumulate(targetDimsIn.begin(), targetDimsIn.end(), -1, std::multiplies<int32_t>()));
 
         auto stretchIndex = static_cast<size_t>(std::distance(targetDimsIn.begin(), stretchDim));
-- 
cgit v1.2.1