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

diff --git a/src/armnnOnnxParser/test/Const.cpp b/src/armnnOnnxParser/test/Const.cpp
index 130b926..8777757 100644
--- a/src/armnnOnnxParser/test/Const.cpp
+++ b/src/armnnOnnxParser/test/Const.cpp
@@ -37,7 +37,7 @@
                               float_data: 6.0
 
                           }
-                          type: FLOAT
+                          type: 1
                         }
                         name:  "constantNode"
                         op_type:  "Constant"
@@ -46,7 +46,7 @@
                           name:  "Output"
                           type {
                              tensor_type {
-                               elem_type: FLOAT
+                               elem_type: 1
                                shape {
                                  dim {
                                     dim_value: 7
@@ -64,14 +64,14 @@
 
 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)