From c577f2c6a3b4ddb6ba87a882723c53a248afbeba Mon Sep 17 00:00:00 2001 From: telsoa01 Date: Fri, 31 Aug 2018 09:22:23 +0100 Subject: Release 18.08 --- tests/CaffeResNet-Armnn/CaffeResNet-Armnn.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'tests/CaffeResNet-Armnn/CaffeResNet-Armnn.cpp') diff --git a/tests/CaffeResNet-Armnn/CaffeResNet-Armnn.cpp b/tests/CaffeResNet-Armnn/CaffeResNet-Armnn.cpp index 7cccb215a1..3b1a2945a5 100644 --- a/tests/CaffeResNet-Armnn/CaffeResNet-Armnn.cpp +++ b/tests/CaffeResNet-Armnn/CaffeResNet-Armnn.cpp @@ -3,7 +3,7 @@ // See LICENSE file in the project root for full license information. // #include "../InferenceTest.hpp" -#include "../ImageNetDatabase.hpp" +#include "../CaffePreprocessor.hpp" #include "armnnCaffeParser/ICaffeParser.hpp" int main(int argc, char* argv[]) @@ -20,12 +20,18 @@ int main(int argc, char* argv[]) armnn::TensorShape inputTensorShape({ 1, 3, 224, 224 }); + using DataType = float; + using DatabaseType = CaffePreprocessor; + using ParserType = armnnCaffeParser::ICaffeParser; + using ModelType = InferenceModel; + // Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions. - retVal = armnn::test::ClassifierInferenceTestMain( + retVal = armnn::test::ClassifierInferenceTestMain( argc, argv, "ResNet_50_ilsvrc15_model.caffemodel", true, "data", "prob", { 0, 1 }, - [&imageSet](const char* dataDir) { return ImageNetDatabase(dataDir, 224, 224, imageSet); }, - &inputTensorShape); + [&imageSet](const char* dataDir, const ModelType&) { + return DatabaseType(dataDir, 224, 224, imageSet); + }, &inputTensorShape); } catch (const std::exception& e) { -- cgit v1.2.1