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/TensorMap.py | 32 +++++--------------------------- 1 file changed, 5 insertions(+), 27 deletions(-) (limited to 'ethosu/vela/tflite/TensorMap.py') diff --git a/ethosu/vela/tflite/TensorMap.py b/ethosu/vela/tflite/TensorMap.py index b3572f8b..e9b036d9 100644 --- a/ethosu/vela/tflite/TensorMap.py +++ b/ethosu/vela/tflite/TensorMap.py @@ -3,27 +3,17 @@ # namespace: tflite import flatbuffers -from flatbuffers.compat import import_numpy -np = import_numpy() class TensorMap(object): __slots__ = ['_tab'] @classmethod - def GetRootAs(cls, buf, offset=0): + def GetRootAsTensorMap(cls, buf, offset): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = TensorMap() x.Init(buf, n + offset) return x - @classmethod - def GetRootAsTensorMap(cls, buf, offset=0): - """This method is deprecated. Please switch to GetRootAs.""" - return cls.GetRootAs(buf, offset) - @classmethod - def TensorMapBufferHasIdentifier(cls, buf, offset, size_prefixed=False): - return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed) - # TensorMap def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) @@ -42,19 +32,7 @@ class TensorMap(object): return self._tab.Get(flatbuffers.number_types.Uint32Flags, o + self._tab.Pos) return 0 -def Start(builder): builder.StartObject(2) -def TensorMapStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddName(builder, name): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0) -def TensorMapAddName(builder, name): - """This method is deprecated. Please switch to AddName.""" - return AddName(builder, name) -def AddTensorIndex(builder, tensorIndex): builder.PrependUint32Slot(1, tensorIndex, 0) -def TensorMapAddTensorIndex(builder, tensorIndex): - """This method is deprecated. Please switch to AddTensorIndex.""" - return AddTensorIndex(builder, tensorIndex) -def End(builder): return builder.EndObject() -def TensorMapEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def TensorMapStart(builder): builder.StartObject(2) +def TensorMapAddName(builder, name): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(name), 0) +def TensorMapAddTensorIndex(builder, tensorIndex): builder.PrependUint32Slot(1, tensorIndex, 0) +def TensorMapEnd(builder): return builder.EndObject() -- cgit v1.2.1