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/BatchMatMulOptions.py | 37 ++++++-------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) (limited to 'ethosu/vela/tflite/BatchMatMulOptions.py') diff --git a/ethosu/vela/tflite/BatchMatMulOptions.py b/ethosu/vela/tflite/BatchMatMulOptions.py index a093ee5e..c0f755bd 100644 --- a/ethosu/vela/tflite/BatchMatMulOptions.py +++ b/ethosu/vela/tflite/BatchMatMulOptions.py @@ -3,27 +3,17 @@ # namespace: tflite import flatbuffers -from flatbuffers.compat import import_numpy -np = import_numpy() class BatchMatMulOptions(object): __slots__ = ['_tab'] @classmethod - def GetRootAs(cls, buf, offset=0): + def GetRootAsBatchMatMulOptions(cls, buf, offset): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = BatchMatMulOptions() x.Init(buf, n + offset) return x - @classmethod - def GetRootAsBatchMatMulOptions(cls, buf, offset=0): - """This method is deprecated. Please switch to GetRootAs.""" - return cls.GetRootAs(buf, offset) - @classmethod - def BatchMatMulOptionsBufferHasIdentifier(cls, buf, offset, size_prefixed=False): - return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed) - # BatchMatMulOptions def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) @@ -49,23 +39,8 @@ class BatchMatMulOptions(object): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(3) -def BatchMatMulOptionsStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddAdjX(builder, adjX): builder.PrependBoolSlot(0, adjX, 0) -def BatchMatMulOptionsAddAdjX(builder, adjX): - """This method is deprecated. Please switch to AddAdjX.""" - return AddAdjX(builder, adjX) -def AddAdjY(builder, adjY): builder.PrependBoolSlot(1, adjY, 0) -def BatchMatMulOptionsAddAdjY(builder, adjY): - """This method is deprecated. Please switch to AddAdjY.""" - return AddAdjY(builder, adjY) -def AddAsymmetricQuantizeInputs(builder, asymmetricQuantizeInputs): builder.PrependBoolSlot(2, asymmetricQuantizeInputs, 0) -def BatchMatMulOptionsAddAsymmetricQuantizeInputs(builder, asymmetricQuantizeInputs): - """This method is deprecated. Please switch to AddAsymmetricQuantizeInputs.""" - return AddAsymmetricQuantizeInputs(builder, asymmetricQuantizeInputs) -def End(builder): return builder.EndObject() -def BatchMatMulOptionsEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def BatchMatMulOptionsStart(builder): builder.StartObject(3) +def BatchMatMulOptionsAddAdjX(builder, adjX): builder.PrependBoolSlot(0, adjX, 0) +def BatchMatMulOptionsAddAdjY(builder, adjY): builder.PrependBoolSlot(1, adjY, 0) +def BatchMatMulOptionsAddAsymmetricQuantizeInputs(builder, asymmetricQuantizeInputs): builder.PrependBoolSlot(2, asymmetricQuantizeInputs, 0) +def BatchMatMulOptionsEnd(builder): return builder.EndObject() -- cgit v1.2.1