commit 44a7167e0f13dc1d703cd573f57636fde711c618
author Matteo Martincigh <matteo.martincigh@arm.com> Tue Dec 11 13:46:52 2018 +0000
committer Matteo Martincigh <matteo.martincigh@arm.com> Tue Dec 11 13:50:40 2018 +0000
tree 1f5d8c0677d29d48e55533fc68f622d68752e3aa
parent 6a669d757aec8790d4548486cdbf073d8f81b646

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/Pooling.cpp

diff --git a/src/armnnOnnxParser/test/Pooling.cpp b/src/armnnOnnxParser/test/Pooling.cpp
index cdb9b4f..85bf914 100644
--- a/src/armnnOnnxParser/test/Pooling.cpp
+++ b/src/armnnOnnxParser/test/Pooling.cpp
@@ -73,7 +73,7 @@
                           name: "Output"
                           type {
                              tensor_type {
-                               elem_type: FLOAT
+                               elem_type: 1
                                shape {
                                    dim {
                                        dim_value: 1
@@ -100,14 +100,14 @@
 
 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 @@
 
 struct AvgPoolValidFixture : PoolingMainFixture
 {
-    AvgPoolValidFixture() : PoolingMainFixture("FLOAT", "\"AveragePool\"") {
+    AvgPoolValidFixture() : PoolingMainFixture("1", "\"AveragePool\"") {
         Setup();
     }
 };
@@ -138,7 +138,7 @@
                         name: "Input"
                         type {
                           tensor_type {
-                            elem_type: FLOAT
+                            elem_type: 1
                             shape {
                               dim {
                                 dim_value: 1
@@ -191,7 +191,7 @@
                           name: "Output"
                           type {
                              tensor_type {
-                               elem_type: FLOAT
+                               elem_type: 1
                                shape {
                                    dim {
                                        dim_value: 1
@@ -243,7 +243,7 @@
                         name: "Input"
                         type {
                           tensor_type {
-                            elem_type: FLOAT
+                            elem_type: 1
                             shape {
                               dim {
                                 dim_value: 1
@@ -271,7 +271,7 @@
                           name: "Output"
                           type {
                              tensor_type {
-                               elem_type: FLOAT
+                               elem_type: 1
                                shape {
                                    dim {
                                        dim_value: 1