summaryrefslogtreecommitdiff
path: root/mlir/python
diff options
context:
space:
mode:
authorNicolas Vasilache <nicolas.vasilache@gmail.com>2021-11-15 07:54:07 +0000
committerNicolas Vasilache <nicolas.vasilache@gmail.com>2021-11-15 07:54:29 +0000
commitf67171ac5896d232b4b9826937ce97064909770b (patch)
tree98e429168308f17afccbd71cca12b248aa032ac3 /mlir/python
parentc3e3c762098e8d425731bb40f3b8b04dac1013f3 (diff)
[mlir][Linalg] Make depthwise convolution naming scheme consistent.
Names should be consistent across all operations otherwise painful bugs will surface. Reviewed By: rsuderman Differential Revision: https://reviews.llvm.org/D113762
Diffstat (limited to 'mlir/python')
-rw-r--r--mlir/python/mlir/dialects/linalg/opdsl/ops/core_named_ops.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/mlir/python/mlir/dialects/linalg/opdsl/ops/core_named_ops.py b/mlir/python/mlir/dialects/linalg/opdsl/ops/core_named_ops.py
index 2e6b04118ef1..85bed25febdd 100644
--- a/mlir/python/mlir/dialects/linalg/opdsl/ops/core_named_ops.py
+++ b/mlir/python/mlir/dialects/linalg/opdsl/ops/core_named_ops.py
@@ -310,7 +310,7 @@ def conv_3d_ndhwc_dhwcf(
]) * cast(U, K[D.kd, D.kh, D.kw, D.c, D.f])
@linalg_structured_op
-def depthwise_conv1D_nw(
+def depthwise_conv_1d_nwc_wc(
I=TensorDef(T1, S.N, S.OW * S.SW + S.KW * S.DW, S.IC),
K=TensorDef(T2, S.KW, S.IC),
O=TensorDef(U, S.N, S.OW, S.IC, output=True),
@@ -320,7 +320,7 @@ def depthwise_conv1D_nw(
Numeric casting is performed on the operands to the inner multiply, promoting
them to the same data type as the accumulator/output. Multiplier is set to 1
- which is a special case for most dpethwise convolutions.
+ which is a special case for most depthwise convolutions.
"""
implements(ConvolutionOpInterface)
domain(D.n, D.ow, D.ic, D.kw)
@@ -329,7 +329,7 @@ def depthwise_conv1D_nw(
cast(U, K[D.kw, D.ic])
@linalg_structured_op
-def depthwise_conv2D_nhw(
+def depthwise_conv_2d_nhwc_hwc(
I=TensorDef(T1, S.N, S.OH * S.SH + S.KH * S.DH, S.OW * S.SW + S.KW * S.DW, S.IC),
K=TensorDef(T2, S.KH, S.KW, S.IC),
O=TensorDef(U, S.N, S.OH, S.OW, S.IC, output=True),
@@ -339,7 +339,7 @@ def depthwise_conv2D_nhw(
Numeric casting is performed on the operands to the inner multiply, promoting
them to the same data type as the accumulator/output. Multiplier is set to 1
- which is a special case for most dpethwise convolutions.
+ which is a special case for most depthwise convolutions.
"""
implements(ConvolutionOpInterface)
domain(D.n, D.oh, D.ow, D.ic, D.kh, D.kw)
@@ -348,7 +348,7 @@ def depthwise_conv2D_nhw(
D.ic]) * cast(U, K[D.kh, D.kw, D.ic])
@linalg_structured_op
-def depthwise_conv2D_nhw_q(
+def depthwise_conv_2d_nhwc_hwc_q(
I=TensorDef(T1, S.N, S.OH * S.SH + S.KH * S.DH, S.OW * S.SW + S.KW * S.DW, S.IC),
K=TensorDef(T2, S.KH, S.KW, S.IC),
IZp=ScalarDef(I32),
@@ -369,7 +369,7 @@ def depthwise_conv2D_nhw_q(
(cast(U, K[D.kh, D.kw, D.ic]) - cast(U, KZp)))
@linalg_structured_op
-def depthwise_conv2D_nhwc(
+def depthwise_conv_2d_nhwc_hwcm(
I=TensorDef(T1, S.N, S.OH * S.SH + S.KH * S.DH, S.OW * S.SW + S.KW * S.DW, S.IC),
K=TensorDef(T2, S.KH, S.KW, S.IC, S.CM),
O=TensorDef(U, S.N, S.OH, S.OW, S.IC, S.CM, output=True),
@@ -387,7 +387,7 @@ def depthwise_conv2D_nhwc(
D.ic]) * cast(U, K[D.kh, D.kw, D.ic, D.cm])
@linalg_structured_op
-def depthwise_conv2D_nhwc_q(
+def depthwise_conv_2d_nhwc_hwcm_q(
I=TensorDef(T1, S.N, S.OH * S.SH + S.KH * S.DH, S.OW * S.SW + S.KW * S.DW, S.IC),
K=TensorDef(T2, S.KH, S.KW, S.IC, S.CM),
IZp=ScalarDef(I32),