Skip to content

[DimExpr] Implement DimExprBuilder interface #61498

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
jiahy0825 merged 4 commits into from
Feb 7, 2024
Merged

[DimExpr] Implement DimExprBuilder interface #61498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c469838
[DimExpr] Implement DimExprBuilder interface
jiahy0825 Feb 2, 2024
110f9c0
Merge branch 'develop' of github.com:PaddlePaddle/Paddle into Impleme…
jiahy0825 Feb 4, 2024
e0c1c3c
PADDLE_ENFORCE->IR_ENFORCE
jiahy0825 Feb 4, 2024
40e9579
Check index parameter
jiahy0825 Feb 5, 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
44 changes: 36 additions & 8 deletions paddle/pir/dialect/shape/utils/dim_expr_builder.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,18 @@
// limitations under the License.

#include "paddle/pir/dialect/shape/utils/dim_expr_builder.h"
#include "paddle/common/enforce.h"

namespace symbol {

using BroadcastDimExpr = Broadcast<DimExpr>;
using MinDimExpr = Min<DimExpr>;
using MaxDimExpr = Max<DimExpr>;

DimExpr DimExprBuilder::ConstSize(std::int64_t dim) { SYMBOL_NOT_IMPLEMENTED; }
DimExpr DimExprBuilder::ConstSize(std::int64_t dim) { return DimExpr(dim); }

DimExpr DimExprBuilder::Symbol(const std::string& symbol_name) {
SYMBOL_NOT_IMPLEMENTED;
return DimExpr(symbol_name);
}

DimExpr DimExprBuilder::Add(const DimExpr& lhs, const DimExpr& rhs) {
Expand Down Expand Up @@ -56,7 +57,12 @@ DimExpr DimExprBuilder::Broadcast(const DimExpr& lhs, const DimExpr& rhs) {

std::vector<DimExpr> DimExprBuilder::ConstShape(
const std::vector<std::int64_t>& dims) {
SYMBOL_NOT_IMPLEMENTED;
std::vector<DimExpr> ret{};
ret.reserve(dims.size());
for (std::int64_t dim : dims) {
ret.emplace_back(dim);
}
return ret;
}

void DimExprBuilder::CstrBroadcastable(const DimExpr& lhs, const DimExpr& rhs) {
Expand All @@ -74,21 +80,43 @@ void DimExprBuilder::CstrEq(const DimExpr& lhs, const DimExpr& rhs) {

void DimExprBuilder::CstrEq(const std::vector<DimExpr>& lhs,
const std::vector<DimExpr>& rhs) {
SYMBOL_NOT_IMPLEMENTED;
IR_ENFORCE(lhs.size() == rhs.size(),
"Please make sure input sizes are equal, "
"lhs.size() = %d, rhs.size() = %d.",
lhs.size(),
rhs.size());
for (std::size_t i = 0; i < lhs.size(); ++i) {
CstrEq(lhs.at(i), rhs.at(i));
}
}

std::vector<DimExpr> DimExprBuilder::Concat(const std::vector<DimExpr>& lhs,
const std::vector<DimExpr>& rhs) {
SYMBOL_NOT_IMPLEMENTED;
std::vector<DimExpr> ret{};
const auto& EmplaceDimExpr = [&](const std::vector<DimExpr>& exprs) {
for (const auto& expr : exprs) {
ret.emplace_back(expr);
}
};
EmplaceDimExpr(lhs);
EmplaceDimExpr(rhs);
return ret;
}

std::pair<std::vector<DimExpr>, std::vector<DimExpr>> DimExprBuilder::SplitAt(
const std::vector<DimExpr>, int index) {
SYMBOL_NOT_IMPLEMENTED;
const std::vector<DimExpr> dim_exprs, int index) {
IR_ENFORCE(index > 0 && index < static_cast<int>(dim_exprs.size()),
"Index invalid, index = %d, dim_exprs.size() = %d. Please check "
"your inputs.",
index,
dim_exprs.size());
std::vector<DimExpr> lhs(dim_exprs.begin(), dim_exprs.begin() + index);
Copy link
Contributor

@tc20042008 tc20042008 Feb 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

检查index合法性

Copy link
Contributor Author

@jiahy0825 jiahy0825 Feb 5, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done, thanks

std::vector<DimExpr> rhs(dim_exprs.begin() + index, dim_exprs.end());
return std::make_pair(lhs, rhs);
}

const std::vector<DimExprConstraint>& DimExprBuilder::constraints() const {
SYMBOL_NOT_IMPLEMENTED;
return *constraints_;
}

} // namespace symbol
10 changes: 10 additions & 0 deletions test/cpp/pir/shape_dialect/symbol_dim_expr_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,16 @@ TEST(DimExpr, Constraint) {
DimExpr sym1 = DimExpr("S1");
builder.CstrEq(sym0, sym1);
ASSERT_EQ(static_cast<int>(constraints.size()), 1);
std::vector<DimExpr> lhs = builder.ConstShape({1, 2, 3});
std::vector<DimExpr> rhs = builder.ConstShape({1, 2, 3});
std::pair<std::vector<DimExpr>, std::vector<DimExpr>> expr_pair =
builder.SplitAt(rhs, 1);
ASSERT_EQ(static_cast<int>(expr_pair.first.size()), 1);
ASSERT_EQ(static_cast<int>(expr_pair.second.size()), 2);
std::vector<DimExpr> merged =
builder.Concat(expr_pair.first, expr_pair.second);
builder.CstrEq(lhs, merged);
ASSERT_EQ(static_cast<int>(constraints.size()), 4);
}

/*
Expand Down