Remove redundent code after flatbuffers 2.0 update
Signed-off-by: Jerry Ge <jerry.ge@arm.com>
Change-Id: Ifb249836f8774e0797fd6650442c55da8a084a17
diff --git a/python/serializer/tosa_serializer.py b/python/serializer/tosa_serializer.py
index 2d03d49..5ec45d1 100644
--- a/python/serializer/tosa_serializer.py
+++ b/python/serializer/tosa_serializer.py
@@ -708,9 +708,6 @@
class TosaSerializer:
def __init__(self, pathPrefix, saveConstsToFile=False):
- self.add_compat_methods()
- # Get the global TOSA version if not already defined
-
self.builder = flatbuffers.Builder(0)
self.regions = []
@@ -891,371 +888,3 @@
return val
else:
return [val]
-
- # Remove when switching to flatbuffers 2.0
- # contains a mapping of the deprecated 1.12 method to the 2.0 version
-
- def add_compat_methods(self):
-
- from tosa import ArithmeticRightShiftAttribute
-
- if not hasattr(ArithmeticRightShiftAttribute, "Start"):
- ArithmeticRightShiftAttribute.Start = (
- ArithmeticRightShiftAttribute.ArithmeticRightShiftAttributeStart
- )
- ArithmeticRightShiftAttribute.AddRound = (
- ArithmeticRightShiftAttribute.ArithmeticRightShiftAttributeAddRound
- )
- ArithmeticRightShiftAttribute.End = (
- ArithmeticRightShiftAttribute.ArithmeticRightShiftAttributeEnd
- )
- from tosa import AxisAttribute
-
- if not hasattr(AxisAttribute, "Start"):
- AxisAttribute.Start = AxisAttribute.AxisAttributeStart
- AxisAttribute.AddAxis = AxisAttribute.AxisAttributeAddAxis
- AxisAttribute.End = AxisAttribute.AxisAttributeEnd
- from tosa import ClampAttribute
-
- if not hasattr(ClampAttribute, "Start"):
- ClampAttribute.Start = ClampAttribute.ClampAttributeStart
- ClampAttribute.AddMinInt = ClampAttribute.ClampAttributeAddMinInt
- ClampAttribute.AddMaxInt = ClampAttribute.ClampAttributeAddMaxInt
- ClampAttribute.AddMinFp = ClampAttribute.ClampAttributeAddMinFp
- ClampAttribute.AddMaxFp = ClampAttribute.ClampAttributeAddMaxFp
- ClampAttribute.End = ClampAttribute.ClampAttributeEnd
- from tosa import CondIfAttribute
-
- if not hasattr(CondIfAttribute, "Start"):
- CondIfAttribute.Start = CondIfAttribute.CondIfAttributeStart
- CondIfAttribute.AddThenBranch = CondIfAttribute.CondIfAttributeAddThenBranch
- CondIfAttribute.AddElseBranch = CondIfAttribute.CondIfAttributeAddElseBranch
- CondIfAttribute.End = CondIfAttribute.CondIfAttributeEnd
- from tosa import ConvAttribute
-
- if not hasattr(ConvAttribute, "Start"):
- ConvAttribute.Start = ConvAttribute.ConvAttributeStart
- ConvAttribute.AddPad = ConvAttribute.ConvAttributeAddPad
- ConvAttribute.StartPadVector = ConvAttribute.ConvAttributeStartPadVector
- ConvAttribute.AddStride = ConvAttribute.ConvAttributeAddStride
- ConvAttribute.StartStrideVector = (
- ConvAttribute.ConvAttributeStartStrideVector
- )
- ConvAttribute.AddDilation = ConvAttribute.ConvAttributeAddDilation
- ConvAttribute.StartDilationVector = (
- ConvAttribute.ConvAttributeStartDilationVector
- )
- ConvAttribute.AddInputZp = ConvAttribute.ConvAttributeAddInputZp
- ConvAttribute.AddWeightZp = ConvAttribute.ConvAttributeAddWeightZp
- ConvAttribute.AddAccumDtype = ConvAttribute.ConvAttributeAddAccumDtype
- ConvAttribute.End = ConvAttribute.ConvAttributeEnd
- from tosa import FullyConnectedAttribute
-
- if not hasattr(FullyConnectedAttribute, "Start"):
- FullyConnectedAttribute.Start = (
- FullyConnectedAttribute.FullyConnectedAttributeStart
- )
- FullyConnectedAttribute.AddInputZp = (
- FullyConnectedAttribute.FullyConnectedAttributeAddInputZp
- )
- FullyConnectedAttribute.AddWeightZp = (
- FullyConnectedAttribute.FullyConnectedAttributeAddWeightZp
- )
- FullyConnectedAttribute.AddAccumDtype = (
- FullyConnectedAttribute.FullyConnectedAttributeAddAccumDtype
- )
- FullyConnectedAttribute.End = (
- FullyConnectedAttribute.FullyConnectedAttributeEnd
- )
- from tosa import MatMulAttribute
-
- if not hasattr(MatMulAttribute, "Start"):
- MatMulAttribute.Start = MatMulAttribute.MatMulAttributeStart
- MatMulAttribute.AddAZp = MatMulAttribute.MatMulAttributeAddAZp
- MatMulAttribute.AddBZp = MatMulAttribute.MatMulAttributeAddBZp
- MatMulAttribute.AddAccumDtype = MatMulAttribute.MatMulAttributeAddAccumDtype
- MatMulAttribute.End = MatMulAttribute.MatMulAttributeEnd
- from tosa import PoolAttribute
-
- if not hasattr(PoolAttribute, "Start"):
- PoolAttribute.Start = PoolAttribute.PoolAttributeStart
- PoolAttribute.AddPad = PoolAttribute.PoolAttributeAddPad
- PoolAttribute.StartPadVector = PoolAttribute.PoolAttributeStartPadVector
- PoolAttribute.AddKernel = PoolAttribute.PoolAttributeAddKernel
- PoolAttribute.StartKernelVector = (
- PoolAttribute.PoolAttributeStartKernelVector
- )
- PoolAttribute.AddStride = PoolAttribute.PoolAttributeAddStride
- PoolAttribute.StartStrideVector = (
- PoolAttribute.PoolAttributeStartStrideVector
- )
- PoolAttribute.AddAccumDtype = PoolAttribute.PoolAttributeAddAccumDtype
- PoolAttribute.AddInputZp = PoolAttribute.PoolAttributeAddInputZp
- PoolAttribute.AddOutputZp = PoolAttribute.PoolAttributeAddOutputZp
- PoolAttribute.End = PoolAttribute.PoolAttributeEnd
- from tosa import MulAttribute
-
- if not hasattr(MulAttribute, "Start"):
- MulAttribute.Start = MulAttribute.MulAttributeStart
- MulAttribute.AddShift = MulAttribute.MulAttributeAddShift
- MulAttribute.End = MulAttribute.MulAttributeEnd
- from tosa import PadAttribute
-
- if not hasattr(PadAttribute, "Start"):
- PadAttribute.Start = PadAttribute.PadAttributeStart
- PadAttribute.AddPadding = PadAttribute.PadAttributeAddPadding
- PadAttribute.StartPaddingVector = (
- PadAttribute.PadAttributeStartPaddingVector
- )
- PadAttribute.AddPadConstInt = PadAttribute.PadAttributeAddPadConstInt
- PadAttribute.AddPadConstFp = PadAttribute.PadAttributeAddPadConstFp
- PadAttribute.End = PadAttribute.PadAttributeEnd
- from tosa import PoolAttribute
-
- if not hasattr(PoolAttribute, "Start"):
- PoolAttribute.Start = PoolAttribute.PoolAttributeStart
- PoolAttribute.AddPad = PoolAttribute.PoolAttributeAddPad
- PoolAttribute.StartPadVector = PoolAttribute.PoolAttributeStartPadVector
- PoolAttribute.AddKernel = PoolAttribute.PoolAttributeAddKernel
- PoolAttribute.StartKernelVector = (
- PoolAttribute.PoolAttributeStartKernelVector
- )
- PoolAttribute.AddStride = PoolAttribute.PoolAttributeAddStride
- PoolAttribute.StartStrideVector = (
- PoolAttribute.PoolAttributeStartStrideVector
- )
- PoolAttribute.AddAccumDtype = PoolAttribute.PoolAttributeAddAccumDtype
- PoolAttribute.AddInputZp = PoolAttribute.PoolAttributeAddInputZp
- PoolAttribute.AddOutputZp = PoolAttribute.PoolAttributeAddOutputZp
- PoolAttribute.End = PoolAttribute.PoolAttributeEnd
- from tosa import RescaleAttribute
-
- if not hasattr(RescaleAttribute, "Start"):
- RescaleAttribute.Start = RescaleAttribute.RescaleAttributeStart
- RescaleAttribute.AddInputZp = RescaleAttribute.RescaleAttributeAddInputZp
- RescaleAttribute.AddOutputZp = RescaleAttribute.RescaleAttributeAddOutputZp
- RescaleAttribute.AddMultiplier = (
- RescaleAttribute.RescaleAttributeAddMultiplier
- )
- RescaleAttribute.StartMultiplierVector = (
- RescaleAttribute.RescaleAttributeStartMultiplierVector
- )
- RescaleAttribute.AddShift = RescaleAttribute.RescaleAttributeAddShift
- RescaleAttribute.StartShiftVector = (
- RescaleAttribute.RescaleAttributeStartShiftVector
- )
- RescaleAttribute.AddScale32 = RescaleAttribute.RescaleAttributeAddScale32
- RescaleAttribute.AddDoubleRound = (
- RescaleAttribute.RescaleAttributeAddDoubleRound
- )
- RescaleAttribute.AddPerChannel = (
- RescaleAttribute.RescaleAttributeAddPerChannel
- )
- RescaleAttribute.End = RescaleAttribute.RescaleAttributeEnd
- from tosa import ReshapeAttribute
-
- if not hasattr(ReshapeAttribute, "Start"):
- ReshapeAttribute.Start = ReshapeAttribute.ReshapeAttributeStart
- ReshapeAttribute.AddNewShape = ReshapeAttribute.ReshapeAttributeAddNewShape
- ReshapeAttribute.StartNewShapeVector = (
- ReshapeAttribute.ReshapeAttributeStartNewShapeVector
- )
- ReshapeAttribute.End = ReshapeAttribute.ReshapeAttributeEnd
- from tosa import ResizeAttribute
-
- if not hasattr(ResizeAttribute, "Start"):
- ResizeAttribute.Start = ResizeAttribute.ResizeAttributeStart
- ResizeAttribute.AddScale = ResizeAttribute.ResizeAttributeAddScale
- ResizeAttribute.StartScaleVector = (
- ResizeAttribute.ResizeAttributeStartScaleVector
- )
- ResizeAttribute.AddOffset = ResizeAttribute.ResizeAttributeAddOffset
- ResizeAttribute.StartOffsetVector = (
- ResizeAttribute.ResizeAttributeStartOffsetVector
- )
- ResizeAttribute.AddBorder = ResizeAttribute.ResizeAttributeAddBorder
- ResizeAttribute.StartBorderVector = (
- ResizeAttribute.ResizeAttributeStartBorderVector
- )
- ResizeAttribute.AddMode = ResizeAttribute.ResizeAttributeAddMode
- ResizeAttribute.End = ResizeAttribute.ResizeAttributeEnd
- from tosa import SliceAttribute
-
- if not hasattr(SliceAttribute, "Start"):
- SliceAttribute.Start = SliceAttribute.SliceAttributeStart
- SliceAttribute.AddStart = SliceAttribute.SliceAttributeAddStart
- SliceAttribute.StartStartVector = (
- SliceAttribute.SliceAttributeStartStartVector
- )
- SliceAttribute.AddSize = SliceAttribute.SliceAttributeAddSize
- SliceAttribute.StartSizeVector = (
- SliceAttribute.SliceAttributeStartSizeVector
- )
- SliceAttribute.End = SliceAttribute.SliceAttributeEnd
- from tosa import TableAttribute
-
- if not hasattr(TableAttribute, "Start"):
- TableAttribute.Start = TableAttribute.TableAttributeStart
- TableAttribute.AddTable = TableAttribute.TableAttributeAddTable
- TableAttribute.StartTableVector = (
- TableAttribute.TableAttributeStartTableVector
- )
- TableAttribute.End = TableAttribute.TableAttributeEnd
- from tosa import TileAttribute
-
- if not hasattr(TileAttribute, "Start"):
- TileAttribute.Start = TileAttribute.TileAttributeStart
- TileAttribute.AddMultiples = TileAttribute.TileAttributeAddMultiples
- TileAttribute.StartMultiplesVector = (
- TileAttribute.TileAttributeStartMultiplesVector
- )
- TileAttribute.End = TileAttribute.TileAttributeEnd
- from tosa import TosaBasicBlock
-
- if not hasattr(TosaBasicBlock, "Start"):
- TosaBasicBlock.Start = TosaBasicBlock.TosaBasicBlockStart
- TosaBasicBlock.AddName = TosaBasicBlock.TosaBasicBlockAddName
- TosaBasicBlock.AddOperators = TosaBasicBlock.TosaBasicBlockAddOperators
- TosaBasicBlock.StartOperatorsVector = (
- TosaBasicBlock.TosaBasicBlockStartOperatorsVector
- )
- TosaBasicBlock.AddTensors = TosaBasicBlock.TosaBasicBlockAddTensors
- TosaBasicBlock.StartTensorsVector = (
- TosaBasicBlock.TosaBasicBlockStartTensorsVector
- )
- TosaBasicBlock.AddInputs = TosaBasicBlock.TosaBasicBlockAddInputs
- TosaBasicBlock.StartInputsVector = (
- TosaBasicBlock.TosaBasicBlockStartInputsVector
- )
- TosaBasicBlock.AddOutputs = TosaBasicBlock.TosaBasicBlockAddOutputs
- TosaBasicBlock.StartOutputsVector = (
- TosaBasicBlock.TosaBasicBlockStartOutputsVector
- )
- TosaBasicBlock.End = TosaBasicBlock.TosaBasicBlockEnd
- from tosa import TosaGraph
-
- if not hasattr(TosaGraph, "Start"):
- TosaGraph.Start = TosaGraph.TosaGraphStart
- TosaGraph.AddVersion = TosaGraph.TosaGraphAddVersion
- TosaGraph.AddRegions = TosaGraph.TosaGraphAddRegions
- TosaGraph.StartRegionsVector = TosaGraph.TosaGraphStartRegionsVector
- TosaGraph.End = TosaGraph.TosaGraphEnd
- from tosa import TosaOperator
-
- if not hasattr(TosaOperator, "Start"):
- TosaOperator.Start = TosaOperator.TosaOperatorStart
- TosaOperator.AddOp = TosaOperator.TosaOperatorAddOp
- TosaOperator.AddAttributeType = TosaOperator.TosaOperatorAddAttributeType
- TosaOperator.AddAttribute = TosaOperator.TosaOperatorAddAttribute
- TosaOperator.AddInputs = TosaOperator.TosaOperatorAddInputs
- TosaOperator.StartInputsVector = TosaOperator.TosaOperatorStartInputsVector
- TosaOperator.AddOutputs = TosaOperator.TosaOperatorAddOutputs
- TosaOperator.StartOutputsVector = (
- TosaOperator.TosaOperatorStartOutputsVector
- )
- TosaOperator.End = TosaOperator.TosaOperatorEnd
- from tosa import TosaTensor
-
- if not hasattr(TosaTensor, "Start"):
- TosaTensor.Start = TosaTensor.TosaTensorStart
- TosaTensor.AddName = TosaTensor.TosaTensorAddName
- TosaTensor.AddShape = TosaTensor.TosaTensorAddShape
- TosaTensor.StartShapeVector = TosaTensor.TosaTensorStartShapeVector
- TosaTensor.AddType = TosaTensor.TosaTensorAddType
- TosaTensor.AddData = TosaTensor.TosaTensorAddData
- TosaTensor.StartDataVector = TosaTensor.TosaTensorStartDataVector
- TosaTensor.End = TosaTensor.TosaTensorEnd
- from tosa import TransposeAttribute
-
- if not hasattr(TransposeAttribute, "Start"):
- TransposeAttribute.Start = TransposeAttribute.TransposeAttributeStart
- TransposeAttribute.AddPerms = TransposeAttribute.TransposeAttributeAddPerms
- TransposeAttribute.StartPermsVector = (
- TransposeAttribute.TransposeAttributeStartPermsVector
- )
- TransposeAttribute.End = TransposeAttribute.TransposeAttributeEnd
- from tosa import TransposeConvAttribute
-
- if not hasattr(TransposeConvAttribute, "Start"):
- TransposeConvAttribute.Start = (
- TransposeConvAttribute.TransposeConvAttributeStart
- )
- TransposeConvAttribute.AddOutPad = (
- TransposeConvAttribute.TransposeConvAttributeAddOutPad
- )
- TransposeConvAttribute.StartOutPadVector = (
- TransposeConvAttribute.TransposeConvAttributeStartOutPadVector
- )
- TransposeConvAttribute.AddStride = (
- TransposeConvAttribute.TransposeConvAttributeAddStride
- )
- TransposeConvAttribute.StartStrideVector = (
- TransposeConvAttribute.TransposeConvAttributeStartStrideVector
- )
- TransposeConvAttribute.AddOutputShape = (
- TransposeConvAttribute.TransposeConvAttributeAddOutputShape
- )
- TransposeConvAttribute.StartOutputShapeVector = (
- TransposeConvAttribute.TransposeConvAttributeStartOutputShapeVector
- )
- TransposeConvAttribute.AddInputZp = (
- TransposeConvAttribute.TransposeConvAttributeAddInputZp
- )
- TransposeConvAttribute.AddWeightZp = (
- TransposeConvAttribute.TransposeConvAttributeAddWeightZp
- )
- TransposeConvAttribute.AddAccumDtype = (
- TransposeConvAttribute.TransposeConvAttributeAddAccumDtype
- )
- TransposeConvAttribute.End = (
- TransposeConvAttribute.TransposeConvAttributeEnd
- )
- from tosa import Version
-
- if not hasattr(Version, "Start"):
- Version.Start = Version.VersionStart
- Version.Add_major = Version.VersionAdd_major
- Version.Add_minor = Version.VersionAdd_minor
- Version.Add_patch = Version.VersionAdd_patch
- Version.Add_draft = Version.VersionAdd_draft
- Version.End = Version.VersionEnd
- from tosa import MatMulAttribute
-
- if not hasattr(MatMulAttribute, "Start"):
- MatMulAttribute.Start = MatMulAttribute.MatMulAttributeStart
- MatMulAttribute.AddAZp = MatMulAttribute.MatMulAttributeAddAZp
- MatMulAttribute.AddBZp = MatMulAttribute.MatMulAttributeAddBZp
- MatMulAttribute.End = MatMulAttribute.MatMulAttributeEnd
- from tosa import FullyConnectedAttribute
-
- if not hasattr(FullyConnectedAttribute, "Start"):
- FullyConnectedAttribute.Start = (
- FullyConnectedAttribute.FullyConnectedAttributeStart
- )
- FullyConnectedAttribute.AddInputZp = (
- FullyConnectedAttribute.FullyConnectedAttributeAddInputZp
- )
- FullyConnectedAttribute.AddWeightZp = (
- FullyConnectedAttribute.FullyConnectedAttributeAddWeightZp
- )
- FullyConnectedAttribute.End = (
- FullyConnectedAttribute.FullyConnectedAttributeEnd
- )
- from tosa import NegateAttribute
-
- if not hasattr(NegateAttribute, "Start"):
- NegateAttribute.Start = NegateAttribute.NegateAttributeStart
- NegateAttribute.AddInput1Zp = NegateAttribute.NegateAttributeAddInput1Zp
- NegateAttribute.AddOutputZp = NegateAttribute.NegateAttributeAddOutputZp
- NegateAttribute.End = NegateAttribute.NegateAttributeEnd
- from tosa import WhileLoopAttribute
-
- if not hasattr(WhileLoopAttribute, "Start"):
- WhileLoopAttribute.Start = WhileLoopAttribute.WhileLoopAttributeStart
- WhileLoopAttribute.AddCondBranch = (
- WhileLoopAttribute.WhileLoopAttributeAddCondBranch
- )
- WhileLoopAttribute.AddBodyBranch = (
- WhileLoopAttribute.WhileLoopAttributeAddBodyBranch
- )
- WhileLoopAttribute.End = WhileLoopAttribute.WhileLoopAttributeEnd