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/BatchNorm.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/BatchNorm.cpp')
| -rw-r--r-- | src/armnnOnnxParser/test/BatchNorm.cpp | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/armnnOnnxParser/test/BatchNorm.cpp b/src/armnnOnnxParser/test/BatchNorm.cpp index 8ce6aafb73..3e91feb0ca 100644 --- a/src/armnnOnnxParser/test/BatchNorm.cpp +++ b/src/armnnOnnxParser/test/BatchNorm.cpp @@ -25,7 +25,7 @@ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture< name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -47,7 +47,7 @@ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture< name: "mean" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -60,7 +60,7 @@ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture< name: "var" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -73,7 +73,7 @@ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture< name: "scale" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -86,7 +86,7 @@ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture< name: "bias" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -107,30 +107,30 @@ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture< attribute { name: "epsilon" f: 0.0010000000475 - type: FLOAT + type: 1 } } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 5.0 name: "mean" } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 2.0 name: "var" } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 0.0 name: "bias" } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 1.0 name: "scale" } @@ -138,7 +138,7 @@ struct BatchNormalizationMainFixture : public armnnUtils::ParserPrototxtFixture< name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -189,7 +189,7 @@ struct BatchNormalizationBisFixture : public armnnUtils::ParserPrototxtFixture<a name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -211,7 +211,7 @@ struct BatchNormalizationBisFixture : public armnnUtils::ParserPrototxtFixture<a name: "mean" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 2 @@ -224,7 +224,7 @@ struct BatchNormalizationBisFixture : public armnnUtils::ParserPrototxtFixture<a name: "var" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 2 @@ -237,7 +237,7 @@ struct BatchNormalizationBisFixture : public armnnUtils::ParserPrototxtFixture<a name: "scale" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 2 @@ -250,7 +250,7 @@ struct BatchNormalizationBisFixture : public armnnUtils::ParserPrototxtFixture<a name: "bias" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 2 @@ -271,33 +271,33 @@ struct BatchNormalizationBisFixture : public armnnUtils::ParserPrototxtFixture<a attribute { name: "epsilon" f: 0.00001 - type: FLOAT + type: 1 } } initializer { dims: 2 - data_type: FLOAT + data_type: 1 float_data: 0.0 float_data: 3.0 name: "mean" } initializer { dims: 2 - data_type: FLOAT + data_type: 1 float_data: 1.0 float_data: 1.5 name: "var" } initializer { dims: 2 - data_type: FLOAT + data_type: 1 float_data: 0.0 float_data: 1.0 name: "bias" } initializer { dims: 2 - data_type: FLOAT + data_type: 1 float_data: 1.0 float_data: 1.5 name: "scale" @@ -306,7 +306,7 @@ struct BatchNormalizationBisFixture : public armnnUtils::ParserPrototxtFixture<a name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 |