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/LSTMOptions.py | 47 +++++++-------------------------------- 1 file changed, 8 insertions(+), 39 deletions(-) (limited to 'ethosu/vela/tflite/LSTMOptions.py') diff --git a/ethosu/vela/tflite/LSTMOptions.py b/ethosu/vela/tflite/LSTMOptions.py index 04e2ac92..2f519bc2 100644 --- a/ethosu/vela/tflite/LSTMOptions.py +++ b/ethosu/vela/tflite/LSTMOptions.py @@ -3,27 +3,17 @@ # namespace: tflite import flatbuffers -from flatbuffers.compat import import_numpy -np = import_numpy() class LSTMOptions(object): __slots__ = ['_tab'] @classmethod - def GetRootAs(cls, buf, offset=0): + def GetRootAsLSTMOptions(cls, buf, offset): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = LSTMOptions() x.Init(buf, n + offset) return x - @classmethod - def GetRootAsLSTMOptions(cls, buf, offset=0): - """This method is deprecated. Please switch to GetRootAs.""" - return cls.GetRootAs(buf, offset) - @classmethod - def LSTMOptionsBufferHasIdentifier(cls, buf, offset, size_prefixed=False): - return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed) - # LSTMOptions def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) @@ -63,31 +53,10 @@ class LSTMOptions(object): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(5) -def LSTMOptionsStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddFusedActivationFunction(builder, fusedActivationFunction): builder.PrependInt8Slot(0, fusedActivationFunction, 0) -def LSTMOptionsAddFusedActivationFunction(builder, fusedActivationFunction): - """This method is deprecated. Please switch to AddFusedActivationFunction.""" - return AddFusedActivationFunction(builder, fusedActivationFunction) -def AddCellClip(builder, cellClip): builder.PrependFloat32Slot(1, cellClip, 0.0) -def LSTMOptionsAddCellClip(builder, cellClip): - """This method is deprecated. Please switch to AddCellClip.""" - return AddCellClip(builder, cellClip) -def AddProjClip(builder, projClip): builder.PrependFloat32Slot(2, projClip, 0.0) -def LSTMOptionsAddProjClip(builder, projClip): - """This method is deprecated. Please switch to AddProjClip.""" - return AddProjClip(builder, projClip) -def AddKernelType(builder, kernelType): builder.PrependInt8Slot(3, kernelType, 0) -def LSTMOptionsAddKernelType(builder, kernelType): - """This method is deprecated. Please switch to AddKernelType.""" - return AddKernelType(builder, kernelType) -def AddAsymmetricQuantizeInputs(builder, asymmetricQuantizeInputs): builder.PrependBoolSlot(4, asymmetricQuantizeInputs, 0) -def LSTMOptionsAddAsymmetricQuantizeInputs(builder, asymmetricQuantizeInputs): - """This method is deprecated. Please switch to AddAsymmetricQuantizeInputs.""" - return AddAsymmetricQuantizeInputs(builder, asymmetricQuantizeInputs) -def End(builder): return builder.EndObject() -def LSTMOptionsEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def LSTMOptionsStart(builder): builder.StartObject(5) +def LSTMOptionsAddFusedActivationFunction(builder, fusedActivationFunction): builder.PrependInt8Slot(0, fusedActivationFunction, 0) +def LSTMOptionsAddCellClip(builder, cellClip): builder.PrependFloat32Slot(1, cellClip, 0.0) +def LSTMOptionsAddProjClip(builder, projClip): builder.PrependFloat32Slot(2, projClip, 0.0) +def LSTMOptionsAddKernelType(builder, kernelType): builder.PrependInt8Slot(3, kernelType, 0) +def LSTMOptionsAddAsymmetricQuantizeInputs(builder, asymmetricQuantizeInputs): builder.PrependBoolSlot(4, asymmetricQuantizeInputs, 0) +def LSTMOptionsEnd(builder): return builder.EndObject() -- cgit v1.2.1