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/Addition.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

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