fix conflict

Author: zeroRains

paddle/cinn/ast_gen_ius/ast_gen.cc

@@ -28,6 +28,10 @@ PD_DECLARE_bool(cinn_bucket_compile);
 namespace cinn {
 namespace ast_gen_ius {
 
+bool IsReduceBool(const ir::Expr& lhs, const ir::Expr& rhs) {
+  return lhs.type().is_bool() || rhs.type().is_bool();
+}
+
 ir::Expr ConvertReduceBody(ir::Expr body,
                            ir::Tensor tensor,
                            const std::vector<Expr>& axis_exprs) {
@@ -38,9 +42,17 @@ ir::Expr ConvertReduceBody(ir::Expr body,
 
   switch (reduce_node->reduce_type) {
     case ir::Reduce::kSum:
+      if (IsReduceBool(tensor(axis_exprs), reduce_node->body)) {
+        return ir::Store::Make(
+            tensor, tensor(axis_exprs) || reduce_node->body, axis_exprs);
+      }
       return ir::Store::Make(
           tensor, tensor(axis_exprs) + reduce_node->body, axis_exprs);
     case ir::Reduce::kMul:
+      if (IsReduceBool(tensor(axis_exprs), reduce_node->body)) {
+        return ir::Store::Make(
+            tensor, tensor(axis_exprs) && reduce_node->body, axis_exprs);
+      }
       return ir::Store::Make(
           tensor, tensor(axis_exprs) * reduce_node->body, axis_exprs);
     case ir::Reduce::kMax:

paddle/cinn/frontend/paddle/cpp/block_desc.cc

@@ -13,18 +13,29 @@
 // limitations under the License.
 
 #include "paddle/cinn/frontend/paddle/cpp/block_desc.h"
+#include "paddle/common/enforce.h"
 
 namespace cinn::frontend::paddle::cpp {
 
 template <>
 VarDesc* BlockDesc::GetVar<VarDesc>(int32_t idx) {
-  CHECK_LT(idx, VarsSize()) << "idx >= vars.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      VarsSize(),
+      phi::errors::InvalidArgument(
+          "The value of idx and vars.size() is incorrect."
+          "Expected idx < vars.size(), but receive idx >= vars.size()."));
   return &vars_[idx];
 }
 
 template <>
 const VarDesc& BlockDesc::GetConstVar<VarDesc>(int32_t idx) const {
-  CHECK_LT(idx, static_cast<int32_t>(VarsSize())) << "idx >= vars.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      static_cast<int32_t>(VarsSize()),
+      phi::errors::InvalidArgument(
+          "The value of idx and vars.size() is incorrect."
+          "Expected idx < vars.size(), but receive idx >= vars.size()."));
   return vars_[idx];
 }
 
@@ -36,13 +47,23 @@ VarDesc* BlockDesc::AddVar<VarDesc>() {
 
 template <>
 OpDesc* BlockDesc::GetOp<OpDesc>(int32_t idx) {
-  CHECK_LT(idx, OpsSize()) << "idx >= ops.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      OpsSize(),
+      phi::errors::InvalidArgument(
+          "The value of idx and ops.size() is incorrect."
+          "Expected idx < ops.size(), but receive idx >= ops.size()."));
   return &ops_[idx];
 }
 
 template <>
 const OpDesc& BlockDesc::GetConstOp<OpDesc>(int32_t idx) const {
-  CHECK_LT(idx, static_cast<int32_t>(OpsSize())) << "idx >= ops.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      static_cast<int32_t>(OpsSize()),
+      phi::errors::InvalidArgument(
+          "The value of idx and ops.size() is incorrect."
+          "Expected idx < ops.size(), but receive idx >= ops.size()."));
   return ops_[idx];
 }
 

paddle/cinn/frontend/paddle/cpp/program_desc.cc

@@ -13,18 +13,29 @@
 // limitations under the License.
 
 #include "paddle/cinn/frontend/paddle/cpp/program_desc.h"
+#include "paddle/common/enforce.h"
 
 namespace cinn::frontend::paddle::cpp {
 
 template <>
 BlockDesc* ProgramDesc::GetBlock<BlockDesc>(int32_t idx) {
-  CHECK_LT(idx, BlocksSize()) << "idx >= blocks.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      BlocksSize(),
+      phi::errors::InvalidArgument(
+          "The value of idx and blocks.size() is incorrect."
+          "Expected idx < blocks.size(), but receive idx >= blocks.size()."));
   return &blocks_[idx];
 }
 
 template <>
 const BlockDesc& ProgramDesc::GetConstBlock<BlockDesc>(int32_t idx) const {
-  CHECK_LT(idx, static_cast<int32_t>(BlocksSize())) << "idx >= blocks.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      static_cast<int32_t>(BlocksSize()),
+      phi::errors::InvalidArgument(
+          "The value of idx and blocks.size() is incorrect."
+          "Expected idx < blocks.size(), but receive idx >= blocks.size()."));
   return blocks_[idx];
 }
 

paddle/cinn/frontend/paddle/model_parser.cc

@@ -23,6 +23,7 @@
 #include "paddle/cinn/backends/cuda_util.h"
 #include "paddle/cinn/common/common.h"
 #include "paddle/cinn/frontend/paddle/compatible_pb.h"
+#include "paddle/common/enforce.h"
 
 namespace cinn::frontend::paddle {
 
@@ -55,7 +56,8 @@ void TensorFromStream(std::istream &is,
   using Type = framework_proto::VarType::Type;
   uint32_t version;
   is.read(reinterpret_cast<char *>(&version), sizeof(version));
-  CHECK_EQ(version, 0U) << "Only version 0 is supported";
+  PADDLE_ENFORCE_EQ(
+      version, 0U, phi::errors::InvalidArgument("Only version 0 is supported"));
   // read tensor desc
   framework_proto::VarType::TensorDesc desc;
   {

paddle/cinn/frontend/paddle/pb/block_desc.cc

@@ -13,13 +13,19 @@
 // limitations under the License.
 
 #include "paddle/cinn/frontend/paddle/pb/block_desc.h"
+#include "paddle/common/enforce.h"
 
 namespace cinn::frontend::paddle::pb {
 
 template <>
 framework_proto::VarDesc* BlockDesc::GetVar<framework_proto::VarDesc>(
     int32_t idx) {
-  CHECK_LT(idx, VarsSize()) << "idx >= vars.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      VarsSize(),
+      phi::errors::InvalidArgument(
+          "The value of idx and vars.size() is incorrect."
+          "Expected idx < vars.size(), but receive idx >= vars.size()."));
   return desc_->mutable_vars(idx);
 }
 
@@ -31,7 +37,12 @@ framework_proto::VarDesc* BlockDesc::AddVar<framework_proto::VarDesc>() {
 template <>
 framework_proto::OpDesc* BlockDesc::GetOp<framework_proto::OpDesc>(
     int32_t idx) {
-  CHECK_LT(idx, OpsSize()) << "idx >= ops.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      OpsSize(),
+      phi::errors::InvalidArgument(
+          "The value of idx and ops.size() is incorrect."
+          "Expected idx < ops.size(), but receive idx >= ops.size()."));
   return desc_->mutable_ops(idx);
 }
 

paddle/cinn/frontend/paddle/pb/program_desc.cc

@@ -17,12 +17,19 @@
 #include <algorithm>
 #include <limits>
 
+#include "paddle/common/enforce.h"
+
 namespace cinn::frontend::paddle::pb {
 
 template <>
 framework_proto::BlockDesc* ProgramDesc::GetBlock<framework_proto::BlockDesc>(
     int32_t idx) {
-  CHECK_LT(idx, BlocksSize()) << "idx >= blocks.size()";
+  PADDLE_ENFORCE_LT(
+      idx,
+      BlocksSize(),
+      phi::errors::InvalidArgument(
+          "The value of idx and blocks.size() is incorrect."
+          "Expected idx < blocks.size(), but receive idx >= blocks.size()."));
   return desc_->mutable_blocks(idx);
 }