diff options
author | Matthew Sloyan <matthew.sloyan@arm.com> | 2020-09-08 12:00:32 +0100 |
---|---|---|
committer | Matthew Sloyan <matthew.sloyan@arm.com> | 2020-09-11 18:24:18 +0100 |
commit | 80c6b146046252af153af27025a28fb59d33c5e6 (patch) | |
tree | 82cc16369d0a163fc4f97a25af13c4d792faecf8 /tests/Cifar10Database.cpp | |
parent | 77062ca6f288830a21e4ff4237059623eba25fa2 (diff) | |
download | armnn-80c6b146046252af153af27025a28fb59d33c5e6.tar.gz |
IVGCVSW-5299 Remove some boost::numeric_cast from armnn/tests
* Replaced with armnn/utility/NumericCast.hpp
* Removed combinations without float implementation in NumericCast.hpp
Signed-off-by: Matthew Sloyan <matthew.sloyan@arm.com>
Change-Id: Ia4ec605f063cdb0071fff302ef48c610f9f9505e
Diffstat (limited to 'tests/Cifar10Database.cpp')
-rw-r--r-- | tests/Cifar10Database.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/Cifar10Database.cpp b/tests/Cifar10Database.cpp index db2a234161..9e90da5032 100644 --- a/tests/Cifar10Database.cpp +++ b/tests/Cifar10Database.cpp @@ -5,8 +5,8 @@ #include "Cifar10Database.hpp" #include <armnn/Logging.hpp> +#include <armnn/utility/NumericCast.hpp> -#include <boost/numeric/conversion/cast.hpp> #include <fstream> #include <vector> @@ -70,9 +70,10 @@ std::unique_ptr<Cifar10Database::TTestCaseData> Cifar10Database::GetTestCaseData { for (unsigned int w = 0; w < 32; w++) { - inputImageData[countR_o] = boost::numeric_cast<float>(I[countR++]); - inputImageData[countG_o] = boost::numeric_cast<float>(I[countG++]); - inputImageData[countB_o] = boost::numeric_cast<float>(I[countB++]); + // Static_cast of unsigned char is safe with float + inputImageData[countR_o] = static_cast<float>(I[countR++]); + inputImageData[countG_o] = static_cast<float>(I[countG++]); + inputImageData[countB_o] = static_cast<float>(I[countB++]); countR_o += step; countG_o += step; @@ -80,6 +81,6 @@ std::unique_ptr<Cifar10Database::TTestCaseData> Cifar10Database::GetTestCaseData } } - const unsigned int label = boost::numeric_cast<unsigned int>(I[0]); + const unsigned int label = armnn::numeric_cast<unsigned int>(I[0]); return std::make_unique<TTestCaseData>(label, std::move(inputImageData)); } |