Release 18.08
diff --git a/tests/CaffeMnist-Armnn/CaffeMnist-Armnn.cpp b/tests/CaffeMnist-Armnn/CaffeMnist-Armnn.cpp
index ec14a5d..644041b 100644
--- a/tests/CaffeMnist-Armnn/CaffeMnist-Armnn.cpp
+++ b/tests/CaffeMnist-Armnn/CaffeMnist-Armnn.cpp
@@ -11,11 +11,18 @@
int retVal = EXIT_FAILURE;
try
{
+ using DataType = float;
+ using DatabaseType = MnistDatabase;
+ using ParserType = armnnCaffeParser::ICaffeParser;
+ using ModelType = InferenceModel<ParserType, DataType>;
+
// Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions.
- retVal = armnn::test::ClassifierInferenceTestMain<MnistDatabase, armnnCaffeParser::ICaffeParser>(
+ retVal = armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>(
argc, argv, "lenet_iter_9000.caffemodel", true, "data", "prob",
{ 0, 1, 5, 8, 9 },
- [](const char* dataDir) { return MnistDatabase(dataDir); });
+ [](const char* dataDir, const ModelType&) {
+ return DatabaseType(dataDir);
+ });
}
catch (const std::exception& e)
{