Align the serialization schema with TOSA 0.24.0 specification
The operators are pool, conv, reshape, slice, transpose, and table.
Signed-off-by: TatWai Chong <tatwai.chong@arm.com>
Change-Id: I425ab407e699159f75834f31ad2d48e206c71749
diff --git a/include/attribute.def b/include/attribute.def
index 2534cc4..38f6d29 100644
--- a/include/attribute.def
+++ b/include/attribute.def
@@ -27,12 +27,12 @@
*/
DEF_ATTRIBUTE(Pool, 3,
- int32_t, V, padding,
+ int32_t, V, pad,
int32_t, V, kernel,
int32_t, V, stride)
DEF_ATTRIBUTE(Conv, 3,
- int32_t, V, padding,
+ int32_t, V, pad,
int32_t, V, stride,
int32_t, V, dilation)
@@ -51,10 +51,10 @@
int32_t, S, axis)
DEF_ATTRIBUTE(Reshape, 1,
- int32_t, V, shape)
+ int32_t, V, new_shape)
DEF_ATTRIBUTE(Slice, 2,
- int32_t, V, begin,
+ int32_t, V, start,
int32_t, V, size)
DEF_ATTRIBUTE(Tile, 1,
@@ -99,8 +99,8 @@
string, S, body_branch)
DEF_ATTRIBUTE(Transpose, 1,
- int32_t, V, perm)
+ int32_t, V, perms)
DEF_ATTRIBUTE(Table, 1,
- int32_t, V, table)
+ int16_t, V, table)
diff --git a/include/tosa_generated.h b/include/tosa_generated.h
index c30a04d..77292bb 100644
--- a/include/tosa_generated.h
+++ b/include/tosa_generated.h
@@ -622,12 +622,12 @@
struct PoolAttribute FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
typedef PoolAttributeBuilder Builder;
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
- VT_PADDING = 4,
+ VT_PAD = 4,
VT_KERNEL = 6,
VT_STRIDE = 8
};
- const flatbuffers::Vector<int32_t> *padding() const {
- return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_PADDING);
+ const flatbuffers::Vector<int32_t> *pad() const {
+ return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_PAD);
}
const flatbuffers::Vector<int32_t> *kernel() const {
return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_KERNEL);
@@ -637,8 +637,8 @@
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
- VerifyOffset(verifier, VT_PADDING) &&
- verifier.VerifyVector(padding()) &&
+ VerifyOffset(verifier, VT_PAD) &&
+ verifier.VerifyVector(pad()) &&
VerifyOffset(verifier, VT_KERNEL) &&
verifier.VerifyVector(kernel()) &&
VerifyOffset(verifier, VT_STRIDE) &&
@@ -651,8 +651,8 @@
typedef PoolAttribute Table;
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
- void add_padding(flatbuffers::Offset<flatbuffers::Vector<int32_t>> padding) {
- fbb_.AddOffset(PoolAttribute::VT_PADDING, padding);
+ void add_pad(flatbuffers::Offset<flatbuffers::Vector<int32_t>> pad) {
+ fbb_.AddOffset(PoolAttribute::VT_PAD, pad);
}
void add_kernel(flatbuffers::Offset<flatbuffers::Vector<int32_t>> kernel) {
fbb_.AddOffset(PoolAttribute::VT_KERNEL, kernel);
@@ -673,27 +673,27 @@
inline flatbuffers::Offset<PoolAttribute> CreatePoolAttribute(
flatbuffers::FlatBufferBuilder &_fbb,
- flatbuffers::Offset<flatbuffers::Vector<int32_t>> padding = 0,
+ flatbuffers::Offset<flatbuffers::Vector<int32_t>> pad = 0,
flatbuffers::Offset<flatbuffers::Vector<int32_t>> kernel = 0,
flatbuffers::Offset<flatbuffers::Vector<int32_t>> stride = 0) {
PoolAttributeBuilder builder_(_fbb);
builder_.add_stride(stride);
builder_.add_kernel(kernel);
- builder_.add_padding(padding);
+ builder_.add_pad(pad);
return builder_.Finish();
}
inline flatbuffers::Offset<PoolAttribute> CreatePoolAttributeDirect(
flatbuffers::FlatBufferBuilder &_fbb,
- const std::vector<int32_t> *padding = nullptr,
+ const std::vector<int32_t> *pad = nullptr,
const std::vector<int32_t> *kernel = nullptr,
const std::vector<int32_t> *stride = nullptr) {
- auto padding__ = padding ? _fbb.CreateVector<int32_t>(*padding) : 0;
+ auto pad__ = pad ? _fbb.CreateVector<int32_t>(*pad) : 0;
auto kernel__ = kernel ? _fbb.CreateVector<int32_t>(*kernel) : 0;
auto stride__ = stride ? _fbb.CreateVector<int32_t>(*stride) : 0;
return tosa::CreatePoolAttribute(
_fbb,
- padding__,
+ pad__,
kernel__,
stride__);
}
@@ -701,12 +701,12 @@
struct ConvAttribute FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
typedef ConvAttributeBuilder Builder;
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
- VT_PADDING = 4,
+ VT_PAD = 4,
VT_STRIDE = 6,
VT_DILATION = 8
};
- const flatbuffers::Vector<int32_t> *padding() const {
- return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_PADDING);
+ const flatbuffers::Vector<int32_t> *pad() const {
+ return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_PAD);
}
const flatbuffers::Vector<int32_t> *stride() const {
return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_STRIDE);
@@ -716,8 +716,8 @@
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
- VerifyOffset(verifier, VT_PADDING) &&
- verifier.VerifyVector(padding()) &&
+ VerifyOffset(verifier, VT_PAD) &&
+ verifier.VerifyVector(pad()) &&
VerifyOffset(verifier, VT_STRIDE) &&
verifier.VerifyVector(stride()) &&
VerifyOffset(verifier, VT_DILATION) &&
@@ -730,8 +730,8 @@
typedef ConvAttribute Table;
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
- void add_padding(flatbuffers::Offset<flatbuffers::Vector<int32_t>> padding) {
- fbb_.AddOffset(ConvAttribute::VT_PADDING, padding);
+ void add_pad(flatbuffers::Offset<flatbuffers::Vector<int32_t>> pad) {
+ fbb_.AddOffset(ConvAttribute::VT_PAD, pad);
}
void add_stride(flatbuffers::Offset<flatbuffers::Vector<int32_t>> stride) {
fbb_.AddOffset(ConvAttribute::VT_STRIDE, stride);
@@ -752,27 +752,27 @@
inline flatbuffers::Offset<ConvAttribute> CreateConvAttribute(
flatbuffers::FlatBufferBuilder &_fbb,
- flatbuffers::Offset<flatbuffers::Vector<int32_t>> padding = 0,
+ flatbuffers::Offset<flatbuffers::Vector<int32_t>> pad = 0,
flatbuffers::Offset<flatbuffers::Vector<int32_t>> stride = 0,
flatbuffers::Offset<flatbuffers::Vector<int32_t>> dilation = 0) {
ConvAttributeBuilder builder_(_fbb);
builder_.add_dilation(dilation);
builder_.add_stride(stride);
- builder_.add_padding(padding);
+ builder_.add_pad(pad);
return builder_.Finish();
}
inline flatbuffers::Offset<ConvAttribute> CreateConvAttributeDirect(
flatbuffers::FlatBufferBuilder &_fbb,
- const std::vector<int32_t> *padding = nullptr,
+ const std::vector<int32_t> *pad = nullptr,
const std::vector<int32_t> *stride = nullptr,
const std::vector<int32_t> *dilation = nullptr) {
- auto padding__ = padding ? _fbb.CreateVector<int32_t>(*padding) : 0;
+ auto pad__ = pad ? _fbb.CreateVector<int32_t>(*pad) : 0;
auto stride__ = stride ? _fbb.CreateVector<int32_t>(*stride) : 0;
auto dilation__ = dilation ? _fbb.CreateVector<int32_t>(*dilation) : 0;
return tosa::CreateConvAttribute(
_fbb,
- padding__,
+ pad__,
stride__,
dilation__);
}
@@ -989,15 +989,15 @@
struct ReshapeAttribute FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
typedef ReshapeAttributeBuilder Builder;
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
- VT_SHAPE = 4
+ VT_NEW_SHAPE = 4
};
- const flatbuffers::Vector<int32_t> *shape() const {
- return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_SHAPE);
+ const flatbuffers::Vector<int32_t> *new_shape() const {
+ return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_NEW_SHAPE);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
- VerifyOffset(verifier, VT_SHAPE) &&
- verifier.VerifyVector(shape()) &&
+ VerifyOffset(verifier, VT_NEW_SHAPE) &&
+ verifier.VerifyVector(new_shape()) &&
verifier.EndTable();
}
};
@@ -1006,8 +1006,8 @@
typedef ReshapeAttribute Table;
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
- void add_shape(flatbuffers::Offset<flatbuffers::Vector<int32_t>> shape) {
- fbb_.AddOffset(ReshapeAttribute::VT_SHAPE, shape);
+ void add_new_shape(flatbuffers::Offset<flatbuffers::Vector<int32_t>> new_shape) {
+ fbb_.AddOffset(ReshapeAttribute::VT_NEW_SHAPE, new_shape);
}
explicit ReshapeAttributeBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
@@ -1022,37 +1022,37 @@
inline flatbuffers::Offset<ReshapeAttribute> CreateReshapeAttribute(
flatbuffers::FlatBufferBuilder &_fbb,
- flatbuffers::Offset<flatbuffers::Vector<int32_t>> shape = 0) {
+ flatbuffers::Offset<flatbuffers::Vector<int32_t>> new_shape = 0) {
ReshapeAttributeBuilder builder_(_fbb);
- builder_.add_shape(shape);
+ builder_.add_new_shape(new_shape);
return builder_.Finish();
}
inline flatbuffers::Offset<ReshapeAttribute> CreateReshapeAttributeDirect(
flatbuffers::FlatBufferBuilder &_fbb,
- const std::vector<int32_t> *shape = nullptr) {
- auto shape__ = shape ? _fbb.CreateVector<int32_t>(*shape) : 0;
+ const std::vector<int32_t> *new_shape = nullptr) {
+ auto new_shape__ = new_shape ? _fbb.CreateVector<int32_t>(*new_shape) : 0;
return tosa::CreateReshapeAttribute(
_fbb,
- shape__);
+ new_shape__);
}
struct SliceAttribute FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
typedef SliceAttributeBuilder Builder;
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
- VT_BEGIN = 4,
+ VT_START = 4,
VT_SIZE = 6
};
- const flatbuffers::Vector<int32_t> *begin() const {
- return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_BEGIN);
+ const flatbuffers::Vector<int32_t> *start() const {
+ return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_START);
}
const flatbuffers::Vector<int32_t> *size() const {
return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_SIZE);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
- VerifyOffset(verifier, VT_BEGIN) &&
- verifier.VerifyVector(begin()) &&
+ VerifyOffset(verifier, VT_START) &&
+ verifier.VerifyVector(start()) &&
VerifyOffset(verifier, VT_SIZE) &&
verifier.VerifyVector(size()) &&
verifier.EndTable();
@@ -1063,8 +1063,8 @@
typedef SliceAttribute Table;
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
- void add_begin(flatbuffers::Offset<flatbuffers::Vector<int32_t>> begin) {
- fbb_.AddOffset(SliceAttribute::VT_BEGIN, begin);
+ void add_start(flatbuffers::Offset<flatbuffers::Vector<int32_t>> start) {
+ fbb_.AddOffset(SliceAttribute::VT_START, start);
}
void add_size(flatbuffers::Offset<flatbuffers::Vector<int32_t>> size) {
fbb_.AddOffset(SliceAttribute::VT_SIZE, size);
@@ -1082,23 +1082,23 @@
inline flatbuffers::Offset<SliceAttribute> CreateSliceAttribute(
flatbuffers::FlatBufferBuilder &_fbb,
- flatbuffers::Offset<flatbuffers::Vector<int32_t>> begin = 0,
+ flatbuffers::Offset<flatbuffers::Vector<int32_t>> start = 0,
flatbuffers::Offset<flatbuffers::Vector<int32_t>> size = 0) {
SliceAttributeBuilder builder_(_fbb);
builder_.add_size(size);
- builder_.add_begin(begin);
+ builder_.add_start(start);
return builder_.Finish();
}
inline flatbuffers::Offset<SliceAttribute> CreateSliceAttributeDirect(
flatbuffers::FlatBufferBuilder &_fbb,
- const std::vector<int32_t> *begin = nullptr,
+ const std::vector<int32_t> *start = nullptr,
const std::vector<int32_t> *size = nullptr) {
- auto begin__ = begin ? _fbb.CreateVector<int32_t>(*begin) : 0;
+ auto start__ = start ? _fbb.CreateVector<int32_t>(*start) : 0;
auto size__ = size ? _fbb.CreateVector<int32_t>(*size) : 0;
return tosa::CreateSliceAttribute(
_fbb,
- begin__,
+ start__,
size__);
}
@@ -1695,15 +1695,15 @@
struct TransposeAttribute FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
typedef TransposeAttributeBuilder Builder;
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
- VT_PERM = 4
+ VT_PERMS = 4
};
- const flatbuffers::Vector<int32_t> *perm() const {
- return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_PERM);
+ const flatbuffers::Vector<int32_t> *perms() const {
+ return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_PERMS);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
- VerifyOffset(verifier, VT_PERM) &&
- verifier.VerifyVector(perm()) &&
+ VerifyOffset(verifier, VT_PERMS) &&
+ verifier.VerifyVector(perms()) &&
verifier.EndTable();
}
};
@@ -1712,8 +1712,8 @@
typedef TransposeAttribute Table;
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
- void add_perm(flatbuffers::Offset<flatbuffers::Vector<int32_t>> perm) {
- fbb_.AddOffset(TransposeAttribute::VT_PERM, perm);
+ void add_perms(flatbuffers::Offset<flatbuffers::Vector<int32_t>> perms) {
+ fbb_.AddOffset(TransposeAttribute::VT_PERMS, perms);
}
explicit TransposeAttributeBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
@@ -1728,19 +1728,19 @@
inline flatbuffers::Offset<TransposeAttribute> CreateTransposeAttribute(
flatbuffers::FlatBufferBuilder &_fbb,
- flatbuffers::Offset<flatbuffers::Vector<int32_t>> perm = 0) {
+ flatbuffers::Offset<flatbuffers::Vector<int32_t>> perms = 0) {
TransposeAttributeBuilder builder_(_fbb);
- builder_.add_perm(perm);
+ builder_.add_perms(perms);
return builder_.Finish();
}
inline flatbuffers::Offset<TransposeAttribute> CreateTransposeAttributeDirect(
flatbuffers::FlatBufferBuilder &_fbb,
- const std::vector<int32_t> *perm = nullptr) {
- auto perm__ = perm ? _fbb.CreateVector<int32_t>(*perm) : 0;
+ const std::vector<int32_t> *perms = nullptr) {
+ auto perms__ = perms ? _fbb.CreateVector<int32_t>(*perms) : 0;
return tosa::CreateTransposeAttribute(
_fbb,
- perm__);
+ perms__);
}
struct TableAttribute FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
@@ -1748,8 +1748,8 @@
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
VT_TABLE = 4
};
- const flatbuffers::Vector<int32_t> *table() const {
- return GetPointer<const flatbuffers::Vector<int32_t> *>(VT_TABLE);
+ const flatbuffers::Vector<int16_t> *table() const {
+ return GetPointer<const flatbuffers::Vector<int16_t> *>(VT_TABLE);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
@@ -1763,7 +1763,7 @@
typedef TableAttribute Table;
flatbuffers::FlatBufferBuilder &fbb_;
flatbuffers::uoffset_t start_;
- void add_table(flatbuffers::Offset<flatbuffers::Vector<int32_t>> table) {
+ void add_table(flatbuffers::Offset<flatbuffers::Vector<int16_t>> table) {
fbb_.AddOffset(TableAttribute::VT_TABLE, table);
}
explicit TableAttributeBuilder(flatbuffers::FlatBufferBuilder &_fbb)
@@ -1779,7 +1779,7 @@
inline flatbuffers::Offset<TableAttribute> CreateTableAttribute(
flatbuffers::FlatBufferBuilder &_fbb,
- flatbuffers::Offset<flatbuffers::Vector<int32_t>> table = 0) {
+ flatbuffers::Offset<flatbuffers::Vector<int16_t>> table = 0) {
TableAttributeBuilder builder_(_fbb);
builder_.add_table(table);
return builder_.Finish();
@@ -1787,8 +1787,8 @@
inline flatbuffers::Offset<TableAttribute> CreateTableAttributeDirect(
flatbuffers::FlatBufferBuilder &_fbb,
- const std::vector<int32_t> *table = nullptr) {
- auto table__ = table ? _fbb.CreateVector<int32_t>(*table) : 0;
+ const std::vector<int16_t> *table = nullptr) {
+ auto table__ = table ? _fbb.CreateVector<int16_t>(*table) : 0;
return tosa::CreateTableAttribute(
_fbb,
table__);
diff --git a/python/serializer/tosa_serializer.py b/python/serializer/tosa_serializer.py
index 660619b..fec676e 100644
--- a/python/serializer/tosa_serializer.py
+++ b/python/serializer/tosa_serializer.py
@@ -137,23 +137,23 @@
def __init__(self):
super().__init__()
- def PoolAttribute(self, kernel, stride, padding):
+ def PoolAttribute(self, kernel, stride, pad):
from tosa import PoolAttribute as a, Attribute
self.utype = Attribute.Attribute().PoolAttribute
self.optFcns = (a.Start, a.End)
- self.intvecs.append((a.AddPadding, padding))
+ self.intvecs.append((a.AddPad, pad))
self.intvecs.append((a.AddKernel, kernel))
self.intvecs.append((a.AddStride, stride))
- def ConvAttribute(self, padding, stride, dilation):
+ def ConvAttribute(self, pad, stride, dilation):
from tosa import ConvAttribute as a, Attribute
self.utype = Attribute.Attribute().ConvAttribute
self.optFcns = (a.Start, a.End)
- self.intvecs.append((a.AddPadding, padding))
+ self.intvecs.append((a.AddPad, pad))
self.intvecs.append((a.AddStride, stride))
self.intvecs.append((a.AddDilation, dilation))
@@ -186,21 +186,21 @@
self.ints.append((a.AddAxis, axis))
- def ReshapeAttribute(self, shape):
+ def ReshapeAttribute(self, new_shape):
from tosa import ReshapeAttribute as a, Attribute
self.utype = Attribute.Attribute().ReshapeAttribute
self.optFcns = (a.Start, a.End)
- self.intvecs.append((a.AddShape, shape))
+ self.intvecs.append((a.AddNewShape, new_shape))
- def SliceAttribute(self, begin, size):
+ def SliceAttribute(self, start, size):
from tosa import SliceAttribute as a, Attribute
self.utype = Attribute.Attribute().SliceAttribute
self.optFcns = (a.Start, a.End)
- self.intvecs.append((a.AddBegin, begin))
+ self.intvecs.append((a.AddStart, start))
self.intvecs.append((a.AddSize, size))
def TileAttribute(self, multiples):
@@ -292,13 +292,13 @@
self.strings.append((a.AddCondBranch, cond_branch))
self.strings.append((a.AddBodyBranch, body_branch))
- def TransposeAttribute(self, perm):
+ def TransposeAttribute(self, perms):
from tosa import TransposeAttribute as a, Attribute
self.utype = Attribute.Attribute().TransposeAttribute
self.optFcns = (a.Start, a.End)
- self.intvecs.append((a.AddPerm, perm))
+ self.intvecs.append((a.AddPerms, perms))
def TableAttribute(self, table):
from tosa import TableAttribute as a, Attribute
diff --git a/python/tosa/ConvAttribute.py b/python/tosa/ConvAttribute.py
index bbb5300..2d69163 100644
--- a/python/tosa/ConvAttribute.py
+++ b/python/tosa/ConvAttribute.py
@@ -29,7 +29,7 @@
self._tab = flatbuffers.table.Table(buf, pos)
# ConvAttribute
- def Padding(self, j):
+ def Pad(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
a = self._tab.Vector(o)
@@ -37,21 +37,21 @@
return 0
# ConvAttribute
- def PaddingAsNumpy(self):
+ def PadAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
# ConvAttribute
- def PaddingLength(self):
+ def PadLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.VectorLen(o)
return 0
# ConvAttribute
- def PaddingIsNone(self):
+ def PadIsNone(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
return o == 0
@@ -113,14 +113,14 @@
def ConvAttributeStart(builder):
"""This method is deprecated. Please switch to Start."""
return Start(builder)
-def AddPadding(builder, padding): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(padding), 0)
-def ConvAttributeAddPadding(builder, padding):
- """This method is deprecated. Please switch to AddPadding."""
- return AddPadding(builder, padding)
-def StartPaddingVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def ConvAttributeStartPaddingVector(builder, numElems):
+def AddPad(builder, pad): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pad), 0)
+def ConvAttributeAddPad(builder, pad):
+ """This method is deprecated. Please switch to AddPad."""
+ return AddPad(builder, pad)
+def StartPadVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def ConvAttributeStartPadVector(builder, numElems):
"""This method is deprecated. Please switch to Start."""
- return StartPaddingVector(builder, numElems)
+ return StartPadVector(builder, numElems)
def AddStride(builder, stride): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(stride), 0)
def ConvAttributeAddStride(builder, stride):
"""This method is deprecated. Please switch to AddStride."""
diff --git a/python/tosa/PoolAttribute.py b/python/tosa/PoolAttribute.py
index 47a3173..0399d00 100644
--- a/python/tosa/PoolAttribute.py
+++ b/python/tosa/PoolAttribute.py
@@ -29,7 +29,7 @@
self._tab = flatbuffers.table.Table(buf, pos)
# PoolAttribute
- def Padding(self, j):
+ def Pad(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
a = self._tab.Vector(o)
@@ -37,21 +37,21 @@
return 0
# PoolAttribute
- def PaddingAsNumpy(self):
+ def PadAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
# PoolAttribute
- def PaddingLength(self):
+ def PadLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.VectorLen(o)
return 0
# PoolAttribute
- def PaddingIsNone(self):
+ def PadIsNone(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
return o == 0
@@ -113,14 +113,14 @@
def PoolAttributeStart(builder):
"""This method is deprecated. Please switch to Start."""
return Start(builder)
-def AddPadding(builder, padding): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(padding), 0)
-def PoolAttributeAddPadding(builder, padding):
- """This method is deprecated. Please switch to AddPadding."""
- return AddPadding(builder, padding)
-def StartPaddingVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def PoolAttributeStartPaddingVector(builder, numElems):
+def AddPad(builder, pad): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(pad), 0)
+def PoolAttributeAddPad(builder, pad):
+ """This method is deprecated. Please switch to AddPad."""
+ return AddPad(builder, pad)
+def StartPadVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def PoolAttributeStartPadVector(builder, numElems):
"""This method is deprecated. Please switch to Start."""
- return StartPaddingVector(builder, numElems)
+ return StartPadVector(builder, numElems)
def AddKernel(builder, kernel): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(kernel), 0)
def PoolAttributeAddKernel(builder, kernel):
"""This method is deprecated. Please switch to AddKernel."""
diff --git a/python/tosa/ReshapeAttribute.py b/python/tosa/ReshapeAttribute.py
index d0f9135..0d335d8 100644
--- a/python/tosa/ReshapeAttribute.py
+++ b/python/tosa/ReshapeAttribute.py
@@ -29,7 +29,7 @@
self._tab = flatbuffers.table.Table(buf, pos)
# ReshapeAttribute
- def Shape(self, j):
+ def NewShape(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
a = self._tab.Vector(o)
@@ -37,21 +37,21 @@
return 0
# ReshapeAttribute
- def ShapeAsNumpy(self):
+ def NewShapeAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
# ReshapeAttribute
- def ShapeLength(self):
+ def NewShapeLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.VectorLen(o)
return 0
# ReshapeAttribute
- def ShapeIsNone(self):
+ def NewShapeIsNone(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
return o == 0
@@ -59,14 +59,14 @@
def ReshapeAttributeStart(builder):
"""This method is deprecated. Please switch to Start."""
return Start(builder)
-def AddShape(builder, shape): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(shape), 0)
-def ReshapeAttributeAddShape(builder, shape):
- """This method is deprecated. Please switch to AddShape."""
- return AddShape(builder, shape)
-def StartShapeVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def ReshapeAttributeStartShapeVector(builder, numElems):
+def AddNewShape(builder, newShape): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(newShape), 0)
+def ReshapeAttributeAddNewShape(builder, newShape):
+ """This method is deprecated. Please switch to AddNewShape."""
+ return AddNewShape(builder, newShape)
+def StartNewShapeVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def ReshapeAttributeStartNewShapeVector(builder, numElems):
"""This method is deprecated. Please switch to Start."""
- return StartShapeVector(builder, numElems)
+ return StartNewShapeVector(builder, numElems)
def End(builder): return builder.EndObject()
def ReshapeAttributeEnd(builder):
"""This method is deprecated. Please switch to End."""
diff --git a/python/tosa/SliceAttribute.py b/python/tosa/SliceAttribute.py
index d7d476f..37bc666 100644
--- a/python/tosa/SliceAttribute.py
+++ b/python/tosa/SliceAttribute.py
@@ -29,7 +29,7 @@
self._tab = flatbuffers.table.Table(buf, pos)
# SliceAttribute
- def Begin(self, j):
+ def Start(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
a = self._tab.Vector(o)
@@ -37,21 +37,21 @@
return 0
# SliceAttribute
- def BeginAsNumpy(self):
+ def StartAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
# SliceAttribute
- def BeginLength(self):
+ def StartLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.VectorLen(o)
return 0
# SliceAttribute
- def BeginIsNone(self):
+ def StartIsNone(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
return o == 0
@@ -86,14 +86,14 @@
def SliceAttributeStart(builder):
"""This method is deprecated. Please switch to Start."""
return Start(builder)
-def AddBegin(builder, begin): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(begin), 0)
-def SliceAttributeAddBegin(builder, begin):
- """This method is deprecated. Please switch to AddBegin."""
- return AddBegin(builder, begin)
-def StartBeginVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def SliceAttributeStartBeginVector(builder, numElems):
+def AddStart(builder, start): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(start), 0)
+def SliceAttributeAddStart(builder, start):
+ """This method is deprecated. Please switch to AddStart."""
+ return AddStart(builder, start)
+def StartStartVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def SliceAttributeStartStartVector(builder, numElems):
"""This method is deprecated. Please switch to Start."""
- return StartBeginVector(builder, numElems)
+ return StartStartVector(builder, numElems)
def AddSize(builder, size): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(size), 0)
def SliceAttributeAddSize(builder, size):
"""This method is deprecated. Please switch to AddSize."""
diff --git a/python/tosa/TableAttribute.py b/python/tosa/TableAttribute.py
index 87990c5..6fd719f 100644
--- a/python/tosa/TableAttribute.py
+++ b/python/tosa/TableAttribute.py
@@ -33,14 +33,14 @@
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
a = self._tab.Vector(o)
- return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
+ return self._tab.Get(flatbuffers.number_types.Int16Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 2))
return 0
# TableAttribute
def TableAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
- return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
+ return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int16Flags, o)
return 0
# TableAttribute
@@ -63,7 +63,7 @@
def TableAttributeAddTable(builder, table):
"""This method is deprecated. Please switch to AddTable."""
return AddTable(builder, table)
-def StartTableVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def StartTableVector(builder, numElems): return builder.StartVector(2, numElems, 2)
def TableAttributeStartTableVector(builder, numElems):
"""This method is deprecated. Please switch to Start."""
return StartTableVector(builder, numElems)
diff --git a/python/tosa/TransposeAttribute.py b/python/tosa/TransposeAttribute.py
index 4c9b034..1e42493 100644
--- a/python/tosa/TransposeAttribute.py
+++ b/python/tosa/TransposeAttribute.py
@@ -29,7 +29,7 @@
self._tab = flatbuffers.table.Table(buf, pos)
# TransposeAttribute
- def Perm(self, j):
+ def Perms(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
a = self._tab.Vector(o)
@@ -37,21 +37,21 @@
return 0
# TransposeAttribute
- def PermAsNumpy(self):
+ def PermsAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
# TransposeAttribute
- def PermLength(self):
+ def PermsLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.VectorLen(o)
return 0
# TransposeAttribute
- def PermIsNone(self):
+ def PermsIsNone(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
return o == 0
@@ -59,14 +59,14 @@
def TransposeAttributeStart(builder):
"""This method is deprecated. Please switch to Start."""
return Start(builder)
-def AddPerm(builder, perm): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(perm), 0)
-def TransposeAttributeAddPerm(builder, perm):
- """This method is deprecated. Please switch to AddPerm."""
- return AddPerm(builder, perm)
-def StartPermVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def TransposeAttributeStartPermVector(builder, numElems):
+def AddPerms(builder, perms): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(perms), 0)
+def TransposeAttributeAddPerms(builder, perms):
+ """This method is deprecated. Please switch to AddPerms."""
+ return AddPerms(builder, perms)
+def StartPermsVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def TransposeAttributeStartPermsVector(builder, numElems):
"""This method is deprecated. Please switch to Start."""
- return StartPermVector(builder, numElems)
+ return StartPermsVector(builder, numElems)
def End(builder): return builder.EndObject()
def TransposeAttributeEnd(builder):
"""This method is deprecated. Please switch to End."""
diff --git a/schema/tosa.fbs b/schema/tosa.fbs
index 4267adf..f519d1c 100644
--- a/schema/tosa.fbs
+++ b/schema/tosa.fbs
@@ -160,13 +160,13 @@
}
table PoolAttribute {
- padding: [int32];
+ pad: [int32];
kernel: [int32];
stride: [int32];
}
table ConvAttribute {
- padding: [int32];
+ pad: [int32];
stride: [int32];
dilation: [int32];
}
@@ -189,11 +189,11 @@
}
table ReshapeAttribute {
- shape: [int32];
+ new_shape: [int32];
}
table SliceAttribute {
- begin: [int32];
+ start: [int32];
size: [int32];
}
@@ -247,11 +247,11 @@
}
table TransposeAttribute {
- perm: [int32];
+ perms: [int32];
}
table TableAttribute {
- table: [int32];
+ table: [int16];
}
union QuantInfo {