Update serialization_lib to 0.22.0
- Remove IdentityN and Placeholder
- Add Div
Signed-off-by: Kevin Cheng <kevin.cheng@arm.com>
Change-Id: I2f01fe8d37a6d1cabba2101283059cb6ed678ec2
diff --git a/include/operator.def b/include/operator.def
index 80ae547..0329dd2 100644
--- a/include/operator.def
+++ b/include/operator.def
@@ -49,6 +49,7 @@
DEF_OPERATOR(bitwise_and, BITWISE_AND, BitwiseAnd, None, None)
DEF_OPERATOR(bitwise_or, BITWISE_OR, BitwiseOr, None, None)
DEF_OPERATOR(bitwise_xor, BITWISE_XOR, BitwiseXor, None, None)
+DEF_OPERATOR(div, DIV, Div, None, None)
DEF_OPERATOR(logical_and, LOGICAL_AND, LogicalAnd, None, None)
DEF_OPERATOR(logical_left_shift, LOGICAL_LEFT_SHIFT, LogicalLeftShift, None, None)
DEF_OPERATOR(logical_right_shift, LOGICAL_RIGHT_SHIFT, LogicalRightShift, None, None)
@@ -112,9 +113,7 @@
/* data nodes */
DEF_OPERATOR(const, CONST, Const, None, None)
-DEF_OPERATOR(placeholder, PLACEHOLDER, Placeholder, None, None)
DEF_OPERATOR(identity, IDENTITY, Identity, None, None)
-DEF_OPERATOR(identityn, IDENTITYN, IdentityN, None, None)
/* custom operations */
DEF_OPERATOR(custom, CUSTOM, Custom, None, None)
diff --git a/include/tosa_generated.h b/include/tosa_generated.h
index 5e883a1..735aca8 100644
--- a/include/tosa_generated.h
+++ b/include/tosa_generated.h
@@ -199,62 +199,61 @@
Op_BITWISE_AND = 16,
Op_BITWISE_OR = 17,
Op_BITWISE_XOR = 18,
- Op_LOGICAL_AND = 19,
- Op_LOGICAL_LEFT_SHIFT = 20,
- Op_LOGICAL_RIGHT_SHIFT = 21,
- Op_LOGICAL_OR = 22,
- Op_LOGICAL_XOR = 23,
- Op_MAXIMUM = 24,
- Op_MINIMUM = 25,
- Op_MUL = 26,
- Op_POW = 27,
- Op_SUB = 28,
- Op_TABLE = 29,
- Op_ABS = 30,
- Op_BITWISE_NOT = 31,
- Op_CEIL = 32,
- Op_CLZ = 33,
- Op_EXP = 34,
- Op_FLOOR = 35,
- Op_LOG = 36,
- Op_LOGICAL_NOT = 37,
- Op_NEGATE = 38,
- Op_RECIPROCAL = 39,
- Op_RSQRT = 40,
- Op_SELECT = 41,
- Op_EQUAL = 42,
- Op_GREATER = 43,
- Op_GREATER_EQUAL = 44,
- Op_REDUCE_ANY = 45,
- Op_REDUCE_ALL = 46,
- Op_REDUCE_MAX = 47,
- Op_REDUCE_MIN = 48,
- Op_REDUCE_PRODUCT = 49,
- Op_REDUCE_SUM = 50,
- Op_CONCAT = 51,
- Op_PAD = 52,
- Op_RESHAPE = 53,
- Op_REVERSE = 54,
- Op_SLICE = 55,
- Op_TILE = 56,
- Op_TRANSPOSE = 57,
- Op_GATHER = 58,
- Op_SCATTER = 59,
- Op_RESIZE = 60,
- Op_CAST = 61,
- Op_RESCALE = 62,
- Op_CONST = 63,
- Op_PLACEHOLDER = 64,
+ Op_DIV = 19,
+ Op_LOGICAL_AND = 20,
+ Op_LOGICAL_LEFT_SHIFT = 21,
+ Op_LOGICAL_RIGHT_SHIFT = 22,
+ Op_LOGICAL_OR = 23,
+ Op_LOGICAL_XOR = 24,
+ Op_MAXIMUM = 25,
+ Op_MINIMUM = 26,
+ Op_MUL = 27,
+ Op_POW = 28,
+ Op_SUB = 29,
+ Op_TABLE = 30,
+ Op_ABS = 31,
+ Op_BITWISE_NOT = 32,
+ Op_CEIL = 33,
+ Op_CLZ = 34,
+ Op_EXP = 35,
+ Op_FLOOR = 36,
+ Op_LOG = 37,
+ Op_LOGICAL_NOT = 38,
+ Op_NEGATE = 39,
+ Op_RECIPROCAL = 40,
+ Op_RSQRT = 41,
+ Op_SELECT = 42,
+ Op_EQUAL = 43,
+ Op_GREATER = 44,
+ Op_GREATER_EQUAL = 45,
+ Op_REDUCE_ANY = 46,
+ Op_REDUCE_ALL = 47,
+ Op_REDUCE_MAX = 48,
+ Op_REDUCE_MIN = 49,
+ Op_REDUCE_PRODUCT = 50,
+ Op_REDUCE_SUM = 51,
+ Op_CONCAT = 52,
+ Op_PAD = 53,
+ Op_RESHAPE = 54,
+ Op_REVERSE = 55,
+ Op_SLICE = 56,
+ Op_TILE = 57,
+ Op_TRANSPOSE = 58,
+ Op_GATHER = 59,
+ Op_SCATTER = 60,
+ Op_RESIZE = 61,
+ Op_CAST = 62,
+ Op_RESCALE = 63,
+ Op_CONST = 64,
Op_IDENTITY = 65,
- Op_IDENTITYN = 66,
- Op_CUSTOM = 67,
- Op_COND_IF = 68,
- Op_WHILE_LOOP = 69,
+ Op_CUSTOM = 66,
+ Op_COND_IF = 67,
+ Op_WHILE_LOOP = 68,
Op_MIN = Op_UNKNOWN,
Op_MAX = Op_WHILE_LOOP
};
-inline const Op (&EnumValuesOp())[70] {
+inline const Op (&EnumValuesOp())[69] {
static const Op values[] = {
Op_UNKNOWN,
Op_ARGMAX,
@@ -275,6 +274,7 @@
Op_BITWISE_AND,
Op_BITWISE_OR,
Op_BITWISE_XOR,
+ Op_DIV,
Op_LOGICAL_AND,
Op_LOGICAL_LEFT_SHIFT,
Op_LOGICAL_RIGHT_SHIFT,
@@ -320,9 +320,7 @@
Op_CAST,
Op_RESCALE,
Op_CONST,
- Op_PLACEHOLDER,
Op_IDENTITY,
- Op_IDENTITYN,
Op_CUSTOM,
Op_COND_IF,
Op_WHILE_LOOP
@@ -331,7 +329,7 @@
}
inline const char * const *EnumNamesOp() {
- static const char * const names[71] = {
+ static const char * const names[70] = {
"UNKNOWN",
"ARGMAX",
"AVG_POOL2D",
@@ -351,6 +349,7 @@
"BITWISE_AND",
"BITWISE_OR",
"BITWISE_XOR",
+ "DIV",
"LOGICAL_AND",
"LOGICAL_LEFT_SHIFT",
"LOGICAL_RIGHT_SHIFT",
@@ -396,9 +395,7 @@
"CAST",
"RESCALE",
"CONST",
- "PLACEHOLDER",
"IDENTITY",
- "IDENTITYN",
"CUSTOM",
"COND_IF",
"WHILE_LOOP",
@@ -1888,7 +1885,7 @@
return GetField<int32_t>(VT__MAJOR, 0);
}
int32_t _minor() const {
- return GetField<int32_t>(VT__MINOR, 21);
+ return GetField<int32_t>(VT__MINOR, 22);
}
int32_t _patch() const {
return GetField<int32_t>(VT__PATCH, 0);
@@ -1914,7 +1911,7 @@
fbb_.AddElement<int32_t>(Version::VT__MAJOR, _major, 0);
}
void add__minor(int32_t _minor) {
- fbb_.AddElement<int32_t>(Version::VT__MINOR, _minor, 21);
+ fbb_.AddElement<int32_t>(Version::VT__MINOR, _minor, 22);
}
void add__patch(int32_t _patch) {
fbb_.AddElement<int32_t>(Version::VT__PATCH, _patch, 0);
@@ -1937,7 +1934,7 @@
inline flatbuffers::Offset<Version> CreateVersion(
flatbuffers::FlatBufferBuilder &_fbb,
int32_t _major = 0,
- int32_t _minor = 21,
+ int32_t _minor = 22,
int32_t _patch = 0,
bool _experimental = false) {
VersionBuilder builder_(_fbb);
diff --git a/python/tosa/Op.py b/python/tosa/Op.py
index 584b00e..0a4cdda 100644
--- a/python/tosa/Op.py
+++ b/python/tosa/Op.py
@@ -37,55 +37,54 @@
BITWISE_AND = 16
BITWISE_OR = 17
BITWISE_XOR = 18
- LOGICAL_AND = 19
- LOGICAL_LEFT_SHIFT = 20
- LOGICAL_RIGHT_SHIFT = 21
- LOGICAL_OR = 22
- LOGICAL_XOR = 23
- MAXIMUM = 24
- MINIMUM = 25
- MUL = 26
- POW = 27
- SUB = 28
- TABLE = 29
- ABS = 30
- BITWISE_NOT = 31
- CEIL = 32
- CLZ = 33
- EXP = 34
- FLOOR = 35
- LOG = 36
- LOGICAL_NOT = 37
- NEGATE = 38
- RECIPROCAL = 39
- RSQRT = 40
- SELECT = 41
- EQUAL = 42
- GREATER = 43
- GREATER_EQUAL = 44
- REDUCE_ANY = 45
- REDUCE_ALL = 46
- REDUCE_MAX = 47
- REDUCE_MIN = 48
- REDUCE_PRODUCT = 49
- REDUCE_SUM = 50
- CONCAT = 51
- PAD = 52
- RESHAPE = 53
- REVERSE = 54
- SLICE = 55
- TILE = 56
- TRANSPOSE = 57
- GATHER = 58
- SCATTER = 59
- RESIZE = 60
- CAST = 61
- RESCALE = 62
- CONST = 63
- PLACEHOLDER = 64
+ DIV = 19
+ LOGICAL_AND = 20
+ LOGICAL_LEFT_SHIFT = 21
+ LOGICAL_RIGHT_SHIFT = 22
+ LOGICAL_OR = 23
+ LOGICAL_XOR = 24
+ MAXIMUM = 25
+ MINIMUM = 26
+ MUL = 27
+ POW = 28
+ SUB = 29
+ TABLE = 30
+ ABS = 31
+ BITWISE_NOT = 32
+ CEIL = 33
+ CLZ = 34
+ EXP = 35
+ FLOOR = 36
+ LOG = 37
+ LOGICAL_NOT = 38
+ NEGATE = 39
+ RECIPROCAL = 40
+ RSQRT = 41
+ SELECT = 42
+ EQUAL = 43
+ GREATER = 44
+ GREATER_EQUAL = 45
+ REDUCE_ANY = 46
+ REDUCE_ALL = 47
+ REDUCE_MAX = 48
+ REDUCE_MIN = 49
+ REDUCE_PRODUCT = 50
+ REDUCE_SUM = 51
+ CONCAT = 52
+ PAD = 53
+ RESHAPE = 54
+ REVERSE = 55
+ SLICE = 56
+ TILE = 57
+ TRANSPOSE = 58
+ GATHER = 59
+ SCATTER = 60
+ RESIZE = 61
+ CAST = 62
+ RESCALE = 63
+ CONST = 64
IDENTITY = 65
- IDENTITYN = 66
- CUSTOM = 67
- COND_IF = 68
- WHILE_LOOP = 69
+ CUSTOM = 66
+ COND_IF = 67
+ WHILE_LOOP = 68
diff --git a/python/tosa/Version.py b/python/tosa/Version.py
index 2aeab9b..a63c482 100644
--- a/python/tosa/Version.py
+++ b/python/tosa/Version.py
@@ -51,7 +51,7 @@
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int32Flags, o + self._tab.Pos)
- return 21
+ return 22
# Version
def _patch(self):
@@ -69,7 +69,7 @@
def VersionStart(builder): builder.StartObject(4)
def VersionAdd_major(builder, Major): builder.PrependInt32Slot(0, Major, 0)
-def VersionAdd_minor(builder, Minor): builder.PrependInt32Slot(1, Minor, 21)
+def VersionAdd_minor(builder, Minor): builder.PrependInt32Slot(1, Minor, 22)
def VersionAdd_patch(builder, Patch): builder.PrependInt32Slot(2, Patch, 0)
def VersionAdd_experimental(builder, Experimental): builder.PrependBoolSlot(3, Experimental, 0)
def VersionEnd(builder): return builder.EndObject()
diff --git a/schema/tosa.fbs b/schema/tosa.fbs
index c02154d..d64a50c 100644
--- a/schema/tosa.fbs
+++ b/schema/tosa.fbs
@@ -64,6 +64,7 @@
BITWISE_AND,
BITWISE_OR,
BITWISE_XOR,
+ DIV,
LOGICAL_AND,
LOGICAL_LEFT_SHIFT,
LOGICAL_RIGHT_SHIFT,
@@ -127,9 +128,7 @@
// Data Nodes
CONST,
- PLACEHOLDER,
IDENTITY,
- IDENTITYN,
// Custom operations
CUSTOM,
@@ -271,7 +270,7 @@
table Version {
_major: int32 = 0;
- _minor: int32 = 21;
+ _minor: int32 = 22;
_patch: int32 = 0;
_experimental: bool = false;
}