diff options
author | Éanna Ó Catháin <eanna.ocathain@arm.com> | 2021-04-07 14:35:25 +0100 |
---|---|---|
committer | Jim Flynn <jim.flynn@arm.com> | 2021-05-07 09:11:52 +0000 |
commit | c6ab02a626e15b4a12fc09ecd844eb8b95380c3c (patch) | |
tree | 9912ed9cdb89cdb24483b22d6621ae30049ae321 /samples/ObjectDetection/test | |
parent | e813d67f86df41a238ff79b5c554ef5027f56576 (diff) | |
download | armnn-c6ab02a626e15b4a12fc09ecd844eb8b95380c3c.tar.gz |
MLECO-1252 ASR sample application using the public ArmNN C++ API.
Change-Id: I98cd505b8772a8c8fa88308121bc94135bb45068
Signed-off-by: Éanna Ó Catháin <eanna.ocathain@arm.com>
Diffstat (limited to 'samples/ObjectDetection/test')
-rw-r--r-- | samples/ObjectDetection/test/FrameReaderTest.cpp | 4 | ||||
-rw-r--r-- | samples/ObjectDetection/test/ImageUtilsTest.cpp | 4 | ||||
-rw-r--r-- | samples/ObjectDetection/test/PipelineTest.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/samples/ObjectDetection/test/FrameReaderTest.cpp b/samples/ObjectDetection/test/FrameReaderTest.cpp index a4bda227b3..a02fa7fd4e 100644 --- a/samples/ObjectDetection/test/FrameReaderTest.cpp +++ b/samples/ObjectDetection/test/FrameReaderTest.cpp @@ -20,7 +20,7 @@ SCENARIO("Read frames from video file using CV frame reader", "[framereader]") { 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 @@ SCENARIO("Read frames from video file using CV frame reader", "[framereader]") { WHEN("Frame reader is initialised") { - od::CvVideoFrameReader reader; + common::CvVideoFrameReader reader; THEN("exception is thrown") { REQUIRE_THROWS(reader.Init(file)); diff --git a/samples/ObjectDetection/test/ImageUtilsTest.cpp b/samples/ObjectDetection/test/ImageUtilsTest.cpp index e486ae192b..4490cffda9 100644 --- a/samples/ObjectDetection/test/ImageUtilsTest.cpp +++ b/samples/ObjectDetection/test/ImageUtilsTest.cpp @@ -96,9 +96,9 @@ TEST_CASE("Test Adding Inference output to frame") 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) }; diff --git a/samples/ObjectDetection/test/PipelineTest.cpp b/samples/ObjectDetection/test/PipelineTest.cpp index 289f44f5e9..bc5824e483 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 @@ TEST_CASE("Test Network Execution SSD_MOBILE") 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); |