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
diff --git a/src/armnnOnnxParser/test/Addition.cpp b/src/armnnOnnxParser/test/Addition.cpp
index 0c62fbe..993a620 100644
--- a/src/armnnOnnxParser/test/Addition.cpp
+++ b/src/armnnOnnxParser/test/Addition.cpp
@@ -78,7 +78,7 @@
name: "Output"
type {
tensor_type {
- elem_type: FLOAT
+ elem_type: 1
shape {
dim {
dim_value: 1
@@ -105,14 +105,14 @@
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 @@
name: "Input0"
type {
tensor_type {
- elem_type: FLOAT
+ elem_type: 1
shape {
dim {
dim_value: 1
@@ -153,7 +153,7 @@
name: "Input1"
type {
tensor_type {
- elem_type: FLOAT
+ elem_type: 1
shape {
dim {
dim_value: 4
@@ -175,7 +175,7 @@
name: "Output"
type {
tensor_type {
- elem_type: FLOAT
+ elem_type: 1
shape {
dim {
dim_value: 1
@@ -217,7 +217,7 @@
name: "Input0"
type {
tensor_type {
- elem_type: FLOAT
+ elem_type: 1
shape {
dim {
dim_value: 1
@@ -239,7 +239,7 @@
name: "Input1"
type {
tensor_type {
- elem_type: FLOAT
+ elem_type: 1
shape {
dim {
dim_value: 4
@@ -261,7 +261,7 @@
name: "Output"
type {
tensor_type {
- elem_type: FLOAT
+ elem_type: 1
shape {
dim {
dim_value: 1