diff options
Diffstat (limited to 'tests/CaffeAlexNet-Armnn')
-rw-r--r-- | tests/CaffeAlexNet-Armnn/CaffeAlexNet-Armnn.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/tests/CaffeAlexNet-Armnn/CaffeAlexNet-Armnn.cpp b/tests/CaffeAlexNet-Armnn/CaffeAlexNet-Armnn.cpp index dce4e08d05..b7ec4f63f1 100644 --- a/tests/CaffeAlexNet-Armnn/CaffeAlexNet-Armnn.cpp +++ b/tests/CaffeAlexNet-Armnn/CaffeAlexNet-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[]) @@ -11,10 +11,17 @@ int main(int argc, char* argv[]) int retVal = EXIT_FAILURE; try { + using DataType = float; + using DatabaseType = CaffePreprocessor; + using ParserType = armnnCaffeParser::ICaffeParser; + using ModelType = InferenceModel<ParserType, DataType>; + // Coverity fix: ClassifierInferenceTestMain() may throw uncaught exceptions. - retVal = armnn::test::ClassifierInferenceTestMain<ImageNetDatabase, armnnCaffeParser::ICaffeParser>( + retVal = armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>( argc, argv, "bvlc_alexnet_1.caffemodel", true, "data", "prob", { 0 }, - [](const char* dataDir) { return ImageNetDatabase(dataDir); }); + [](const char* dataDir, const ModelType &) { + return DatabaseType(dataDir); + }); } catch (const std::exception& e) { |