Skip to content

Commit efab9b8

Browse files
committed
just move without deprecation
1 parent 563d8da commit efab9b8

File tree

4 files changed

+1
-35
lines changed

4 files changed

+1
-35
lines changed

mlir/include/mlir/Dialect/Linalg/Passes.td

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ def LinalgSpecializeGenericOpsPass : Pass<"linalg-specialize-generic-ops">,
8686
let dependentDialects = ["linalg::LinalgDialect"];
8787
}
8888

89-
def LinalgNamedOpConversionPass: Pass<"linalg-named-op-conversion">,
90-
Deprecated<"Use 'simplify-depthwise-conv' instead."> {
91-
let summary = "Convert from one named linalg op to another.";
92-
let dependentDialects = ["linalg::LinalgDialect", "tensor::TensorDialect"];
93-
}
94-
9589
// ------------------ End of "form" conversions
9690

9791
def SimplifyDepthwiseConvPass: Pass<"simplify-depthwise-conv"> {

mlir/include/mlir/Dialect/Linalg/Transforms/Transforms.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1966,10 +1966,6 @@ void populateFuseTensorPadWithProducerLinalgOpPatterns(
19661966
/// Patterns to simplify depthwise convolutions.
19671967
void populateSimplifyDepthwiseConvPatterns(RewritePatternSet &patterns);
19681968

1969-
/// Patterns to convert from one named op to another. So far only used on
1970-
/// depthwise convolutions, so deprecated. Use the pattern avove.
1971-
void populateLinalgNamedOpConversionPatterns(RewritePatternSet &patterns);
1972-
19731969
/// Patterns to fold unit-extent dimensions in operands/results of linalg ops on
19741970
/// tensors via reassociative reshape ops.
19751971
void populateFoldUnitExtentDimsPatterns(RewritePatternSet &patterns,

mlir/lib/Dialect/Linalg/Transforms/SimplifyDepthwiseConv.cpp

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include "llvm/ADT/TypeSwitch.h"
2222

2323
namespace mlir {
24-
#define GEN_PASS_DEF_LINALGNAMEDOPCONVERSIONPASS
2524
#define GEN_PASS_DEF_SIMPLIFYDEPTHWISECONVPASS
2625
#include "mlir/Dialect/Linalg/Passes.h.inc"
2726
} // namespace mlir
@@ -157,33 +156,10 @@ struct SimplifyDepthwiseConvPass
157156
return signalPassFailure();
158157
}
159158
};
160-
161-
// Deprecated, use the one above
162-
struct LinalgNamedOpConversionPass
163-
: public impl::LinalgNamedOpConversionPassBase<
164-
LinalgNamedOpConversionPass> {
165-
using impl::LinalgNamedOpConversionPassBase<
166-
LinalgNamedOpConversionPass>::LinalgNamedOpConversionPassBase;
167-
168-
void runOnOperation() override {
169-
Operation *op = getOperation();
170-
RewritePatternSet patterns(op->getContext());
171-
populateLinalgNamedOpConversionPatterns(patterns);
172-
if (failed(applyPatternsGreedily(op, std::move(patterns))))
173-
return signalPassFailure();
174-
}
175-
};
176159
} // namespace
177160

178161
void mlir::linalg::populateSimplifyDepthwiseConvPatterns(
179162
RewritePatternSet &patterns) {
180163
patterns.add<SimplifyDepthwiseConvOp, SimplifyDepthwiseConvQOp>(
181164
patterns.getContext());
182165
}
183-
184-
// Deprecated, use the one above
185-
void mlir::linalg::populateLinalgNamedOpConversionPatterns(
186-
RewritePatternSet &patterns) {
187-
patterns.add<SimplifyDepthwiseConvOp, SimplifyDepthwiseConvQOp>(
188-
patterns.getContext());
189-
}

mlir/test/Dialect/Linalg/namedop_conversion.mlir renamed to mlir/test/Dialect/Linalg/simplify-depthwise-conv.mlir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: mlir-opt %s -linalg-named-op-conversion -split-input-file | FileCheck %s
1+
// RUN: mlir-opt %s --simplify-depthwise-conv -split-input-file | FileCheck %s
22

33
// CHECK-LABEL: @depthwise_conv
44
func.func @depthwise_conv(%arg0: tensor<?x?x?x?xf32>, %arg1: tensor<?x?x?x1xf32>, %arg2: tensor<?x?x?x?x1xf32>) -> tensor<?x?x?x?x1xf32> {

0 commit comments

Comments
 (0)