-
Notifications
You must be signed in to change notification settings - Fork 5.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' of github.com:gouzil/Paddle into noqa_clean_17
# Conflicts: # python/paddle/distributed/__init__.py # python/paddle/distributed/auto_parallel/api.py
- Loading branch information
Showing
326 changed files
with
9,486 additions
and
3,817 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| // Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #include "paddle/cinn/common/dim_expr_converter.h" | ||
| #include "paddle/cinn/common/ir_util.h" | ||
|
|
||
| namespace cinn::common { | ||
| using namespace symbol; // NOLINT | ||
|
|
||
| namespace { | ||
|
|
||
| struct DimExprToIrExprVisitor { | ||
| ir::Expr ConvertToIrExpr(const DimExpr& dim_expr) { | ||
| return std::visit(*this, dim_expr.variant()); | ||
| } | ||
|
|
||
| ir::Expr operator()(const int64_t& dim) { return ir::Expr(dim); } | ||
|
|
||
| ir::Expr operator()(const std::string& dim_expr) { | ||
| Var x = ir::_Var_::Make(dim_expr, Int(64)); | ||
| return x; | ||
| } | ||
|
|
||
| ir::Expr operator()(const Negative<DimExpr>& dim_expr) { | ||
| const auto& [operand] = *dim_expr; | ||
| return ir::Sub::Make(ir::Expr(std::int64_t(0)), ConvertToIrExpr(operand)); | ||
| } | ||
|
|
||
| ir::Expr operator()(const Reciprocal<DimExpr>& dim_expr) { | ||
| const auto& [operand] = *dim_expr; | ||
| return ir::Div::Make(ir::Expr(std::int64_t(1)), ConvertToIrExpr(operand)); | ||
| } | ||
|
|
||
| ir::Expr operator()(const Add<DimExpr>& dim_expr) { | ||
| const auto& [operands] = dim_expr; | ||
| if (operands->empty()) { | ||
| return ir::Expr(std::int64_t(0)); | ||
| } | ||
| ir::Expr sum = ConvertToIrExpr(operands->at(0)); | ||
| for (std::size_t i = 1; i < operands->size(); ++i) { | ||
| sum = ir::Add::Make(sum, ConvertToIrExpr(operands->at(i))); | ||
| } | ||
| return sum; | ||
| } | ||
|
|
||
| ir::Expr operator()(const Mul<DimExpr>& dim_expr) { | ||
| const auto& [operands] = dim_expr; | ||
| if (operands->empty()) { | ||
| return ir::Expr(std::int64_t(1)); | ||
| } | ||
| ir::Expr product = ConvertToIrExpr(operands->at(0)); | ||
| for (std::size_t i = 1; i < operands->size(); ++i) { | ||
| product = ir::Mul::Make(product, ConvertToIrExpr(operands->at(i))); | ||
| } | ||
| return product; | ||
| } | ||
|
|
||
| ir::Expr operator()(const Max<DimExpr>& dim_expr) { | ||
| const auto& [operands] = dim_expr; | ||
| CHECK(!operands->empty()); | ||
| ir::Expr max = ConvertToIrExpr(operands->at(0)); | ||
| for (std::size_t i = 1; i < operands->size(); ++i) { | ||
| max = ir::Max::Make(max, ConvertToIrExpr(operands->at(i))); | ||
| } | ||
| return max; | ||
| } | ||
|
|
||
| ir::Expr operator()(const Min<DimExpr>& dim_expr) { | ||
| const auto& [operands] = dim_expr; | ||
| CHECK(!operands->empty()); | ||
| ir::Expr min = ConvertToIrExpr(operands->at(0)); | ||
| for (std::size_t i = 1; i < operands->size(); ++i) { | ||
| min = ir::Min::Make(min, ConvertToIrExpr(operands->at(i))); | ||
| } | ||
| return min; | ||
| } | ||
|
|
||
| ir::Expr operator()(const Broadcast<DimExpr>& dim_expr) { | ||
| LOG(FATAL) | ||
| << "no support for converting from Broadcast<DimExpr> to ir::Expr"; | ||
| } | ||
| }; | ||
|
|
||
| } // namespace | ||
|
|
||
| ir::Expr DimExprConverter::ConvertToIrExpr(const DimExpr& dim_expr) const { | ||
| return DimExprToIrExprVisitor().ConvertToIrExpr(dim_expr); | ||
| } | ||
|
|
||
| } // namespace cinn::common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #pragma once | ||
|
|
||
| #include "paddle/cinn/ir/ir.h" | ||
| #include "paddle/pir/dialect/shape/utils/dim_expr.h" | ||
|
|
||
| namespace cinn::common { | ||
|
|
||
| struct DimExprConverter final { | ||
| ir::Expr ConvertToIrExpr(const symbol::DimExpr&) const; | ||
| }; | ||
|
|
||
| } // namespace cinn::common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // Copyright (c) 2023 PaddlePaddle Authors. All Rights Reserved. | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| #include <sstream> | ||
|
|
||
| #include "gtest/gtest.h" | ||
|
|
||
| #include "paddle/cinn/common/dim_expr_converter.h" | ||
| #include "paddle/cinn/common/ir_util.h" | ||
| #include "paddle/cinn/ir/ir_printer.h" | ||
|
|
||
| namespace cinn::common::test { | ||
|
|
||
| using namespace symbol; // NOLINT | ||
|
|
||
| TEST(Convert, AddExpr) { | ||
| List<DimExpr> num_lists{DimExpr(4), DimExpr(5), DimExpr("sym_0")}; | ||
| DimExpr dim_expr{Add<DimExpr>{num_lists}}; | ||
| ir::Expr src_expr = DimExprConverter().ConvertToIrExpr(dim_expr); | ||
|
|
||
| ir::Expr expr1 = | ||
| ir::Add::Make(ir::Expr(std::int64_t(4)), ir::Expr(std::int64_t(5))); | ||
| ir::Expr dst_expr = ir::Add::Make(expr1, ir::_Var_::Make("sym_0", Int(64))); | ||
| ASSERT_TRUE(MathEqual(src_expr, dst_expr)); | ||
| } | ||
|
|
||
| TEST(Convert, SubExpr) { | ||
| DimExpr dim_expr = DimExpr(4) - DimExpr("sym_0"); | ||
| ir::Expr src_expr = DimExprConverter().ConvertToIrExpr(dim_expr); | ||
|
|
||
| ir::Expr expr1 = ir::Sub::Make(ir::Expr(std::int64_t(0)), | ||
| ir::_Var_::Make("sym_0", Int(64))); | ||
| ir::Expr dst_expr = ir::Add::Make(ir::Expr(std::int64_t(4)), expr1); | ||
| ASSERT_TRUE(MathEqual(src_expr, dst_expr)); | ||
| } | ||
|
|
||
| TEST(Convert, MulExpr) { | ||
| List<DimExpr> num_lists{DimExpr(4), DimExpr(5), DimExpr("sym_0")}; | ||
| DimExpr dim_expr{Mul<DimExpr>{num_lists}}; | ||
| ir::Expr src_expr = DimExprConverter().ConvertToIrExpr(dim_expr); | ||
|
|
||
| ir::Expr expr1 = | ||
| ir::Mul::Make(ir::Expr(std::int64_t(4)), ir::Expr(std::int64_t(5))); | ||
| ir::Expr dst_expr = ir::Mul::Make(expr1, ir::_Var_::Make("sym_0", Int(64))); | ||
| ASSERT_TRUE(MathEqual(src_expr, dst_expr)); | ||
| } | ||
|
|
||
| TEST(Convert, MaxExpr) { | ||
| List<DimExpr> num_lists{DimExpr(4), DimExpr(5), DimExpr("sym_0")}; | ||
| DimExpr dim_expr{Max<DimExpr>{num_lists}}; | ||
| ir::Expr src_expr = DimExprConverter().ConvertToIrExpr(dim_expr); | ||
|
|
||
| std::ostringstream stream; | ||
| stream << src_expr; | ||
| ASSERT_EQ(stream.str(), "cinn_max(cinn_max(4ll, 5ll), sym_0)"); | ||
| } | ||
|
|
||
| TEST(Convert, MinExpr) { | ||
| List<DimExpr> num_lists{DimExpr(4), DimExpr(5), DimExpr("sym_0")}; | ||
| DimExpr dim_expr{Min<DimExpr>{num_lists}}; | ||
| ir::Expr src_expr = DimExprConverter().ConvertToIrExpr(dim_expr); | ||
|
|
||
| std::ostringstream stream; | ||
| stream << src_expr; | ||
| ASSERT_EQ(stream.str(), "cinn_min(cinn_min(4ll, 5ll), sym_0)"); | ||
| } | ||
|
|
||
| } // namespace cinn::common::test |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.