From dd49a7205b76d668308262b2ea4cc38968ff576c Mon Sep 17 00:00:00 2001 From: "erik.andersson@arm.com" Date: Wed, 10 Aug 2022 15:26:48 +0200 Subject: Revert reversion of TensorFlow 2.9 update With the errors caused by the previous TensorFlow 2.9 update being fixed, we can proceed with the upgrade. Signed-off-by: erik.andersson@arm.com Change-Id: Ie1f025e8d984efaebc68b8d051126d49bee6b2b8 --- ethosu/vela/tflite/Model.py | 122 ++++++-------------------------------------- 1 file changed, 17 insertions(+), 105 deletions(-) (limited to 'ethosu/vela/tflite/Model.py') diff --git a/ethosu/vela/tflite/Model.py b/ethosu/vela/tflite/Model.py index 8a12d103..52aac021 100644 --- a/ethosu/vela/tflite/Model.py +++ b/ethosu/vela/tflite/Model.py @@ -3,27 +3,17 @@ # namespace: tflite import flatbuffers -from flatbuffers.compat import import_numpy -np = import_numpy() class Model(object): __slots__ = ['_tab'] @classmethod - def GetRootAs(cls, buf, offset=0): + def GetRootAsModel(cls, buf, offset): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = Model() x.Init(buf, n + offset) return x - @classmethod - def GetRootAsModel(cls, buf, offset=0): - """This method is deprecated. Please switch to GetRootAs.""" - return cls.GetRootAs(buf, offset) - @classmethod - def ModelBufferHasIdentifier(cls, buf, offset, size_prefixed=False): - return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed) - # Model def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) @@ -55,11 +45,6 @@ class Model(object): return self._tab.VectorLen(o) return 0 - # Model - def OperatorCodesIsNone(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6)) - return o == 0 - # Model def Subgraphs(self, j): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8)) @@ -80,11 +65,6 @@ class Model(object): return self._tab.VectorLen(o) return 0 - # Model - def SubgraphsIsNone(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8)) - return o == 0 - # Model def Description(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10)) @@ -112,11 +92,6 @@ class Model(object): return self._tab.VectorLen(o) return 0 - # Model - def BuffersIsNone(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12)) - return o == 0 - # Model def MetadataBuffer(self, j): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(14)) @@ -139,11 +114,6 @@ class Model(object): return self._tab.VectorLen(o) return 0 - # Model - def MetadataBufferIsNone(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(14)) - return o == 0 - # Model def Metadata(self, j): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(16)) @@ -164,11 +134,6 @@ class Model(object): return self._tab.VectorLen(o) return 0 - # Model - def MetadataIsNone(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(16)) - return o == 0 - # Model def SignatureDefs(self, j): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(18)) @@ -189,72 +154,19 @@ class Model(object): return self._tab.VectorLen(o) return 0 - # Model - def SignatureDefsIsNone(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(18)) - return o == 0 - -def Start(builder): builder.StartObject(8) -def ModelStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddVersion(builder, version): builder.PrependUint32Slot(0, version, 0) -def ModelAddVersion(builder, version): - """This method is deprecated. Please switch to AddVersion.""" - return AddVersion(builder, version) -def AddOperatorCodes(builder, operatorCodes): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(operatorCodes), 0) -def ModelAddOperatorCodes(builder, operatorCodes): - """This method is deprecated. Please switch to AddOperatorCodes.""" - return AddOperatorCodes(builder, operatorCodes) -def StartOperatorCodesVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def ModelStartOperatorCodesVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartOperatorCodesVector(builder, numElems) -def AddSubgraphs(builder, subgraphs): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(subgraphs), 0) -def ModelAddSubgraphs(builder, subgraphs): - """This method is deprecated. Please switch to AddSubgraphs.""" - return AddSubgraphs(builder, subgraphs) -def StartSubgraphsVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def ModelStartSubgraphsVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartSubgraphsVector(builder, numElems) -def AddDescription(builder, description): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(description), 0) -def ModelAddDescription(builder, description): - """This method is deprecated. Please switch to AddDescription.""" - return AddDescription(builder, description) -def AddBuffers(builder, buffers): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(buffers), 0) -def ModelAddBuffers(builder, buffers): - """This method is deprecated. Please switch to AddBuffers.""" - return AddBuffers(builder, buffers) -def StartBuffersVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def ModelStartBuffersVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartBuffersVector(builder, numElems) -def AddMetadataBuffer(builder, metadataBuffer): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(metadataBuffer), 0) -def ModelAddMetadataBuffer(builder, metadataBuffer): - """This method is deprecated. Please switch to AddMetadataBuffer.""" - return AddMetadataBuffer(builder, metadataBuffer) -def StartMetadataBufferVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def ModelStartMetadataBufferVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartMetadataBufferVector(builder, numElems) -def AddMetadata(builder, metadata): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(metadata), 0) -def ModelAddMetadata(builder, metadata): - """This method is deprecated. Please switch to AddMetadata.""" - return AddMetadata(builder, metadata) -def StartMetadataVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def ModelStartMetadataVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartMetadataVector(builder, numElems) -def AddSignatureDefs(builder, signatureDefs): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(signatureDefs), 0) -def ModelAddSignatureDefs(builder, signatureDefs): - """This method is deprecated. Please switch to AddSignatureDefs.""" - return AddSignatureDefs(builder, signatureDefs) -def StartSignatureDefsVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def ModelStartSignatureDefsVector(builder, numElems): - """This method is deprecated. Please switch to Start.""" - return StartSignatureDefsVector(builder, numElems) -def End(builder): return builder.EndObject() -def ModelEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def ModelStart(builder): builder.StartObject(8) +def ModelAddVersion(builder, version): builder.PrependUint32Slot(0, version, 0) +def ModelAddOperatorCodes(builder, operatorCodes): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(operatorCodes), 0) +def ModelStartOperatorCodesVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def ModelAddSubgraphs(builder, subgraphs): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(subgraphs), 0) +def ModelStartSubgraphsVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def ModelAddDescription(builder, description): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(description), 0) +def ModelAddBuffers(builder, buffers): builder.PrependUOffsetTRelativeSlot(4, flatbuffers.number_types.UOffsetTFlags.py_type(buffers), 0) +def ModelStartBuffersVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def ModelAddMetadataBuffer(builder, metadataBuffer): builder.PrependUOffsetTRelativeSlot(5, flatbuffers.number_types.UOffsetTFlags.py_type(metadataBuffer), 0) +def ModelStartMetadataBufferVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def ModelAddMetadata(builder, metadata): builder.PrependUOffsetTRelativeSlot(6, flatbuffers.number_types.UOffsetTFlags.py_type(metadata), 0) +def ModelStartMetadataVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def ModelAddSignatureDefs(builder, signatureDefs): builder.PrependUOffsetTRelativeSlot(7, flatbuffers.number_types.UOffsetTFlags.py_type(signatureDefs), 0) +def ModelStartSignatureDefsVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def ModelEnd(builder): return builder.EndObject() -- cgit v1.2.1