MLCE-347 'REDUCE_MIN, REDUCE_MAX, REDUCE_SUM Support'

[platform/upstream/armnn.git] / tests / MobileNetSsdDatabase.hpp

diff --git a/tests/MobileNetSsdDatabase.hpp b/tests/MobileNetSsdDatabase.hpp
index 349d1ad..9cd987d 100644 (file)
--- a/tests/MobileNetSsdDatabase.hpp
+++ b/tests/MobileNetSsdDatabase.hpp
@@ -2,24 +2,21 @@
 // Copyright © 2017 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
+
 #pragma once
 
+#include "InferenceTestImage.hpp"
 #include "ObjectDetectionCommon.hpp"
 
-#include <memory>
-#include <string>
-#include <vector>
+#include <QuantizeHelper.hpp>
 
 #include <armnn/TypesUtils.hpp>
-#include <backendsCommon/test/QuantizeHelper.hpp>
-
-#include <boost/log/trivial.hpp>
-#include <boost/numeric/conversion/cast.hpp>
+#include <armnn/utility/NumericCast.hpp>
 
 #include <array>
+#include <memory>
 #include <string>
-
-#include "InferenceTestImage.hpp"
+#include <vector>
 
 namespace
 {
@@ -77,7 +74,7 @@ MobileNetSsdDatabase::MobileNetSsdDatabase(const std::string& imageDir, float sc
 std::unique_ptr<MobileNetSsdTestCaseData> MobileNetSsdDatabase::GetTestCaseData(unsigned int testCaseId)
 {
     const unsigned int safeTestCaseId =
-        testCaseId % boost::numeric_cast<unsigned int>(g_PerTestCaseInput.size());
+        testCaseId % armnn::numeric_cast<unsigned int>(g_PerTestCaseInput.size());
     const ObjectDetectionInput& testCaseInput = g_PerTestCaseInput[safeTestCaseId];
 
     // Load test case input
@@ -97,11 +94,11 @@ std::unique_ptr<MobileNetSsdTestCaseData> MobileNetSsdDatabase::GetTestCaseData(
 
         // Get image data as a vector of floats
         std::vector<float> floatImageData = GetImageDataAsNormalizedFloats(ImageChannelLayout::Rgb, image);
-        imageData = QuantizedVector<uint8_t>(m_Scale, m_Offset, floatImageData);
+        imageData = armnnUtils::QuantizedVector<uint8_t>(floatImageData, m_Scale, m_Offset);
     }
     catch (const InferenceTestImageException& e)
     {
-        BOOST_LOG_TRIVIAL(fatal) << "Failed to load image for test case " << testCaseId << ". Error: " << e.what();
+        ARMNN_LOG(fatal) << "Failed to load image for test case " << testCaseId << ". Error: " << e.what();
         return nullptr;
     }