From 2de898a85d800f0e812cc13eff6363e27a377cf5 Mon Sep 17 00:00:00 2001 From: Rickard Bolin Date: Mon, 20 Dec 2021 08:35:23 +0000 Subject: MLBEDSW-4870: Update to TensorFlow 2.7 Update the flatbuffers generated code to comply with TensorFlow 2.7 Signed-off-by: Rickard Bolin Change-Id: Iff29b05a6e145245861329b4ff9fc9fbd968da53 --- ethosu/vela/tflite/SignatureDef.py | 42 ++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 11 deletions(-) (limited to 'ethosu/vela/tflite/SignatureDef.py') diff --git a/ethosu/vela/tflite/SignatureDef.py b/ethosu/vela/tflite/SignatureDef.py index 295ec854..2f0ac97c 100644 --- a/ethosu/vela/tflite/SignatureDef.py +++ b/ethosu/vela/tflite/SignatureDef.py @@ -10,13 +10,17 @@ class SignatureDef(object): __slots__ = ['_tab'] @classmethod - def GetRootAsSignatureDef(cls, buf, offset): + def GetRootAs(cls, buf, offset=0): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = SignatureDef() x.Init(buf, n + offset) return x @classmethod + def GetRootAsSignatureDef(cls, buf, offset=0): + """This method is deprecated. Please switch to GetRootAs.""" + return cls.GetRootAs(buf, offset) + @classmethod def SignatureDefBufferHasIdentifier(cls, buf, offset, size_prefixed=False): return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed) @@ -31,7 +35,7 @@ class SignatureDef(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from .TensorMap import TensorMap + from tflite.TensorMap import TensorMap obj = TensorMap() obj.Init(self._tab.Bytes, x) return obj @@ -56,7 +60,7 @@ class SignatureDef(object): x = self._tab.Vector(o) x += flatbuffers.number_types.UOffsetTFlags.py_type(j) * 4 x = self._tab.Indirect(x) - from .TensorMap import TensorMap + from tflite.TensorMap import TensorMap obj = TensorMap() obj.Init(self._tab.Bytes, x) return obj @@ -75,24 +79,40 @@ class SignatureDef(object): return o == 0 # SignatureDef - def MethodName(self): + def SignatureKey(self): o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8)) if o != 0: return self._tab.String(o + self._tab.Pos) return None # SignatureDef - def Key(self): - o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10)) + def SubgraphIndex(self): + o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(12)) if o != 0: - return self._tab.String(o + self._tab.Pos) - return None + return self._tab.Get(flatbuffers.number_types.Uint32Flags, o + self._tab.Pos) + return 0 -def SignatureDefStart(builder): builder.StartObject(4) +def SignatureDefStart(builder): builder.StartObject(5) +def Start(builder): + return SignatureDefStart(builder) def SignatureDefAddInputs(builder, inputs): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(inputs), 0) +def AddInputs(builder, inputs): + return SignatureDefAddInputs(builder, inputs) def SignatureDefStartInputsVector(builder, numElems): return builder.StartVector(4, numElems, 4) +def StartInputsVector(builder, numElems): + return SignatureDefStartInputsVector(builder, numElems) def SignatureDefAddOutputs(builder, outputs): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(outputs), 0) +def AddOutputs(builder, outputs): + return SignatureDefAddOutputs(builder, outputs) def SignatureDefStartOutputsVector(builder, numElems): return builder.StartVector(4, numElems, 4) -def SignatureDefAddMethodName(builder, methodName): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(methodName), 0) -def SignatureDefAddKey(builder, key): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(key), 0) +def StartOutputsVector(builder, numElems): + return SignatureDefStartOutputsVector(builder, numElems) +def SignatureDefAddSignatureKey(builder, signatureKey): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(signatureKey), 0) +def AddSignatureKey(builder, signatureKey): + return SignatureDefAddSignatureKey(builder, signatureKey) +def SignatureDefAddSubgraphIndex(builder, subgraphIndex): builder.PrependUint32Slot(4, subgraphIndex, 0) +def AddSubgraphIndex(builder, subgraphIndex): + return SignatureDefAddSubgraphIndex(builder, subgraphIndex) def SignatureDefEnd(builder): return builder.EndObject() +def End(builder): + return SignatureDefEnd(builder) \ No newline at end of file -- cgit v1.2.1