diff options
| author | Narumol Prangnawarat <narumol.prangnawarat@arm.com> | 2019-03-14 11:55:03 +0000 |
|---|---|---|
| committer | Áron Virginás-Tar <aron.virginas-tar@arm.com> | 2019-03-15 15:24:44 +0000 |
| commit | 65d30965eef7e8534fc16ea4ded413c42a81c362 (patch) | |
| tree | 3ed591e57ee4bd68f98fce0d2b47aa0e621f2973 /tests | |
| parent | 222c753ba83bec5dc915f01d999ff76826ec45d0 (diff) | |
| download | armnn-65d30965eef7e8534fc16ea4ded413c42a81c362.tar.gz | |
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 <narumol.prangnawarat@arm.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CaffeSqueezeNet1_0-Armnn/CaffeSqueezeNet1_0-Armnn.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
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<CaffePreprocessor, armnnCaffeParser::ICaffeParser>( + using DataType = float; + using DatabaseType = CaffePreprocessor; + using ParserType = armnnCaffeParser::ICaffeParser; + using ModelType = InferenceModel<ParserType, DataType>; + + return armnn::test::ClassifierInferenceTestMain<DatabaseType, ParserType>( 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); }); } |