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/Addition.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/Addition.cpp')
| -rw-r--r-- | src/armnnOnnxParser/test/Addition.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/armnnOnnxParser/test/Addition.cpp b/src/armnnOnnxParser/test/Addition.cpp index 0c62fbea3c..993a620dcc 100644 --- a/src/armnnOnnxParser/test/Addition.cpp +++ b/src/armnnOnnxParser/test/Addition.cpp @@ -78,7 +78,7 @@ struct AddMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -105,14 +105,14 @@ struct AddMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser struct AddValidFixture : AddMainFixture { - AddValidFixture() : AddMainFixture("FLOAT") { + AddValidFixture() : AddMainFixture("1") { Setup(); } }; struct AddInvalidFixture : AddMainFixture { - AddInvalidFixture() : AddMainFixture("INT32") { } + AddInvalidFixture() : AddMainFixture("6") { } }; struct AddValidBroadcastFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser::IOnnxParser> @@ -131,7 +131,7 @@ struct AddValidBroadcastFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Input0" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -153,7 +153,7 @@ struct AddValidBroadcastFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Input1" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 4 @@ -175,7 +175,7 @@ struct AddValidBroadcastFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -217,7 +217,7 @@ struct AddInvalidBroadcastFixture : public armnnUtils::ParserPrototxtFixture<arm name: "Input0" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -239,7 +239,7 @@ struct AddInvalidBroadcastFixture : public armnnUtils::ParserPrototxtFixture<arm name: "Input1" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 4 @@ -261,7 +261,7 @@ struct AddInvalidBroadcastFixture : public armnnUtils::ParserPrototxtFixture<arm name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 |