commit c6ab02a626e15b4a12fc09ecd844eb8b95380c3c
author Éanna Ó Catháin <eanna.ocathain@arm.com> Wed Apr 07 14:35:25 2021 +0100
committer Jim Flynn <jim.flynn@arm.com> Fri May 07 09:11:52 2021 +0000
tree 9912ed9cdb89cdb24483b22d6621ae30049ae321
parent e813d67f86df41a238ff79b5c554ef5027f56576

MLECO-1252 ASR sample application using the public ArmNN C++ API.

Change-Id: I98cd505b8772a8c8fa88308121bc94135bb45068
Signed-off-by: Éanna Ó Catháin <eanna.ocathain@arm.com>

samples/ObjectDetection/test/FrameReaderTest.cpp

diff --git a/samples/ObjectDetection/test/FrameReaderTest.cpp b/samples/ObjectDetection/test/FrameReaderTest.cpp
index a4bda22..a02fa7f 100644
--- a/samples/ObjectDetection/test/FrameReaderTest.cpp
+++ b/samples/ObjectDetection/test/FrameReaderTest.cpp
@@ -20,7 +20,7 @@
         std::string file =  testResources + "/" + "Megamind.avi";
         WHEN("Frame reader is initialised") {
 
-            od::CvVideoFrameReader reader;
+            common::CvVideoFrameReader reader;
             THEN("no exception is thrown") {
                 reader.Init(file);
 
@@ -92,7 +92,7 @@
 
         WHEN("Frame reader is initialised") {
 
-            od::CvVideoFrameReader reader;
+            common::CvVideoFrameReader reader;
 
             THEN("exception is thrown") {
                 REQUIRE_THROWS(reader.Init(file));

samples/ObjectDetection/test/ImageUtilsTest.cpp

diff --git a/samples/ObjectDetection/test/ImageUtilsTest.cpp b/samples/ObjectDetection/test/ImageUtilsTest.cpp
index e486ae1..4490cff 100644
--- a/samples/ObjectDetection/test/ImageUtilsTest.cpp
+++ b/samples/ObjectDetection/test/ImageUtilsTest.cpp
@@ -96,9 +96,9 @@
 
     std::string testResources = TEST_RESOURCE_DIR;
     REQUIRE(testResources != "");
-    std::vector<std::tuple<std::string, od::BBoxColor>> labels;
+    std::vector<std::tuple<std::string, common::BBoxColor>> labels;
 
-    od::BBoxColor c
+    common::BBoxColor c
     {
         .colorCode = std::make_tuple (0, 0, 255)
     };

samples/ObjectDetection/test/PipelineTest.cpp

diff --git a/samples/ObjectDetection/test/PipelineTest.cpp b/samples/ObjectDetection/test/PipelineTest.cpp
index 289f44f..bc5824e 100644
--- a/samples/ObjectDetection/test/PipelineTest.cpp
+++ b/samples/ObjectDetection/test/PipelineTest.cpp
@@ -4,7 +4,7 @@
 //
 #include <catch.hpp>
 #include <opencv2/opencv.hpp>
-#include <NetworkPipeline.hpp>
+#include "ObjectDetectionPipeline.hpp"
 #include "Types.hpp"
 
 static std::string GetResourceFilePath(const std::string& filename)
@@ -32,14 +32,14 @@
     std::string testResources = TEST_RESOURCE_DIR;
     REQUIRE(testResources != "");
     // Create the network options
-    od::ODPipelineOptions options;
+    common::PipelineOptions options;
     options.m_ModelFilePath = GetResourceFilePath("detect.tflite");
     options.m_ModelName = "SSD_MOBILE";
     options.m_backends = {"CpuAcc", "CpuRef"};
 
     od::IPipelinePtr objectDetectionPipeline = od::CreatePipeline(options);
 
-    od::InferenceResults results;
+    common::InferenceResults<float> results;
     cv::Mat processed;
     cv::Mat inputFrame = cv::imread(GetResourceFilePath("basketball1.png"), cv::IMREAD_COLOR);
     cv::cvtColor(inputFrame, inputFrame, cv::COLOR_BGR2RGB);