From 44a7167e0f13dc1d703cd573f57636fde711c618 Mon Sep 17 00:00:00 2001
From: Matteo Martincigh <matteo.martincigh@arm.com>
Date: Tue, 11 Dec 2018 13:46:52 +0000
Subject: 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
---
 src/armnnOnnxParser/test/Conv2D.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'src/armnnOnnxParser/test/Conv2D.cpp')

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
-- 
cgit v1.2.1