TOSA: Update to new schema
Update based on schema corresponding to
TOSA conformance tests release v0.5.
Signed-off-by: Patrik Gustavsson <patrik.gustavsson@arm.com>
Change-Id: I517cd5d86ddb3ed8c0f377b4462466387dc3af44
diff --git a/ethosu/vela/tosa/Attribute.py b/ethosu/vela/tosa/Attribute.py
index 8a2ccae..b26ef48 100644
--- a/ethosu/vela/tosa/Attribute.py
+++ b/ethosu/vela/tosa/Attribute.py
@@ -4,9 +4,9 @@
class Attribute(object):
NONE = 0
- Pool2dAttribute = 1
- Conv2dAttribute = 2
- TransposeConv2dAttribute = 3
+ PoolAttribute = 1
+ ConvAttribute = 2
+ TransposeConvAttribute = 3
ReluNAttribute = 4
AxisAttribute = 5
ReshapeAttribute = 6
diff --git a/ethosu/vela/tosa/Conv2dAttribute.py b/ethosu/vela/tosa/ConvAttribute.py
similarity index 69%
rename from ethosu/vela/tosa/Conv2dAttribute.py
rename to ethosu/vela/tosa/ConvAttribute.py
index 5faecbd..d67ae5f 100644
--- a/ethosu/vela/tosa/Conv2dAttribute.py
+++ b/ethosu/vela/tosa/ConvAttribute.py
@@ -4,21 +4,21 @@
import flatbuffers
-class Conv2dAttribute(object):
+class ConvAttribute(object):
__slots__ = ['_tab']
@classmethod
- def GetRootAsConv2dAttribute(cls, buf, offset):
+ def GetRootAsConvAttribute(cls, buf, offset):
n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset)
- x = Conv2dAttribute()
+ x = ConvAttribute()
x.Init(buf, n + offset)
return x
- # Conv2dAttribute
+ # ConvAttribute
def Init(self, buf, pos):
self._tab = flatbuffers.table.Table(buf, pos)
- # Conv2dAttribute
+ # ConvAttribute
def Padding(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
@@ -26,21 +26,21 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # Conv2dAttribute
+ # ConvAttribute
def PaddingAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # Conv2dAttribute
+ # ConvAttribute
def PaddingLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.VectorLen(o)
return 0
- # Conv2dAttribute
+ # ConvAttribute
def Stride(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
@@ -48,21 +48,21 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # Conv2dAttribute
+ # ConvAttribute
def StrideAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # Conv2dAttribute
+ # ConvAttribute
def StrideLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.VectorLen(o)
return 0
- # Conv2dAttribute
+ # ConvAttribute
def Dilation(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
@@ -70,25 +70,25 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # Conv2dAttribute
+ # ConvAttribute
def DilationAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # Conv2dAttribute
+ # ConvAttribute
def DilationLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
return self._tab.VectorLen(o)
return 0
-def Conv2dAttributeStart(builder): builder.StartObject(3)
-def Conv2dAttributeAddPadding(builder, padding): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(padding), 0)
-def Conv2dAttributeStartPaddingVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def Conv2dAttributeAddStride(builder, stride): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(stride), 0)
-def Conv2dAttributeStartStrideVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def Conv2dAttributeAddDilation(builder, dilation): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(dilation), 0)
-def Conv2dAttributeStartDilationVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def Conv2dAttributeEnd(builder): return builder.EndObject()
+def ConvAttributeStart(builder): builder.StartObject(3)
+def ConvAttributeAddPadding(builder, padding): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(padding), 0)
+def ConvAttributeStartPaddingVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def ConvAttributeAddStride(builder, stride): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(stride), 0)
+def ConvAttributeStartStrideVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def ConvAttributeAddDilation(builder, dilation): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(dilation), 0)
+def ConvAttributeStartDilationVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def ConvAttributeEnd(builder): return builder.EndObject()
diff --git a/ethosu/vela/tosa/Op.py b/ethosu/vela/tosa/Op.py
index c71ac44..8b4af89 100644
--- a/ethosu/vela/tosa/Op.py
+++ b/ethosu/vela/tosa/Op.py
@@ -22,7 +22,7 @@
BITWISE_AND = 16
BITWISE_OR = 17
BITWISE_XOR = 18
- DIV = 19
+ INTDIV = 19
LOGICAL_AND = 20
LOGICAL_LEFT_SHIFT = 21
LOGICAL_RIGHT_SHIFT = 22
diff --git a/ethosu/vela/tosa/Pool2dAttribute.py b/ethosu/vela/tosa/PoolAttribute.py
similarity index 68%
rename from ethosu/vela/tosa/Pool2dAttribute.py
rename to ethosu/vela/tosa/PoolAttribute.py
index a45c1f1..f6d17ec 100644
--- a/ethosu/vela/tosa/Pool2dAttribute.py
+++ b/ethosu/vela/tosa/PoolAttribute.py
@@ -4,21 +4,21 @@
import flatbuffers
-class Pool2dAttribute(object):
+class PoolAttribute(object):
__slots__ = ['_tab']
@classmethod
- def GetRootAsPool2dAttribute(cls, buf, offset):
+ def GetRootAsPoolAttribute(cls, buf, offset):
n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset)
- x = Pool2dAttribute()
+ x = PoolAttribute()
x.Init(buf, n + offset)
return x
- # Pool2dAttribute
+ # PoolAttribute
def Init(self, buf, pos):
self._tab = flatbuffers.table.Table(buf, pos)
- # Pool2dAttribute
+ # PoolAttribute
def Padding(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
@@ -26,21 +26,21 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # Pool2dAttribute
+ # PoolAttribute
def PaddingAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # Pool2dAttribute
+ # PoolAttribute
def PaddingLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.VectorLen(o)
return 0
- # Pool2dAttribute
+ # PoolAttribute
def Kernel(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
@@ -48,21 +48,21 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # Pool2dAttribute
+ # PoolAttribute
def KernelAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # Pool2dAttribute
+ # PoolAttribute
def KernelLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.VectorLen(o)
return 0
- # Pool2dAttribute
+ # PoolAttribute
def Stride(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
@@ -70,25 +70,25 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # Pool2dAttribute
+ # PoolAttribute
def StrideAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # Pool2dAttribute
+ # PoolAttribute
def StrideLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
return self._tab.VectorLen(o)
return 0
-def Pool2dAttributeStart(builder): builder.StartObject(3)
-def Pool2dAttributeAddPadding(builder, padding): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(padding), 0)
-def Pool2dAttributeStartPaddingVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def Pool2dAttributeAddKernel(builder, kernel): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(kernel), 0)
-def Pool2dAttributeStartKernelVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def Pool2dAttributeAddStride(builder, stride): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(stride), 0)
-def Pool2dAttributeStartStrideVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def Pool2dAttributeEnd(builder): return builder.EndObject()
+def PoolAttributeStart(builder): builder.StartObject(3)
+def PoolAttributeAddPadding(builder, padding): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(padding), 0)
+def PoolAttributeStartPaddingVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def PoolAttributeAddKernel(builder, kernel): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(kernel), 0)
+def PoolAttributeStartKernelVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def PoolAttributeAddStride(builder, stride): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(stride), 0)
+def PoolAttributeStartStrideVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def PoolAttributeEnd(builder): return builder.EndObject()
diff --git a/ethosu/vela/tosa/TransposeConv2dAttribute.py b/ethosu/vela/tosa/TransposeConvAttribute.py
similarity index 66%
rename from ethosu/vela/tosa/TransposeConv2dAttribute.py
rename to ethosu/vela/tosa/TransposeConvAttribute.py
index 80f544f..c7aeb41 100644
--- a/ethosu/vela/tosa/TransposeConv2dAttribute.py
+++ b/ethosu/vela/tosa/TransposeConvAttribute.py
@@ -4,21 +4,21 @@
import flatbuffers
-class TransposeConv2dAttribute(object):
+class TransposeConvAttribute(object):
__slots__ = ['_tab']
@classmethod
- def GetRootAsTransposeConv2dAttribute(cls, buf, offset):
+ def GetRootAsTransposeConvAttribute(cls, buf, offset):
n = flatbuffers.encode.Get(flatbuffers.packer.uoffset, buf, offset)
- x = TransposeConv2dAttribute()
+ x = TransposeConvAttribute()
x.Init(buf, n + offset)
return x
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def Init(self, buf, pos):
self._tab = flatbuffers.table.Table(buf, pos)
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def Outpad(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
@@ -26,21 +26,21 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def OutpadAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def OutpadLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(4))
if o != 0:
return self._tab.VectorLen(o)
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def Stride(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
@@ -48,21 +48,21 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def StrideAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def StrideLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(6))
if o != 0:
return self._tab.VectorLen(o)
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def Dilation(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
@@ -70,21 +70,21 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def DilationAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def DilationLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(8))
if o != 0:
return self._tab.VectorLen(o)
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def OutputShape(self, j):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
if o != 0:
@@ -92,27 +92,27 @@
return self._tab.Get(flatbuffers.number_types.Int32Flags, a + flatbuffers.number_types.UOffsetTFlags.py_type(j * 4))
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def OutputShapeAsNumpy(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
if o != 0:
return self._tab.GetVectorAsNumpy(flatbuffers.number_types.Int32Flags, o)
return 0
- # TransposeConv2dAttribute
+ # TransposeConvAttribute
def OutputShapeLength(self):
o = flatbuffers.number_types.UOffsetTFlags.py_type(self._tab.Offset(10))
if o != 0:
return self._tab.VectorLen(o)
return 0
-def TransposeConv2dAttributeStart(builder): builder.StartObject(4)
-def TransposeConv2dAttributeAddOutpad(builder, outpad): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(outpad), 0)
-def TransposeConv2dAttributeStartOutpadVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def TransposeConv2dAttributeAddStride(builder, stride): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(stride), 0)
-def TransposeConv2dAttributeStartStrideVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def TransposeConv2dAttributeAddDilation(builder, dilation): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(dilation), 0)
-def TransposeConv2dAttributeStartDilationVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def TransposeConv2dAttributeAddOutputShape(builder, outputShape): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(outputShape), 0)
-def TransposeConv2dAttributeStartOutputShapeVector(builder, numElems): return builder.StartVector(4, numElems, 4)
-def TransposeConv2dAttributeEnd(builder): return builder.EndObject()
+def TransposeConvAttributeStart(builder): builder.StartObject(4)
+def TransposeConvAttributeAddOutpad(builder, outpad): builder.PrependUOffsetTRelativeSlot(0, flatbuffers.number_types.UOffsetTFlags.py_type(outpad), 0)
+def TransposeConvAttributeStartOutpadVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def TransposeConvAttributeAddStride(builder, stride): builder.PrependUOffsetTRelativeSlot(1, flatbuffers.number_types.UOffsetTFlags.py_type(stride), 0)
+def TransposeConvAttributeStartStrideVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def TransposeConvAttributeAddDilation(builder, dilation): builder.PrependUOffsetTRelativeSlot(2, flatbuffers.number_types.UOffsetTFlags.py_type(dilation), 0)
+def TransposeConvAttributeStartDilationVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def TransposeConvAttributeAddOutputShape(builder, outputShape): builder.PrependUOffsetTRelativeSlot(3, flatbuffers.number_types.UOffsetTFlags.py_type(outputShape), 0)
+def TransposeConvAttributeStartOutputShapeVector(builder, numElems): return builder.StartVector(4, numElems, 4)
+def TransposeConvAttributeEnd(builder): return builder.EndObject()
diff --git a/ethosu/vela/tosa_mapping.py b/ethosu/vela/tosa_mapping.py
index 75f1c9c..6710787 100644
--- a/ethosu/vela/tosa_mapping.py
+++ b/ethosu/vela/tosa_mapping.py
@@ -26,19 +26,19 @@
from .tosa import AxisAttribute # noqa: F401
from .tosa import ClampAttribute # noqa: F401
from .tosa import CondIfAttribute # noqa: F401
-from .tosa import Conv2dAttribute # noqa: F401
+from .tosa import ConvAttribute # noqa: F401
from .tosa import ConvQuantInfo # noqa: F401
from .tosa import MatMulQuantInfo # noqa: F401
from .tosa import MulAttribute # noqa: F401
from .tosa import PadQuantInfo # noqa: F401
-from .tosa import Pool2dAttribute # noqa: F401
+from .tosa import PoolAttribute # noqa: F401
from .tosa import ReluNAttribute # noqa: F401
from .tosa import RescaleAttribute # noqa: F401
from .tosa import ReshapeAttribute # noqa: F401
from .tosa import ResizeAttribute # noqa: F401
from .tosa import SliceAttribute # noqa: F401
from .tosa import TileAttribute # noqa: F401
-from .tosa import TransposeConv2dAttribute # noqa: F401
+from .tosa import TransposeConvAttribute # noqa: F401
from .tosa import UnaryQuantInfo # noqa: F401
from .tosa import WhileLoopAttribute # noqa: F401
from .tosa.DType import DType
@@ -148,10 +148,10 @@
is_vec = True
-pool2d_attrs = AttrSerializer("Pool2dAttribute", (("padding", is_vec), ("kernel", is_vec), ("stride", is_vec)))
-conv2d_attrs = AttrSerializer("Conv2dAttribute", (("padding", is_vec), ("stride", is_vec), ("dilation", is_vec)))
-transpose_conv2d_attrs = AttrSerializer(
- "TransposeConv2dAttribute", (("outpad", is_vec), ("stride", is_vec), ("dilation", is_vec), ("out_shape", is_vec))
+pool_attrs = AttrSerializer("PoolAttribute", (("padding", is_vec), ("kernel", is_vec), ("stride", is_vec)))
+conv_attrs = AttrSerializer("ConvAttribute", (("padding", is_vec), ("stride", is_vec), ("dilation", is_vec)))
+transpose_conv_attrs = AttrSerializer(
+ "TransposeConvAttribute", (("outpad", is_vec), ("stride", is_vec), ("dilation", is_vec), ("out_shape", is_vec))
)
relun_attrs = AttrSerializer("ReluNAttribute", ("max_int"))
axis_attrs = AttrSerializer("AxisAttribute", ("axis",))
@@ -187,7 +187,7 @@
TosaOp.BITWISE_AND,
TosaOp.BITWISE_OR,
TosaOp.BITWISE_XOR,
- TosaOp.DIV,
+ TosaOp.INTDIV,
TosaOp.LOGICAL_AND,
TosaOp.LOGICAL_LEFT_SHIFT,
TosaOp.LOGICAL_RIGHT_SHIFT,
@@ -244,14 +244,14 @@
tosa_operator_map = {
# TosaOp.UNKNOWN: (),
# TODO TosaOp.ARGMAX: (Op.ArgMax, axis_attrs, None),
- TosaOp.AVG_POOL2D: (Op.AvgPool, pool2d_attrs, unary_quant_info, TOSA_IFM_INDICES),
- TosaOp.CONV2D: (Op.Conv2DBias, conv2d_attrs, conv_quant_info, TOSA_IFM_WEIGHTS_BIAS_INDICES),
+ TosaOp.AVG_POOL2D: (Op.AvgPool, pool_attrs, unary_quant_info, TOSA_IFM_INDICES),
+ TosaOp.CONV2D: (Op.Conv2DBias, conv_attrs, conv_quant_info, TOSA_IFM_WEIGHTS_BIAS_INDICES),
# TODO TosaOp.CONV3D:
- TosaOp.DEPTHWISE_CONV2D: (Op.DepthwiseConv2DBias, conv2d_attrs, conv_quant_info, TOSA_IFM_WEIGHTS_BIAS_INDICES),
+ TosaOp.DEPTHWISE_CONV2D: (Op.DepthwiseConv2DBias, conv_attrs, conv_quant_info, TOSA_IFM_WEIGHTS_BIAS_INDICES),
TosaOp.FULLY_CONNECTED: (Op.FullyConnected, None, conv_quant_info, TOSA_IFM_WEIGHTS_BIAS_INDICES),
# TODO TosaOp.MATMUL:
- TosaOp.MAX_POOL2D: (Op.MaxPool, pool2d_attrs, None, TOSA_IFM_INDICES),
- # TODO TosaOp.TRANSPOSE_CONV2D: (Op.Conv2DBackpropInput, transpose_conv2d_attrs, conv_quant_info)
+ TosaOp.MAX_POOL2D: (Op.MaxPool, pool_attrs, None, TOSA_IFM_INDICES),
+ # TODO TosaOp.TRANSPOSE_CONV2D: (Op.Conv2DBackpropInput, transpose_conv_attrs, conv_quant_info)
TosaOp.CLAMP: (Op.Clamp, clamp_attrs, None, TOSA_IFM_INDICES),
TosaOp.RELUN: (Op.ReluN, relun_attrs, None, TOSA_IFM_INDICES),
# TODO TosaOp.SIGMOID
@@ -261,7 +261,7 @@
# TODO TosaOp.BITWISE_AND
# TODO TosaOp.BITWISE_OR
# TODO TosaOp.BITWISE_XOR
- # TODO TosaOp.DIV
+ # TODO TosaOp.INTDIV
# TODO TosaOp.LOGICAL_AND
# TODO TosaOp.LOGICAL_LEFT_SHIFT
# TODO TosaOp.LOGICAL_RIGHT_SHIFT