Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions lib/Dialect/Torch/Transforms/DecomposeComplexOps.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1894,6 +1894,59 @@ class DecomposeAtenAtleast1dOp : public OpRewritePattern<AtenAtleast1dOp> {
};
} // namespace

// Decompose 'aten.outer' into 'aten.unsqueeze', 'aten.matmul'

namespace {
class DecomposeAtenOuterOp : public OpRewritePattern<AtenOuterOp> {
public:
using OpRewritePattern::OpRewritePattern;
LogicalResult matchAndRewrite(AtenOuterOp op,
PatternRewriter &rewriter) const override {

Location loc = op.getLoc();
Value input = op.getSelf();
Value vec2 = op.getVec2();
Type opType = op.getType();

auto inputType = cast<BaseTensorType>(input.getType());
auto vec2Type = cast<BaseTensorType>(vec2.getType());

// Check if both tensors are 1-dimensional
SmallVector<int64_t> inputShape(inputType.getSizes());
SmallVector<int64_t> vec2Shape(vec2Type.getSizes());

if (inputShape.size() == 1 && vec2Shape.size() == 1) {

Value one = rewriter.create<Torch::ConstantIntOp>(
loc, rewriter.getI64IntegerAttr(1)); // Dimension index
SmallVector<int64_t, 2> inputMatrixShape = {inputShape[0], 1};
Type inputMatrixType = inputType.getWithSizesAndDtype(
inputMatrixShape, inputType.getOptionalDtype());

Value inputMatrix =
rewriter.create<AtenUnsqueezeOp>(loc, inputMatrixType, input, one);

Value zero = rewriter.create<Torch::ConstantIntOp>(
loc, rewriter.getI64IntegerAttr(0));
SmallVector<int64_t, 2> vec2MatrixShape = {1, vec2Shape[0]};
Type vec2MatrixType = vec2Type.getWithSizesAndDtype(
vec2MatrixShape, vec2Type.getOptionalDtype());

Value vec2Matrix =
rewriter.create<AtenUnsqueezeOp>(loc, vec2MatrixType, vec2, zero);

rewriter.replaceOpWithNewOp<AtenMatmulOp>(op, opType, inputMatrix,
vec2Matrix);
return success();
} else {
return failure();
}

return success();
}
};
} // namespace

namespace {
// Decompose aten.atleast_2d into: aten.reshape. See
// https://github.com/pytorch/pytorch/blob/9a8ab778d34bd24c5caceb340837483decc4c311/torch/_refs/__init__.py#L2604
Expand Down Expand Up @@ -11955,6 +12008,7 @@ class DecomposeComplexOpsPass
patterns);
addPatternIfTargetOpIsIllegal<DecomposeAtenCeluOp>(patterns);
addPatternIfTargetOpIsIllegal<DecomposeAtenAtleast1dOp>(patterns);
addPatternIfTargetOpIsIllegal<DecomposeAtenOuterOp>(patterns);
addPatternIfTargetOpIsIllegal<DecomposeAtenAtleast2dOp>(patterns);
addPatternIfTargetOpIsIllegal<DecomposeAtenEinsumOp>(patterns);
addPatternIfTargetOpIsIllegal<DecomposeAten_TrilinearOp>(patterns);
Expand Down
1 change: 1 addition & 0 deletions lib/Dialect/Torch/Transforms/LowerToBackendContract.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,7 @@ static void markDecomposedOpsAsIllegal(MLIRContext *context,
target.addIllegalOp<Aten_SoftmaxBackwardDataOp>();
target.addIllegalOp<AtenTanhBackwardOp>();
target.addIllegalOp<AtenAtleast1dOp>();
target.addIllegalOp<AtenOuterOp>();
target.addIllegalOp<AtenAtleast2dOp>();
target.addIllegalOp<AtenEinsumOp>();
target.addIllegalOp<Aten_TrilinearOp>();
Expand Down
1 change: 1 addition & 0 deletions projects/pt1/e2e_testing/xfail_sets.py
Original file line number Diff line number Diff line change
Expand Up @@ -3855,6 +3855,7 @@

ONNX_TOSA_XFAIL_SET = {
"AtenFftRfft2DLastDim_basic",
"AtenOuter_basic",
"AtenFftRfft2DMiddleDim_basic",
"AtenStftCenter1D_basic",
"AtenStftCenter1DUnkSigLen_basic",
Expand Down
24 changes: 24 additions & 0 deletions projects/pt1/python/torch_mlir_e2e_test/test_suite/matmul.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,30 @@ def AtenDotModule_basic(module, tu: TestUtils):
# ==============================================================================


class AtenOuter(torch.nn.Module):
def __init__(self):
super().__init__()

@export
@annotate_args(
[
None,
([-1], torch.float32, True),
([-1], torch.float32, True),
]
)
def forward(self, x, y):
return torch.outer(x, y)


@register_test_case(module_factory=lambda: AtenOuter())
def AtenOuter_basic(module, tu: TestUtils):
module.forward(tu.rand(4), tu.rand(3))


# ==============================================================================


class MatmulDot(torch.nn.Module):
def __init__(self):
super().__init__()
Expand Down
Loading