Release 18.08

1 files changed, 9 insertions, 2 deletions

diff --git a/tests/TfMnist-Armnn/TfMnist-Armnn.cpp b/tests/TfMnist-Armnn/TfMnist-Armnn.cpp
index bcc3f416cc..e492b9051a 100644
--- a/tests/TfMnist-Armnn/TfMnist-Armnn.cpp
+++ b/tests/TfMnist-Armnn/TfMnist-Armnn.cpp
@@ -13,11 +13,18 @@ int main(int argc, char* argv[])
     int retVal = EXIT_FAILURE;
     try
     {
+        using DataType = float;
+        using DatabaseType = MnistDatabase;
+        using ParserType = armnnTfParser::ITfParser;
+        using ModelType = InferenceModel<ParserType, DataType>;
+
         // Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions.
-        retVal = armnn::test::ClassifierInferenceTestMain<MnistDatabase, armnnTfParser::ITfParser>(
+        retVal = armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>(
                      argc, argv, "simple_mnist_tf.prototxt", false,
                      "Placeholder", "Softmax", { 0, 1, 2, 3, 4 },
-                     [](const char* dataDir) { return MnistDatabase(dataDir, true); },
+                     [](const char* dataDir, const ModelType&) {
+                         return DatabaseType(dataDir, true);
+                     },
                      &inputTensorShape);
     }
     catch (const std::exception& e)