From a9fba260ec050794bd24e968c3dbd4e202b9d643 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Alfv=C3=A9n?= Date: Tue, 19 Jul 2022 12:26:32 +0200 Subject: MLBEDSW-6710: Revert Tensorflow 2.9 Tensorflow 2.9 contains a bug for int16x8 without biases. Revert "MLBEDSW-6635: Update to TensorFlow 2.9" This reverts commit 93f492bae9c4dd16a1f64b851b237263695ee03e. Signed-off-by: Johan Alfven Change-Id: I366d201ce4134a877d333be2aade546dfcb5d6d7 --- ethosu/vela/tflite/SubOptions.py | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'ethosu/vela/tflite/SubOptions.py') diff --git a/ethosu/vela/tflite/SubOptions.py b/ethosu/vela/tflite/SubOptions.py index c3ed40e1..de2df8a1 100644 --- a/ethosu/vela/tflite/SubOptions.py +++ b/ethosu/vela/tflite/SubOptions.py @@ -3,17 +3,27 @@ # namespace: tflite import flatbuffers +from flatbuffers.compat import import_numpy +np = import_numpy() class SubOptions(object): __slots__ = ['_tab'] @classmethod - def GetRootAsSubOptions(cls, buf, offset): + def GetRootAs(cls, buf, offset=0): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = SubOptions() x.Init(buf, n + offset) return x + @classmethod + def GetRootAsSubOptions(cls, buf, offset=0): + """This method is deprecated. Please switch to GetRootAs.""" + return cls.GetRootAs(buf, offset) + @classmethod + def SubOptionsBufferHasIdentifier(cls, buf, offset, size_prefixed=False): + return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed) + # SubOptions def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) @@ -32,7 +42,19 @@ class SubOptions(object): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return True -def SubOptionsStart(builder): builder.StartObject(2) -def SubOptionsAddFusedActivationFunction(builder, fusedActivationFunction): builder.PrependInt8Slot(0, fusedActivationFunction, 0) -def SubOptionsAddPotScaleInt16(builder, potScaleInt16): builder.PrependBoolSlot(1, potScaleInt16, 1) -def SubOptionsEnd(builder): return builder.EndObject() +def Start(builder): builder.StartObject(2) +def SubOptionsStart(builder): + """This method is deprecated. Please switch to Start.""" + return Start(builder) +def AddFusedActivationFunction(builder, fusedActivationFunction): builder.PrependInt8Slot(0, fusedActivationFunction, 0) +def SubOptionsAddFusedActivationFunction(builder, fusedActivationFunction): + """This method is deprecated. Please switch to AddFusedActivationFunction.""" + return AddFusedActivationFunction(builder, fusedActivationFunction) +def AddPotScaleInt16(builder, potScaleInt16): builder.PrependBoolSlot(1, potScaleInt16, 1) +def SubOptionsAddPotScaleInt16(builder, potScaleInt16): + """This method is deprecated. Please switch to AddPotScaleInt16.""" + return AddPotScaleInt16(builder, potScaleInt16) +def End(builder): return builder.EndObject() +def SubOptionsEnd(builder): + """This method is deprecated. Please switch to End.""" + return End(builder) \ No newline at end of file -- cgit v1.2.1