Skip to content

Commit

Permalink
Merge pull request #56 from robertknight/ubyte-operator-type
Browse files Browse the repository at this point in the history 
Use `ubyte` for OperatorType enum
  • Loading branch information
@robertknight
robertknight authored Feb 28, 2024
2 parents 958a805 + 16aa27b commit a63f0cb
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 143 deletions.
52 changes: 26 additions & 26 deletions rten-convert/rten_convert/schema_generated.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ def KernelSizeIsNone(self):
def PadMode(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

# AveragePoolAttrs
Expand Down Expand Up @@ -519,7 +519,7 @@ def AveragePoolAttrsStartKernelSizeVector(builder, numElems):
return builder.StartVector(4, numElems, 4)

def AveragePoolAttrsAddPadMode(builder, padMode):
builder.PrependInt8Slot(1, padMode, 0)
builder.PrependUint8Slot(1, padMode, 0)

def AveragePoolAttrsAddPads(builder, pads):
builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(pads), 0)
Expand Down Expand Up @@ -742,14 +742,14 @@ def Init(self, buf, pos):
def To(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

def CastAttrsStart(builder):
builder.StartObject(1)

def CastAttrsAddTo(builder, to):
builder.PrependInt8Slot(0, to, 0)
builder.PrependUint8Slot(0, to, 0)

def CastAttrsEnd(builder):
return builder.EndObject()
Expand Down Expand Up @@ -1150,7 +1150,7 @@ def Init(self, buf, pos):
def PadMode(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

# ConvAttrs
Expand Down Expand Up @@ -1245,7 +1245,7 @@ def ConvAttrsStart(builder):
builder.StartObject(5)

def ConvAttrsAddPadMode(builder, padMode):
builder.PrependInt8Slot(0, padMode, 0)
builder.PrependUint8Slot(0, padMode, 0)

def ConvAttrsAddPads(builder, pads):
builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(pads), 0)
Expand Down Expand Up @@ -1876,7 +1876,7 @@ def Init(self, buf, pos):
def Direction(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

# GRUAttrs
Expand All @@ -1897,7 +1897,7 @@ def GRUAttrsStart(builder):
builder.StartObject(3)

def GRUAttrsAddDirection(builder, direction):
builder.PrependInt8Slot(0, direction, 0)
builder.PrependUint8Slot(0, direction, 0)

def GRUAttrsAddHiddenSize(builder, hiddenSize):
builder.PrependUint32Slot(1, hiddenSize, 0)
Expand Down Expand Up @@ -2146,7 +2146,7 @@ def Init(self, buf, pos):
def Direction(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

# LSTMAttrs
Expand All @@ -2160,7 +2160,7 @@ def LSTMAttrsStart(builder):
builder.StartObject(2)

def LSTMAttrsAddDirection(builder, direction):
builder.PrependInt8Slot(0, direction, 0)
builder.PrependUint8Slot(0, direction, 0)

def LSTMAttrsAddHiddenSize(builder, hiddenSize):
builder.PrependUint32Slot(1, hiddenSize, 0)
Expand Down Expand Up @@ -2263,7 +2263,7 @@ def KernelSizeIsNone(self):
def PadMode(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

# MaxPoolAttrs
Expand Down Expand Up @@ -2330,7 +2330,7 @@ def MaxPoolAttrsStartKernelSizeVector(builder, numElems):
return builder.StartVector(4, numElems, 4)

def MaxPoolAttrsAddPadMode(builder, padMode):
builder.PrependInt8Slot(1, padMode, 0)
builder.PrependUint8Slot(1, padMode, 0)

def MaxPoolAttrsAddPads(builder, pads):
builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(pads), 0)
Expand Down Expand Up @@ -2547,14 +2547,14 @@ def Init(self, buf, pos):
def BoxOrder(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

def NonMaxSuppressionAttrsStart(builder):
builder.StartObject(1)

def NonMaxSuppressionAttrsAddBoxOrder(builder, boxOrder):
builder.PrependInt8Slot(0, boxOrder, 0)
builder.PrependUint8Slot(0, boxOrder, 0)

def NonMaxSuppressionAttrsEnd(builder):
return builder.EndObject()
Expand Down Expand Up @@ -2910,34 +2910,34 @@ def Init(self, buf, pos):
def Mode(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

# ResizeAttrs
def CoordMode(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

# ResizeAttrs
def NearestMode(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

def ResizeAttrsStart(builder):
builder.StartObject(3)

def ResizeAttrsAddMode(builder, mode):
builder.PrependInt8Slot(0, mode, 0)
builder.PrependUint8Slot(0, mode, 0)

def ResizeAttrsAddCoordMode(builder, coordMode):
builder.PrependInt8Slot(1, coordMode, 0)
builder.PrependUint8Slot(1, coordMode, 0)

def ResizeAttrsAddNearestMode(builder, nearestMode):
builder.PrependInt8Slot(2, nearestMode, 0)
builder.PrependUint8Slot(2, nearestMode, 0)

def ResizeAttrsEnd(builder):
return builder.EndObject()
Expand Down Expand Up @@ -3020,7 +3020,7 @@ def Axis(self):
def Reduction(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

def ScatterElementsAttrsStart(builder):
Expand All @@ -3030,7 +3030,7 @@ def ScatterElementsAttrsAddAxis(builder, axis):
builder.PrependInt32Slot(0, axis, 0)

def ScatterElementsAttrsAddReduction(builder, reduction):
builder.PrependInt8Slot(1, reduction, 0)
builder.PrependUint8Slot(1, reduction, 0)

def ScatterElementsAttrsEnd(builder):
return builder.EndObject()
Expand Down Expand Up @@ -3103,14 +3103,14 @@ def Init(self, buf, pos):
def Reduction(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

def ScatterNDAttrsStart(builder):
builder.StartObject(1)

def ScatterNDAttrsAddReduction(builder, reduction):
builder.PrependInt8Slot(0, reduction, 0)
builder.PrependUint8Slot(0, reduction, 0)

def ScatterNDAttrsEnd(builder):
return builder.EndObject()
Expand Down Expand Up @@ -3633,7 +3633,7 @@ def Init(self, buf, pos):
def Type(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.Get(flatbuffers.number_types.Int8Flags, o + self._tab.Pos)
return self._tab.Get(flatbuffers.number_types.Uint8Flags, o + self._tab.Pos)
return 0

# OperatorNode
Expand Down Expand Up @@ -3711,7 +3711,7 @@ def OperatorNodeStart(builder):
builder.StartObject(5)

def OperatorNodeAddType(builder, type):
builder.PrependInt8Slot(0, type, 0)
builder.PrependUint8Slot(0, type, 0)

def OperatorNodeAddAttrsType(builder, attrsType):
builder.PrependUint8Slot(1, attrsType, 0)
Expand Down
18 changes: 9 additions & 9 deletions src/schema.fbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ file_identifier "RTEN";
file_extension "rten";

// Type for an operator node
enum OperatorType: byte {
enum OperatorType: ubyte {
Add,
ArgMin,
ArgMax,
Expand Down Expand Up @@ -107,38 +107,38 @@ enum OperatorType: byte {
ReduceSumSquare,
}

enum RNNDirection: byte {
enum RNNDirection: ubyte {
Forwards,
Reverse,
Bidirectional
}

enum PadMode: byte {
enum PadMode: ubyte {
Same,
Fixed
}

enum DataType: byte {
enum DataType: ubyte {
Int32,
Float
}

// Coordinate transform modes for Resize operator.
enum CoordTransformMode: byte {
enum CoordTransformMode: ubyte {
HalfPixel,
Asymmetric,
AlignCorners
}

// Rounding modes supported by Resize operator when `ResizeMode` is `Nearest`.
enum NearestMode: byte {
enum NearestMode: ubyte {
Floor,
Ceil,
RoundPreferFloor,
RoundPreferCeil,
}

enum ResizeMode: byte {
enum ResizeMode: ubyte {
Nearest,
Linear
}
Expand Down Expand Up @@ -295,7 +295,7 @@ table ModAttrs {
fmod:bool;
}

enum NMSBoxOrder: byte {
enum NMSBoxOrder: ubyte {
TopLeftBottomRight,
CenterWidthHeight,
}
Expand Down Expand Up @@ -323,7 +323,7 @@ table ResizeAttrs {
nearest_mode:NearestMode;
}

enum ScatterReduction: byte {
enum ScatterReduction: ubyte {
None,
Add,
Mul,
Expand Down
Loading

0 comments on commit a63f0cb

Please sign in to comment.