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 | |
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')
-rw-r--r-- | src/armnnOnnxParser/test/Addition.cpp | 18 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/BatchNorm.cpp | 44 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Const.cpp | 8 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Conv2D.cpp | 28 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/CreateNetwork.cpp | 2 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/DepthConv.cpp | 8 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/FullyConnected.cpp | 60 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/GetInputsOutputs.cpp | 16 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Pooling.cpp | 16 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/ProtoxtFixture.cpp | 4 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Relu.cpp | 4 | ||||
-rw-r--r-- | src/armnnOnnxParser/test/Reshape.cpp | 10 |
12 files changed, 109 insertions, 109 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 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 diff --git a/src/armnnOnnxParser/test/Const.cpp b/src/armnnOnnxParser/test/Const.cpp index 130b9263e8..8777757a96 100644 --- a/src/armnnOnnxParser/test/Const.cpp +++ b/src/armnnOnnxParser/test/Const.cpp @@ -37,7 +37,7 @@ struct ConstMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPars float_data: 6.0 } - type: FLOAT + type: 1 } name: "constantNode" op_type: "Constant" @@ -46,7 +46,7 @@ struct ConstMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPars name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 7 @@ -64,14 +64,14 @@ struct ConstMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPars struct ConstValidFixture : ConstMainFixture { - ConstValidFixture() : ConstMainFixture("FLOAT") { + ConstValidFixture() : ConstMainFixture("1") { Setup(); } }; struct ConstInvalidFixture : ConstMainFixture { - ConstInvalidFixture() : ConstMainFixture("FLOAT16") { } + ConstInvalidFixture() : ConstMainFixture("10") { } }; BOOST_FIXTURE_TEST_CASE(ValidConstTest, ConstValidFixture) diff --git a/src/armnnOnnxParser/test/Conv2D.cpp b/src/armnnOnnxParser/test/Conv2D.cpp index e0002fe705..da67985107 100644 --- a/src/armnnOnnxParser/test/Conv2D.cpp +++ b/src/armnnOnnxParser/test/Conv2D.cpp @@ -25,7 +25,7 @@ struct SimpleConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxP name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -47,7 +47,7 @@ struct SimpleConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxP name: "Weight" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -70,7 +70,7 @@ struct SimpleConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxP dims: 1 dims: 3 dims: 3 - data_type: FLOAT + data_type: 1 float_data: 2 float_data: 1 float_data: 0 @@ -123,7 +123,7 @@ struct SimpleConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxP name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -164,7 +164,7 @@ struct Conv2DWithBiasesFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -186,7 +186,7 @@ struct Conv2DWithBiasesFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Weight" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -209,7 +209,7 @@ struct Conv2DWithBiasesFixture : public armnnUtils::ParserPrototxtFixture<armnn dims: 1 dims: 2 dims: 2 - data_type: FLOAT + data_type: 1 float_data: 2 float_data: 1 float_data: 0 @@ -220,7 +220,7 @@ struct Conv2DWithBiasesFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Bias" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 4 @@ -231,7 +231,7 @@ struct Conv2DWithBiasesFixture : public armnnUtils::ParserPrototxtFixture<armnn } initializer { dims: 4 - data_type: FLOAT + data_type: 1 float_data: 10 float_data: 0 float_data: 0 @@ -280,7 +280,7 @@ struct Conv2DWithBiasesFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -322,7 +322,7 @@ struct Conv2DDimReducingFixture : public armnnUtils::ParserPrototxtFixture<armn name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -344,7 +344,7 @@ struct Conv2DDimReducingFixture : public armnnUtils::ParserPrototxtFixture<armn name: "Weight" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 2 @@ -367,7 +367,7 @@ struct Conv2DDimReducingFixture : public armnnUtils::ParserPrototxtFixture<armn dims: 3 dims: 1 dims: 1 - data_type: FLOAT + data_type: 1 float_data: -1 float_data: 2 float_data: 0 @@ -412,7 +412,7 @@ struct Conv2DDimReducingFixture : public armnnUtils::ParserPrototxtFixture<armn name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 diff --git a/src/armnnOnnxParser/test/CreateNetwork.cpp b/src/armnnOnnxParser/test/CreateNetwork.cpp index 37b62e4056..1e3e1b4fdd 100644 --- a/src/armnnOnnxParser/test/CreateNetwork.cpp +++ b/src/armnnOnnxParser/test/CreateNetwork.cpp @@ -23,7 +23,7 @@ BOOST_AUTO_TEST_CASE(CreateNetworkFromString) name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 diff --git a/src/armnnOnnxParser/test/DepthConv.cpp b/src/armnnOnnxParser/test/DepthConv.cpp index e618dbacb4..fdeb21ca14 100644 --- a/src/armnnOnnxParser/test/DepthConv.cpp +++ b/src/armnnOnnxParser/test/DepthConv.cpp @@ -25,7 +25,7 @@ struct SimpleDepthConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -47,7 +47,7 @@ struct SimpleDepthConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Weight" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 3 @@ -70,7 +70,7 @@ struct SimpleDepthConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnn dims: 1 dims: 2 dims: 2 - data_type: FLOAT + data_type: 1 float_data: 1 float_data: 1 float_data: 1 @@ -126,7 +126,7 @@ struct SimpleDepthConv2DFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 diff --git a/src/armnnOnnxParser/test/FullyConnected.cpp b/src/armnnOnnxParser/test/FullyConnected.cpp index 46cf3a9635..395ff90bb9 100644 --- a/src/armnnOnnxParser/test/FullyConnected.cpp +++ b/src/armnnOnnxParser/test/FullyConnected.cpp @@ -26,7 +26,7 @@ struct MatMulFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser: name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -42,7 +42,7 @@ struct MatMulFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser: name: "Const" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -56,7 +56,7 @@ struct MatMulFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser: } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 17.0 name: "Const" } @@ -71,7 +71,7 @@ struct MatMulFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParser: name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -115,7 +115,7 @@ struct FullyConnectedFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -131,7 +131,7 @@ struct FullyConnectedFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn name: "Weight" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -145,7 +145,7 @@ struct FullyConnectedFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 2 name: "Weight" } @@ -153,7 +153,7 @@ struct FullyConnectedFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn name: "Bias" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -164,7 +164,7 @@ struct FullyConnectedFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 1 name: "Bias" } @@ -186,7 +186,7 @@ struct FullyConnectedFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn name: "AddInput" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -202,7 +202,7 @@ struct FullyConnectedFixture : public armnnUtils::ParserPrototxtFixture<armnnOnn name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -254,7 +254,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -270,7 +270,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Weight" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -284,7 +284,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 2 name: "Weight" } @@ -292,7 +292,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Bias" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -303,7 +303,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 1 name: "Bias" } @@ -311,7 +311,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Bias_1" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -322,7 +322,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 10.0 name: "Bias_1" } @@ -358,7 +358,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "AddInput" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -374,7 +374,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "AddOutput" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -390,7 +390,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "AddOutput_1" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -406,7 +406,7 @@ struct MatMulUsedInTwoFcFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -458,7 +458,7 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -474,7 +474,7 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt name: "Weight" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -488,7 +488,7 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 2 name: "Weight" } @@ -496,7 +496,7 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt name: "Bias" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -507,7 +507,7 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt } initializer { dims: 1 - data_type: FLOAT + data_type: 1 float_data: 1 name: "Bias" } @@ -537,7 +537,7 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt name: "AddInput" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -553,7 +553,7 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt name: "AddOutput" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -569,7 +569,7 @@ struct MatMulUsedInTwoFcStaggeredFixture : public armnnUtils::ParserPrototxtFixt name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 diff --git a/src/armnnOnnxParser/test/GetInputsOutputs.cpp b/src/armnnOnnxParser/test/GetInputsOutputs.cpp index 677609376c..b22ef3a308 100644 --- a/src/armnnOnnxParser/test/GetInputsOutputs.cpp +++ b/src/armnnOnnxParser/test/GetInputsOutputs.cpp @@ -29,7 +29,7 @@ struct GetInputsOutputsMainFixture : public armnnUtils::ParserPrototxtFixture<ar name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 4 @@ -48,7 +48,7 @@ struct GetInputsOutputsMainFixture : public armnnUtils::ParserPrototxtFixture<ar name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 4 @@ -101,7 +101,7 @@ struct GetEmptyInputsOutputsFixture : public armnnUtils::ParserPrototxtFixture<a name: "value" t { dims: 7 - data_type: FLOAT + data_type: 1 float_data: 0.0 float_data: 1.0 float_data: 2.0 @@ -111,7 +111,7 @@ struct GetEmptyInputsOutputsFixture : public armnnUtils::ParserPrototxtFixture<a float_data: 6.0 } - type: FLOAT + type: 1 } name: "constantNode" op_type: "Constant" @@ -120,7 +120,7 @@ struct GetEmptyInputsOutputsFixture : public armnnUtils::ParserPrototxtFixture<a name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 7 @@ -171,7 +171,7 @@ struct GetInputsMultipleFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Input0" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 @@ -193,7 +193,7 @@ struct GetInputsMultipleFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Input1" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 4 @@ -215,7 +215,7 @@ struct GetInputsMultipleFixture : public armnnUtils::ParserPrototxtFixture<armnn name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 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 diff --git a/src/armnnOnnxParser/test/ProtoxtFixture.cpp b/src/armnnOnnxParser/test/ProtoxtFixture.cpp index a02102f48e..917f6f036b 100644 --- a/src/armnnOnnxParser/test/ProtoxtFixture.cpp +++ b/src/armnnOnnxParser/test/ProtoxtFixture.cpp @@ -31,7 +31,7 @@ struct ProtoxtTestFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 2 @@ -44,7 +44,7 @@ struct ProtoxtTestFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 1 diff --git a/src/armnnOnnxParser/test/Relu.cpp b/src/armnnOnnxParser/test/Relu.cpp index fb921320a3..a7f3bf3eec 100644 --- a/src/armnnOnnxParser/test/Relu.cpp +++ b/src/armnnOnnxParser/test/Relu.cpp @@ -25,7 +25,7 @@ struct ReluMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParse name: "Input" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 4 @@ -44,7 +44,7 @@ struct ReluMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxParse name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 4 diff --git a/src/armnnOnnxParser/test/Reshape.cpp b/src/armnnOnnxParser/test/Reshape.cpp index ba739cf7b5..60937f0666 100644 --- a/src/armnnOnnxParser/test/Reshape.cpp +++ b/src/armnnOnnxParser/test/Reshape.cpp @@ -38,7 +38,7 @@ struct ReshapeMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa name: "Shape" type { tensor_type { - elem_type: INT64 + elem_type: 7 shape { dim { dim_value: 2 @@ -57,7 +57,7 @@ struct ReshapeMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa } initializer { dims: 2 - data_type: INT64 + data_type: 7 int64_data: 2 int64_data: 2 name: "Shape" @@ -66,7 +66,7 @@ struct ReshapeMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa name: "Output" type { tensor_type { - elem_type: FLOAT + elem_type: 1 shape { dim { dim_value: 2 @@ -87,14 +87,14 @@ struct ReshapeMainFixture : public armnnUtils::ParserPrototxtFixture<armnnOnnxPa struct ReshapeValidFixture : ReshapeMainFixture { - ReshapeValidFixture() : ReshapeMainFixture("FLOAT") { + ReshapeValidFixture() : ReshapeMainFixture("1") { Setup(); } }; struct ReshapeInvalidFixture : ReshapeMainFixture { - ReshapeInvalidFixture() : ReshapeMainFixture("FLOAT16") { } + ReshapeInvalidFixture() : ReshapeMainFixture("10") { } }; BOOST_FIXTURE_TEST_CASE(ValidReshapeTest, ReshapeValidFixture) |