Skip to content

[Dynamic shape] Delete SymbolicDimMgr symbolTable and SymbolicDimOp #60933

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zhangboSJTU merged 18 commits into from
Jan 19, 2024
Merged

[Dynamic shape] Delete SymbolicDimMgr symbolTable and SymbolicDimOp #60933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
0a13f18
test=document_fix
zhangboSJTU Jan 17, 2024
0a60bf9
redefine SymbolicDim
jiahy0825 Jan 17, 2024
ac05b74
remove graph_symbolic_dim_infer_ctx.*
jiahy0825 Jan 17, 2024
a44c85b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
zhangboSJTU Jan 17, 2024
c5e46ff
replace adt::DimExpr with symbol::DimExpr
jiahy0825 Jan 17, 2024
ddc2c65
merge develop
jiahy0825 Jan 17, 2024
40c1dad
remove dead code
jiahy0825 Jan 17, 2024
292fe0f
Code format
jiahy0825 Jan 17, 2024
61404fc
fix shapeAnlysis
zhangboSJTU Jan 18, 2024
c387158
delete symbol table
zhangboSJTU Jan 18, 2024
d3b2607
delete SymbolicDimMgr
zhangboSJTU Jan 18, 2024
3a6e9ff
temp
zhangboSJTU Jan 18, 2024
79cc322
delete
zhangboSJTU Jan 18, 2024
cc2a770
Merge commit 'refs/pull/60901/head' of https://github.com/PaddlePaddl…
zhangboSJTU Jan 18, 2024
c98dacd
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
zhangboSJTU Jan 18, 2024
1a1613c
delete symbolicDimOp
zhangboSJTU Jan 18, 2024
8d8f4a1
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
zhangboSJTU Jan 19, 2024
41eded8
delete unused of in shape dialect
zhangboSJTU Jan 19, 2024
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
1 change: 0 additions & 1 deletion paddle/cinn/adt/generate_map_expr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
#include "paddle/cinn/runtime/flags.h"
#include "paddle/pir/core/operation.h"
#include "paddle/pir/core/value.h"
#include "paddle/pir/dialect/shape/utils/shape_optimization_utils.h"

#include "glog/logging.h"

Expand Down
2 changes: 1 addition & 1 deletion paddle/cinn/hlir/dialect/operator/ir/manual_op.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "paddle/pir/core/op_base.h"
#include "paddle/pir/core/operation.h"
#include "paddle/pir/core/operation_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_analysis.h"

namespace cinn {
namespace dialect {
Expand Down
2 changes: 1 addition & 1 deletion paddle/cinn/hlir/dialect/operator/transforms/fuse_shape_ops_into_generate_shape_op_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#include "paddle/fluid/pir/dialect/operator/ir/op_type.h"
#include "paddle/fluid/pir/dialect/operator/ir/pd_op.h"
#include "paddle/pir/core/builtin_dialect.h"
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_analysis.h"
#include "paddle/pir/pass/pass.h"
#include "paddle/pir/pattern_rewrite/pattern_applicator.h"
#include "paddle/pir/pattern_rewrite/pattern_match.h"
Expand Down
2 changes: 1 addition & 1 deletion paddle/cinn/hlir/dialect/operator/transforms/group_merge/divide_group_op_to_fusion_op_pass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#pragma once

#include <memory>
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_analysis.h"
#include "paddle/pir/pass/pass.h"

namespace cinn {
Expand Down
1 change: 1 addition & 0 deletions paddle/cinn/hlir/dialect/operator/transforms/group_merge/generate_shape_util.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
// limitations under the License.

#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/generate_shape_util.h"
#include <unordered_set>
#include "paddle/cinn/hlir/dialect/operator/ir/generate_shape_util.h"
#include "paddle/cinn/hlir/dialect/operator/ir/manual_op.h"
#include "paddle/pir/core/block.h"
Expand Down
1 change: 0 additions & 1 deletion paddle/cinn/hlir/dialect/operator/transforms/group_merge/lower_cinn_fusion_op_pass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#pragma once

#include <memory>
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/pass/pass.h"

namespace cinn {
Expand Down
2 changes: 1 addition & 1 deletion .../hlir/dialect/operator/transforms/group_merge/move_generate_shape_ops_to_prologue_pass.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
#include "paddle/fluid/pir/dialect/operator/ir/pd_op.h"
#include "paddle/pir/core/program.h"
#include "paddle/pir/dialect/control_flow/ir/cf_op.h"
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_analysis.h"
#include "paddle/pir/pass/pass_registry.h"
#include "paddle/pir/pattern_rewrite/frozen_rewrite_pattern_set.h"

Expand Down
2 changes: 1 addition & 1 deletion paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_pass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include "paddle/cinn/hlir/dialect/operator/transforms/group_merge/op_with_group_merge_util.h"
#include "paddle/pir/core/program.h"
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_analysis.h"

namespace cinn {
namespace dialect {
Expand Down
2 changes: 1 addition & 1 deletion paddle/cinn/hlir/framework/pir/group.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include "paddle/cinn/hlir/framework/pir/utils.h"
#include "paddle/pir/core/operation.h"
#include "paddle/pir/core/value.h"
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_analysis.h"

namespace cinn {

Expand Down
1 change: 0 additions & 1 deletion paddle/cinn/ir/dim.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ namespace cinn {
namespace ir {

struct _Dim_;
using pir::shape::SymbolicDimOp;

//! Wrapper for _Dim_
class Dim : public IrNodeRef {
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/pir/dialect/operator/interface/infer_symbolic_shape.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#pragma once

#include "paddle/pir/core/op_base.h"
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_analysis.h"

// Type inference is currently modelled executionally for operation creation
// using the `InferMetaInterface`. While `InferSymbolicShapeInterface` is used
Expand Down
2 changes: 1 addition & 1 deletion paddle/fluid/pir/transforms/shape_optimization_pass.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#include <memory>
#include "paddle/pir/core/dll_decl.h"
#include "paddle/pir/dialect/shape/utils/shape_utils.h"
#include "paddle/pir/dialect/shape/utils/shape_analysis.h"

namespace pir {

Expand Down
18 changes: 2 additions & 16 deletions paddle/pir/dialect/shape/ir/shape_dialect.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,17 +23,7 @@ ShapeDialect::ShapeDialect(IrContext *context)
}

void ShapeDialect::initialize() {
RegisterOps<SymbolicDimOp,
DimOp,
TieProductEqualOp,
TieShapeOp,
FuncOp,
TensorDimOp,
ShapeOfOp,
FromElementsOp,
ExtractOp,
ConstantOp,
IndexCastOp>();
RegisterOps<DimOp>();

RegisterAttributes<SymbolAttribute>();
}
Expand Down Expand Up @@ -68,11 +58,7 @@ void ShapeDialect::PrintAttribute(pir::Attribute attr, std::ostream &os) const {
}

void ShapeDialect::PrintOperation(Operation *op, IrPrinter &printer) const {
if (auto func_op = op->dyn_cast<FuncOp>()) {
func_op.Print(printer);
} else {
printer.PrintGeneralOperation(op);
}
printer.PrintGeneralOperation(op);
}

} // namespace pir::shape
Expand Down
Loading