[clang-tidy] NO.25 enable modernize-use-transparent-functors (#61689)

enkilee · web-flow · commit d7285b15ea6f · 2024-02-26T11:40:10.000+08:00
* clangtidy 25

* codestyle

* codestyle

* fix

* fix
diff --git a/paddle/common/ddim.cc b/paddle/common/ddim.cc
@@ -248,7 +248,7 @@ DDim DDim::reshape(std::vector<int>& shape) const {
   if (it != shape.end()) {
     int index = static_cast<int>(std::distance(shape.begin(), it));
     int reshape_out_product =
-        std::accumulate(shape.begin(), shape.end(), -1, std::multiplies<int>());
+        std::accumulate(shape.begin(), shape.end(), -1, std::multiplies<>());
     shape[index] = static_cast<int>(product(in_dims)) / reshape_out_product;
   }
 
diff --git a/paddle/phi/infermeta/spmd_rules/reshape.cc b/paddle/phi/infermeta/spmd_rules/reshape.cc
@@ -44,8 +44,8 @@ std::vector<int64_t> InferTargetShape(const std::vector<int64_t>& shape,
     }
   }
 
-  int64_t product = std::accumulate(
-      shape.begin(), shape.end(), 1, std::multiplies<int64_t>());
+  int64_t product =
+      std::accumulate(shape.begin(), shape.end(), 1, std::multiplies<>());
   if (product > 0) {
     PADDLE_ENFORCE_EQ(
         product,
@@ -72,7 +72,7 @@ std::vector<std::shared_ptr<DimTrans>> MakeReshapeDimTrans(
     const std::vector<int64_t>& tgt_shape) {
   std::vector<std::shared_ptr<DimTrans>> ret;
   int64_t total_elem_num_src = std::accumulate(
-      src_shape.begin(), src_shape.end(), 1, std::multiplies<int64_t>());
+      src_shape.begin(), src_shape.end(), 1, std::multiplies<>());
   std::vector<int64_t> inferred_tgt_shape =
       InferTargetShape(tgt_shape, total_elem_num_src);
 
diff --git a/paddle/pir/src/core/ir_printer.cc b/paddle/pir/src/core/ir_printer.cc
@@ -69,7 +69,7 @@ void BasicIrPrinter::PrintType(Type type) {
   } else if (type.isa<VectorType>()) {
     os << "vec[";
     auto inner_types = type.dyn_cast<VectorType>().data();
-    detail::PrintInterleave(
+    pir::detail::PrintInterleave(
         inner_types.begin(),
         inner_types.end(),
         [this](Type v) { this->PrintType(v); },
@@ -132,7 +132,7 @@ void BasicIrPrinter::PrintAttribute(Attribute attr) {
   } else if (auto arr = attr.dyn_cast<ArrayAttribute>()) {
     const auto& vec = arr.AsVector();
     os << "[";
-    detail::PrintInterleave(
+    pir::detail::PrintInterleave(
         vec.begin(),
         vec.end(),
         [this](Attribute v) { this->PrintAttribute(v); },
@@ -256,7 +256,7 @@ void IrPrinter::PrintOpResult(Operation* op) {
   for (size_t idx = 0; idx < num_op_result; idx++) {
     op_results.push_back(op->result(idx));
   }
-  detail::PrintInterleave(
+  pir::detail::PrintInterleave(
       op_results.begin(),
       op_results.end(),
       [this](Value v) { this->PrintValue(v); },
@@ -266,11 +266,11 @@ void IrPrinter::PrintOpResult(Operation* op) {
 
 void IrPrinter::PrintAttributeMap(Operation* op) {
   AttributeMap attributes = op->attributes();
-  std::map<std::string, Attribute, std::less<std::string>> order_attributes(
+  std::map<std::string, Attribute, std::less<>> order_attributes(
       attributes.begin(), attributes.end());
   os << " {";
 
-  detail::PrintInterleave(
+  pir::detail::PrintInterleave(
       order_attributes.begin(),
       order_attributes.end(),
       [this](std::pair<std::string, Attribute> it) {
@@ -291,7 +291,7 @@ void IrPrinter::PrintOpOperands(Operation* op) {
   for (size_t idx = 0; idx < num_op_operands; idx++) {
     op_operands.push_back(op->operand_source(idx));
   }
-  detail::PrintInterleave(
+  pir::detail::PrintInterleave(
       op_operands.begin(),
       op_operands.end(),
       [this](Value v) { this->PrintValue(v); },
@@ -312,7 +312,7 @@ void IrPrinter::PrintOperandsType(Operation* op) {
     }
   }
   os << " (";
-  detail::PrintInterleave(
+  pir::detail::PrintInterleave(
       op_operand_types.begin(),
       op_operand_types.end(),
       [this](Type t) { this->PrintType(t); },
@@ -332,7 +332,7 @@ void IrPrinter::PrintOpReturnType(Operation* op) {
       op_result_types.emplace_back(nullptr);
     }
   }
-  detail::PrintInterleave(
+  pir::detail::PrintInterleave(
       op_result_types.begin(),
       op_result_types.end(),
       [this](Type t) { this->PrintType(t); },
diff --git a/test/cpp/fluid/memory/thread_local_allocator_test.cc b/test/cpp/fluid/memory/thread_local_allocator_test.cc
@@ -78,7 +78,7 @@ TEST(ThreadLocalAllocator, cross_scope_release) {
   for (auto &addresses : allocator_addresses) {
     std::sort(addresses.begin(), addresses.end());
     ASSERT_EQ(std::adjacent_find(
-                  addresses.begin(), addresses.end(), std::equal_to<void *>()),
+                  addresses.begin(), addresses.end(), std::equal_to<>()),
               addresses.end());
   }
 
diff --git a/test/cpp/inference/api/analyzer_capi_exp_pd_tensor_tester.cc b/test/cpp/inference/api/analyzer_capi_exp_pd_tensor_tester.cc
@@ -69,7 +69,7 @@ void PD_run() {
   int32_t out_num = std::accumulate(output_shape->data,
                                     output_shape->data + output_shape->size,
                                     1,
-                                    std::multiplies<int32_t>());
+                                    std::multiplies<>());
   out_data.resize(out_num);
   PD_TensorCopyToCpuFloat(output_tensor, out_data.data());
   LOG(INFO) << "Output tensor name is: " << PD_TensorGetName(output_tensor);

Original file line number	Diff line number	Diff line change
`@@ -248,7 +248,7 @@ DDim DDim::reshape(std::vector<int>& shape) const {`
`248`	`248`	`if (it != shape.end()) {`
`249`	`249`	`int index = static_cast<int>(std::distance(shape.begin(), it));`
`250`	`250`	`int reshape_out_product =`
`251`		`- std::accumulate(shape.begin(), shape.end(), -1, std::multiplies<int>());`
	`251`	`+ std::accumulate(shape.begin(), shape.end(), -1, std::multiplies<>());`
`252`	`252`	`shape[index] = static_cast<int>(product(in_dims)) / reshape_out_product;`
`253`	`253`	`}`
`254`	`254`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ TEST(ThreadLocalAllocator, cross_scope_release) {`
`78`	`78`	`for (auto &addresses : allocator_addresses) {`
`79`	`79`	`std::sort(addresses.begin(), addresses.end());`
`80`	`80`	`ASSERT_EQ(std::adjacent_find(`
`81`		`- addresses.begin(), addresses.end(), std::equal_to<void *>()),`
	`81`	`+ addresses.begin(), addresses.end(), std::equal_to<>()),`
`82`	`82`	`addresses.end());`
`83`	`83`	`}`
`84`	`84`