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/SkipGramOptions.py | 37 ++++++----------------------------- 1 file changed, 6 insertions(+), 31 deletions(-) (limited to 'ethosu/vela/tflite/SkipGramOptions.py') diff --git a/ethosu/vela/tflite/SkipGramOptions.py b/ethosu/vela/tflite/SkipGramOptions.py index c1173a58..0e8bdc1d 100644 --- a/ethosu/vela/tflite/SkipGramOptions.py +++ b/ethosu/vela/tflite/SkipGramOptions.py @@ -3,27 +3,17 @@ # namespace: tflite import flatbuffers -from flatbuffers.compat import import_numpy -np = import_numpy() class SkipGramOptions(object): __slots__ = ['_tab'] @classmethod - def GetRootAs(cls, buf, offset=0): + def GetRootAsSkipGramOptions(cls, buf, offset): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = SkipGramOptions() x.Init(buf, n + offset) return x - @classmethod - def GetRootAsSkipGramOptions(cls, buf, offset=0): - """This method is deprecated. Please switch to GetRootAs.""" - return cls.GetRootAs(buf, offset) - @classmethod - def SkipGramOptionsBufferHasIdentifier(cls, buf, offset, size_prefixed=False): - return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed) - # SkipGramOptions def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) @@ -49,23 +39,8 @@ class SkipGramOptions(object): return bool(self._tab.Get(flatbuffers.number_types.BoolFlags, o + self._tab.Pos)) return False -def Start(builder): builder.StartObject(3) -def SkipGramOptionsStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddNgramSize(builder, ngramSize): builder.PrependInt32Slot(0, ngramSize, 0) -def SkipGramOptionsAddNgramSize(builder, ngramSize): - """This method is deprecated. Please switch to AddNgramSize.""" - return AddNgramSize(builder, ngramSize) -def AddMaxSkipSize(builder, maxSkipSize): builder.PrependInt32Slot(1, maxSkipSize, 0) -def SkipGramOptionsAddMaxSkipSize(builder, maxSkipSize): - """This method is deprecated. Please switch to AddMaxSkipSize.""" - return AddMaxSkipSize(builder, maxSkipSize) -def AddIncludeAllNgrams(builder, includeAllNgrams): builder.PrependBoolSlot(2, includeAllNgrams, 0) -def SkipGramOptionsAddIncludeAllNgrams(builder, includeAllNgrams): - """This method is deprecated. Please switch to AddIncludeAllNgrams.""" - return AddIncludeAllNgrams(builder, includeAllNgrams) -def End(builder): return builder.EndObject() -def SkipGramOptionsEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def SkipGramOptionsStart(builder): builder.StartObject(3) +def SkipGramOptionsAddNgramSize(builder, ngramSize): builder.PrependInt32Slot(0, ngramSize, 0) +def SkipGramOptionsAddMaxSkipSize(builder, maxSkipSize): builder.PrependInt32Slot(1, maxSkipSize, 0) +def SkipGramOptionsAddIncludeAllNgrams(builder, includeAllNgrams): builder.PrependBoolSlot(2, includeAllNgrams, 0) +def SkipGramOptionsEnd(builder): return builder.EndObject() -- cgit v1.2.1