From 65d30965eef7e8534fc16ea4ded413c42a81c362 Mon Sep 17 00:00:00 2001 From: Narumol Prangnawarat Date: Thu, 14 Mar 2019 11:55:03 +0000 Subject: IVGCVSW-2354 Caffe SqueezeNet through armnn Cl and Neon * Compute Softmax Acl axis for Cl and Neon * Add unittests for Softmax in 3D and 4D * Correct input and output layer names in CaffeSqueezeNet inference test Change-Id: I2d369d9a2db19c40f2af3341039dd33f0c5637b1 Signed-off-by: Narumol Prangnawarat --- tests/CaffeSqueezeNet1_0-Armnn/CaffeSqueezeNet1_0-Armnn.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/CaffeSqueezeNet1_0-Armnn/CaffeSqueezeNet1_0-Armnn.cpp b/tests/CaffeSqueezeNet1_0-Armnn/CaffeSqueezeNet1_0-Armnn.cpp index 5eaf2ef7ac..f4c16fec3e 100644 --- a/tests/CaffeSqueezeNet1_0-Armnn/CaffeSqueezeNet1_0-Armnn.cpp +++ b/tests/CaffeSqueezeNet1_0-Armnn/CaffeSqueezeNet1_0-Armnn.cpp @@ -8,8 +8,13 @@ int main(int argc, char* argv[]) { - return armnn::test::ClassifierInferenceTestMain( + using DataType = float; + using DatabaseType = CaffePreprocessor; + using ParserType = armnnCaffeParser::ICaffeParser; + using ModelType = InferenceModel; + + return armnn::test::ClassifierInferenceTestMain( argc, argv, "squeezenet.caffemodel", true, - "data", "output", { 0 }, - [](const char* dataDir) { return CaffePreprocessor(dataDir); }); + "input", "prob", { 0 }, + [](const char* dataDir, const ModelType &) { return CaffePreprocessor(dataDir); }); } -- cgit v1.2.1