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/Conv3DOptions.py | 62 +++++++------------------------------ 1 file changed, 11 insertions(+), 51 deletions(-) (limited to 'ethosu/vela/tflite/Conv3DOptions.py') diff --git a/ethosu/vela/tflite/Conv3DOptions.py b/ethosu/vela/tflite/Conv3DOptions.py index 849df22e..e8f4ab2d 100644 --- a/ethosu/vela/tflite/Conv3DOptions.py +++ b/ethosu/vela/tflite/Conv3DOptions.py @@ -3,27 +3,17 @@ # namespace: tflite import flatbuffers -from flatbuffers.compat import import_numpy -np = import_numpy() class Conv3DOptions(object): __slots__ = ['_tab'] @classmethod - def GetRootAs(cls, buf, offset=0): + def GetRootAsConv3DOptions(cls, buf, offset): n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset) x = Conv3DOptions() x.Init(buf, n + offset) return x - @classmethod - def GetRootAsConv3DOptions(cls, buf, offset=0): - """This method is deprecated. Please switch to GetRootAs.""" - return cls.GetRootAs(buf, offset) - @classmethod - def Conv3DOptionsBufferHasIdentifier(cls, buf, offset, size_prefixed=False): - return flatbuffers.util.BufferHasIdentifier(buf, offset, b"\x54\x46\x4C\x33", size_prefixed=size_prefixed) - # Conv3DOptions def Init(self, buf, pos): self._tab = flatbuffers.table.Table(buf, pos) @@ -84,43 +74,13 @@ class Conv3DOptions(object): return self._tab.Get(flatbuffers.number_types.Int32Flags, o + self._tab.Pos) return 1 -def Start(builder): builder.StartObject(8) -def Conv3DOptionsStart(builder): - """This method is deprecated. Please switch to Start.""" - return Start(builder) -def AddPadding(builder, padding): builder.PrependInt8Slot(0, padding, 0) -def Conv3DOptionsAddPadding(builder, padding): - """This method is deprecated. Please switch to AddPadding.""" - return AddPadding(builder, padding) -def AddStrideD(builder, strideD): builder.PrependInt32Slot(1, strideD, 0) -def Conv3DOptionsAddStrideD(builder, strideD): - """This method is deprecated. Please switch to AddStrideD.""" - return AddStrideD(builder, strideD) -def AddStrideW(builder, strideW): builder.PrependInt32Slot(2, strideW, 0) -def Conv3DOptionsAddStrideW(builder, strideW): - """This method is deprecated. Please switch to AddStrideW.""" - return AddStrideW(builder, strideW) -def AddStrideH(builder, strideH): builder.PrependInt32Slot(3, strideH, 0) -def Conv3DOptionsAddStrideH(builder, strideH): - """This method is deprecated. Please switch to AddStrideH.""" - return AddStrideH(builder, strideH) -def AddFusedActivationFunction(builder, fusedActivationFunction): builder.PrependInt8Slot(4, fusedActivationFunction, 0) -def Conv3DOptionsAddFusedActivationFunction(builder, fusedActivationFunction): - """This method is deprecated. Please switch to AddFusedActivationFunction.""" - return AddFusedActivationFunction(builder, fusedActivationFunction) -def AddDilationDFactor(builder, dilationDFactor): builder.PrependInt32Slot(5, dilationDFactor, 1) -def Conv3DOptionsAddDilationDFactor(builder, dilationDFactor): - """This method is deprecated. Please switch to AddDilationDFactor.""" - return AddDilationDFactor(builder, dilationDFactor) -def AddDilationWFactor(builder, dilationWFactor): builder.PrependInt32Slot(6, dilationWFactor, 1) -def Conv3DOptionsAddDilationWFactor(builder, dilationWFactor): - """This method is deprecated. Please switch to AddDilationWFactor.""" - return AddDilationWFactor(builder, dilationWFactor) -def AddDilationHFactor(builder, dilationHFactor): builder.PrependInt32Slot(7, dilationHFactor, 1) -def Conv3DOptionsAddDilationHFactor(builder, dilationHFactor): - """This method is deprecated. Please switch to AddDilationHFactor.""" - return AddDilationHFactor(builder, dilationHFactor) -def End(builder): return builder.EndObject() -def Conv3DOptionsEnd(builder): - """This method is deprecated. Please switch to End.""" - return End(builder) \ No newline at end of file +def Conv3DOptionsStart(builder): builder.StartObject(8) +def Conv3DOptionsAddPadding(builder, padding): builder.PrependInt8Slot(0, padding, 0) +def Conv3DOptionsAddStrideD(builder, strideD): builder.PrependInt32Slot(1, strideD, 0) +def Conv3DOptionsAddStrideW(builder, strideW): builder.PrependInt32Slot(2, strideW, 0) +def Conv3DOptionsAddStrideH(builder, strideH): builder.PrependInt32Slot(3, strideH, 0) +def Conv3DOptionsAddFusedActivationFunction(builder, fusedActivationFunction): builder.PrependInt8Slot(4, fusedActivationFunction, 0) +def Conv3DOptionsAddDilationDFactor(builder, dilationDFactor): builder.PrependInt32Slot(5, dilationDFactor, 1) +def Conv3DOptionsAddDilationWFactor(builder, dilationWFactor): builder.PrependInt32Slot(6, dilationWFactor, 1) +def Conv3DOptionsAddDilationHFactor(builder, dilationHFactor): builder.PrependInt32Slot(7, dilationHFactor, 1) +def Conv3DOptionsEnd(builder): return builder.EndObject() -- cgit v1.2.1