From ae906de847e225cd0ae44f25bb21fc228707bc4d Mon Sep 17 00:00:00 2001 From: Eric Kunze Date: Mon, 30 May 2022 22:40:47 -0700 Subject: Change to flatbuffers 1.12 as the submodule The code should be compatible with both flatbuffers 2.0 and 1.12 through try/except blocks. Generally other projects seem to still be using 1.12, so move the submodule back to 1.12 for maximum compatibility. Change-Id: I9733c7df0a7e4226f87473e19e48d3a80a3db6c6 Signed-off-by: Eric Kunze --- python/tosa/TosaGraph.py | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'python/tosa/TosaGraph.py') diff --git a/python/tosa/TosaGraph.py b/python/tosa/TosaGraph.py index 180469e..eceffdb 100644 --- a/python/tosa/TosaGraph.py +++ b/python/tosa/TosaGraph.py @@ -10,17 +10,13 @@ class TosaGraph(object): __slots__ = ['_tab'] @classmethod - def GetRootAs(cls, buf, offset=0): + def GetRootAsTosaGraph(cls, buf, offset): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = TosaGraph() x.Init(buf, n + offset) return x @classmethod - def GetRootAsTosaGraph(cls, buf, offset=0): - """This method is deprecated. Please switch to GetRootAs.""" - return cls.GetRootAs(buf, offset) - @classmethod def TosaGraphBufferHasIdentifier(cls, buf, offset, size_prefixed=False): return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x4F\x53\x41", size_prefixed=size_prefixed) @@ -64,23 +60,8 @@ class TosaGraph(object): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6)) return o == 0 -def Start(builder): builder.StartObject(2) -def TosaGraphStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddVersion(builder, version): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(version), 0) -def TosaGraphAddVersion(builder, version): - """This method is deprecated. Please switch to AddVersion.""" - return AddVersion(builder, version) -def AddBlocks(builder, blocks): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(blocks), 0) -def TosaGraphAddBlocks(builder, blocks): - """This method is deprecated. Please switch to AddBlocks.""" - return AddBlocks(builder, blocks) -def StartBlocksVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def TosaGraphStartBlocksVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartBlocksVector(builder, numElems) -def End(builder): return builder.EndObject() -def TosaGraphEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def TosaGraphStart(builder): builder.StartObject(2) +def TosaGraphAddVersion(builder, version): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(version), 0) +def TosaGraphAddBlocks(builder, blocks): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(blocks), 0) +def TosaGraphStartBlocksVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def TosaGraphEnd(builder): return builder.EndObject() -- cgit v1.2.1