diff options
| author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-12-11 13:46:52 +0000 |
|---|---|---|
| committer | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-12-11 13:50:40 +0000 |
| commit | 44a7167e0f13dc1d703cd573f57636fde711c618 (patch) | |
| tree | 1f5d8c0677d29d48e55533fc68f622d68752e3aa /src/armnnOnnxParser/test/Pooling.cpp | |
| parent | 6a669d757aec8790d4548486cdbf073d8f81b646 (diff) | |
| download | armnn-44a7167e0f13dc1d703cd573f57636fde711c618.tar.gz | |
Fix the ONNX parser tests issues due to a change in the latest ONNx master
* A recent change in ONNX now forces the data types to be indicated by the
integer corresponding to their original enum value
* The new values are taken from the TensorProto_DataType enum at onnx.pb.h:153
Change-Id: I6054611795a7edb11463396eaefc4dd7e27261a0
Diffstat (limited to 'src/armnnOnnxParser/test/Pooling.cpp')
| -rw-r--r-- | src/armnnOnnxParser/test/Pooling.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/armnnOnnxParser/test/Pooling.cpp b/src/armnnOnnxParser/test/Pooling.cpp index cdb9b4f2ad..85bf9141a6 100644 --- a/src/armnnOnnxParser/test/Pooling.cpp +++ b/src/armnnOnnxParser/test/Pooling.cpp @@ -73,7 +73,7 @@ struct PoolingMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -100,14 +100,14 @@ struct PoolingMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa struct MaxPoolValidFixture : PoolingMainFixture { - MaxPoolValidFixture() : PoolingMainFixture("FLOAT", "\"MaxPool\"") { + MaxPoolValidFixture() : PoolingMainFixture("1", "\"MaxPool\"") { Setup(); } }; struct MaxPoolInvalidFixture : PoolingMainFixture { - MaxPoolInvalidFixture() : PoolingMainFixture("FLOAT16", "\"MaxPool\"") { } + MaxPoolInvalidFixture() : PoolingMainFixture("10", "\"MaxPool\"") { } }; BOOST_FIXTURE_TEST_CASE(ValidMaxPoolTest, MaxPoolValidFixture) @@ -117,7 +117,7 @@ BOOST_FIXTURE_TEST_CASE(ValidMaxPoolTest, MaxPoolValidFixture) struct AvgPoolValidFixture : PoolingMainFixture { - AvgPoolValidFixture() : PoolingMainFixture("FLOAT", "\"AveragePool\"") { + AvgPoolValidFixture() : PoolingMainFixture("1", "\"AveragePool\"") { Setup(); } }; @@ -138,7 +138,7 @@ struct PoolingWithPadFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -191,7 +191,7 @@ struct PoolingWithPadFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -243,7 +243,7 @@ struct GlobalAvgFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPars name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -271,7 +271,7 @@ struct GlobalAvgFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPars name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 |