From 0b6d7c271af1e6593e6a2cf14b32acea765f4b64 Mon Sep 17 00:00:00 2001 From: Tai Ly Date: Fri, 8 Mar 2024 17:03:25 +0000 Subject: [serialization_lib] Fix Clamp and Pad Attributes This patch implements following changes to attribute fields: - PadAttribute: delete padding field, replace pad_const_int and pad_const_fp fields by pad_const, a field of ubyte array - ClampAttribute: replace min_int, max_int, min_fp and max_fp fields by min_val and max_val, fields of ubyte arrays - RescaleAttribute: delete multiplier and shift fields Signed-off-by: Tai Ly Change-Id: I5b075d29677cffca9ff2292708141d48410e7e72 --- python/tosa/PadAttribute.py | 80 ++++++++------------------------------------- 1 file changed, 14 insertions(+), 66 deletions(-) (limited to 'python/tosa/PadAttribute.py') diff --git a/python/tosa/PadAttribute.py b/python/tosa/PadAttribute.py index fc843bb..301bf17 100644 --- a/python/tosa/PadAttribute.py +++ b/python/tosa/PadAttribute.py @@ -29,101 +29,49 @@ class PadAttribute(object): self._tab = flatbuffers.table.Table(buf, pos) # PadAttribute - def Padding(self, j): + def PadConst(self, j): 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.Uint8Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 1)) return 0 # PadAttribute - def PaddingAsNumpy(self): + def PadConstAsNumpy(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.Uint8Flags, o) return 0 # PadAttribute - def PaddingLength(self): + def PadConstLength(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4)) if o != 0: return self._tab.VectorLen(o) return 0 # PadAttribute - def PaddingIsNone(self): + def PadConstIsNone(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4)) return o == 0 - # PadAttribute - def PadConstInt(self): - 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 0 - - # PadAttribute - def PadConstFp(self, j): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8)) - if o != 0: - a = self._tab.Vector(o) - return self._tab.Get(flatbuffers.number_types.Uint8Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 1)) - return 0 - - # PadAttribute - def PadConstFpAsNumpy(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8)) - if o != 0: - return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Uint8Flags, o) - return 0 - - # PadAttribute - def PadConstFpLength(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8)) - if o != 0: - return self._tab.VectorLen(o) - return 0 - - # PadAttribute - def PadConstFpIsNone(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8)) - return o == 0 - def PadAttributeStart(builder): - builder.StartObject(3) + builder.StartObject(1) def Start(builder): PadAttributeStart(builder) -def PadAttributeAddPadding(builder, padding): - builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(padding), 0) - -def AddPadding(builder, padding): - PadAttributeAddPadding(builder, padding) - -def PadAttributeStartPaddingVector(builder, numElems): - return builder.StartVector(4, numElems, 4) - -def StartPaddingVector(builder, numElems: int) -> int: - return PadAttributeStartPaddingVector(builder, numElems) - -def PadAttributeAddPadConstInt(builder, padConstInt): - builder.PrependInt32Slot(1, padConstInt, 0) - -def AddPadConstInt(builder, padConstInt): - PadAttributeAddPadConstInt(builder, padConstInt) - -def PadAttributeAddPadConstFp(builder, padConstFp): - builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(padConstFp), 0) +def PadAttributeAddPadConst(builder, padConst): + builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(padConst), 0) -def AddPadConstFp(builder, padConstFp): - PadAttributeAddPadConstFp(builder, padConstFp) +def AddPadConst(builder, padConst): + PadAttributeAddPadConst(builder, padConst) -def PadAttributeStartPadConstFpVector(builder, numElems): +def PadAttributeStartPadConstVector(builder, numElems): return builder.StartVector(1, numElems, 1) -def StartPadConstFpVector(builder, numElems: int) -> int: - return PadAttributeStartPadConstFpVector(builder, numElems) +def StartPadConstVector(builder, numElems: int) -> int: + return PadAttributeStartPadConstVector(builder, numElems) def PadAttributeEnd(builder): return builder.EndObject() -- cgit v1.2.1