commit dd49a7205b76d668308262b2ea4cc38968ff576c
author erik.andersson@arm.com <erik.andersson@arm.com> Wed Aug 10 15:26:48 2022 +0200
committer erik.andersson@arm.com <erik.andersson@arm.com> Wed Aug 10 17:52:50 2022 +0200
tree 5f879db220aa77b05c86cb42e393f50d534f997c
parent 885033b5bf2f6513b438f273b2bc71964f0c6c59

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 <erik.andersson@arm.com>
Change-Id: Ie1f025e8d984efaebc68b8d051126d49bee6b2b8

ethosu/vela/tflite/ConcatEmbeddingsOptions.py

diff --git a/ethosu/vela/tflite/ConcatEmbeddingsOptions.py b/ethosu/vela/tflite/ConcatEmbeddingsOptions.py
index 250f754..9d26c51 100644
--- a/ethosu/vela/tflite/ConcatEmbeddingsOptions.py
+++ b/ethosu/vela/tflite/ConcatEmbeddingsOptions.py
@@ -3,27 +3,17 @@
 # namespace: tflite
 
 import flatbuffers
-from flatbuffers.compat import import_numpy
-np = import_numpy()
 
 class ConcatEmbeddingsOptions(object):
     __slots__ = ['_tab']
 
     @classmethod
-    def GetRootAs(cls, buf, offset=0):
+    def GetRootAsConcatEmbeddingsOptions(cls, buf, offset):
         n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset)
         x = ConcatEmbeddingsOptions()
         x.Init(buf, n + offset)
         return x
 
-    @classmethod
-    def GetRootAsConcatEmbeddingsOptions(cls, buf, offset=0):
-        """This method is deprecated. Please switch to GetRootAs."""
-        return cls.GetRootAs(buf, offset)
-    @classmethod
-    def ConcatEmbeddingsOptionsBufferHasIdentifier(cls, buf, offset, size_prefixed=False):
-        return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed)
-
     # ConcatEmbeddingsOptions
     def Init(self, buf, pos):
         self._tab = flatbuffers.table.Table(buf, pos)
@@ -58,11 +48,6 @@
         return 0
 
     # ConcatEmbeddingsOptions
-    def NumColumnsPerChannelIsNone(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
-        return o == 0
-
-    # ConcatEmbeddingsOptions
     def EmbeddingDimPerChannel(self, j):
         o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
         if o != 0:
@@ -84,36 +69,10 @@
             return self._tab.VectorLen(o)
         return 0
 
-    # ConcatEmbeddingsOptions
-    def EmbeddingDimPerChannelIsNone(self):
-        o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
-        return o == 0
-
-def Start(builder): builder.StartObject(3)
-def ConcatEmbeddingsOptionsStart(builder):
-    """This method is deprecated. Please switch to Start."""
-    return Start(builder)
-def AddNumChannels(builder, numChannels): builder.PrependInt32Slot(0, numChannels, 0)
-def ConcatEmbeddingsOptionsAddNumChannels(builder, numChannels):
-    """This method is deprecated. Please switch to AddNumChannels."""
-    return AddNumChannels(builder, numChannels)
-def AddNumColumnsPerChannel(builder, numColumnsPerChannel): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(numColumnsPerChannel), 0)
-def ConcatEmbeddingsOptionsAddNumColumnsPerChannel(builder, numColumnsPerChannel):
-    """This method is deprecated. Please switch to AddNumColumnsPerChannel."""
-    return AddNumColumnsPerChannel(builder, numColumnsPerChannel)
-def StartNumColumnsPerChannelVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def ConcatEmbeddingsOptionsStartNumColumnsPerChannelVector(builder, numElems):
-    """This method is deprecated. Please switch to Start."""
-    return StartNumColumnsPerChannelVector(builder, numElems)
-def AddEmbeddingDimPerChannel(builder, embeddingDimPerChannel): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(embeddingDimPerChannel), 0)
-def ConcatEmbeddingsOptionsAddEmbeddingDimPerChannel(builder, embeddingDimPerChannel):
-    """This method is deprecated. Please switch to AddEmbeddingDimPerChannel."""
-    return AddEmbeddingDimPerChannel(builder, embeddingDimPerChannel)
-def StartEmbeddingDimPerChannelVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def ConcatEmbeddingsOptionsStartEmbeddingDimPerChannelVector(builder, numElems):
-    """This method is deprecated. Please switch to Start."""
-    return StartEmbeddingDimPerChannelVector(builder, numElems)
-def End(builder): return builder.EndObject()
-def ConcatEmbeddingsOptionsEnd(builder):
-    """This method is deprecated. Please switch to End."""
-    return End(builder)
\ No newline at end of file
+def ConcatEmbeddingsOptionsStart(builder): builder.StartObject(3)
+def ConcatEmbeddingsOptionsAddNumChannels(builder, numChannels): builder.PrependInt32Slot(0, numChannels, 0)
+def ConcatEmbeddingsOptionsAddNumColumnsPerChannel(builder, numColumnsPerChannel): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(numColumnsPerChannel), 0)
+def ConcatEmbeddingsOptionsStartNumColumnsPerChannelVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def ConcatEmbeddingsOptionsAddEmbeddingDimPerChannel(builder, embeddingDimPerChannel): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(embeddingDimPerChannel), 0)
+def ConcatEmbeddingsOptionsStartEmbeddingDimPerChannelVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def ConcatEmbeddingsOptionsEnd(builder): return builder.EndObject()