part 10

PaddlePaddle · May 30, 2024 · 1abf589 · 1abf589
1 parent a338cea
commit 1abf589
Show file tree

Hide file tree

Showing 50 changed files with 119 additions and 265 deletions.
diff --git a/paddle/fluid/distributed/collective/processgroup_comm_utils.cc b/paddle/fluid/distributed/collective/processgroup_comm_utils.cc
@@ -21,8 +21,7 @@
 #include "paddle/fluid/distributed/collective/process_group_custom.h"
 #endif
 
-namespace phi {
-namespace detail {
+namespace phi::detail {
 
 // FIXME(paddle-dev): Since the singleton of ProcessGroup in fluid is used in
 // SyncBN, the fluid symbol will be dependent on external hardware access.
@@ -63,5 +62,4 @@ ccl::CCLComm GetCCLComm(const Place& place, int global_gid) {
   }
 }
 
-}  // namespace detail
-}  // namespace phi
+}  // namespace phi::detail 
diff --git a/paddle/fluid/distributed/fleet_executor/sink_interceptor.cc b/paddle/fluid/distributed/fleet_executor/sink_interceptor.cc
@@ -16,8 +16,7 @@
 
 #include "paddle/fluid/distributed/fleet_executor/task_node.h"
 
-namespace paddle {
-namespace distributed {
+namespace paddle::distributed {
 
 SinkInterceptor::SinkInterceptor(int64_t interceptor_id, TaskNode* node)
     : Interceptor(interceptor_id, node),
@@ -64,5 +63,4 @@ void SinkInterceptor::Run(const InterceptorMessage& msg) {
 }
 
 REGISTER_INTERCEPTOR(Sink, SinkInterceptor);
-}  // namespace distributed
-}  // namespace paddle
+}  // namespace paddle::distributed 
diff --git a/paddle/fluid/distributed/ps/service/ps_client.cc b/paddle/fluid/distributed/ps/service/ps_client.cc
@@ -25,8 +25,7 @@
 #include "paddle/fluid/framework/fleet/gloo_wrapper.h"
 #endif
 
-namespace paddle {
-namespace distributed {
+namespace paddle::distributed {
 REGISTER_PSCORE_CLASS(PSClient, BrpcPsClient);
 REGISTER_PSCORE_CLASS(PSClient, PsLocalClient);
 REGISTER_PSCORE_CLASS(PSClient, GraphBrpcClient);
@@ -109,5 +108,4 @@ PSClient *PSClientFactory::Create(const PSParameter &ps_config) {
   VLOG(3) << "Create PSClient[" << service_param.client_class() << "] success";
   return client;
 }
-}  // namespace distributed
-}  // namespace paddle
+}  // namespace paddle::distributed 
diff --git a/paddle/fluid/eager/api/utils/hook_utils.cc b/paddle/fluid/eager/api/utils/hook_utils.cc
@@ -19,8 +19,7 @@
 #include "paddle/fluid/eager/utils.h"
 #include "paddle/phi/core/dense_tensor.h"
 
-namespace egr {
-namespace egr_utils_api {
+namespace egr::egr_utils_api {
 
 int64_t RegisterGradientHookForTensor(
     const paddle::Tensor& tensor,
@@ -96,5 +95,4 @@ void RetainGradForTensor(const paddle::Tensor& tensor) {
 void RegisterBackwardFinalHook(const std::function<void()>& hook) {
   Controller::Instance().RegisterBackwardFinalHook(hook);
 }
-}  // namespace egr_utils_api
-}  // namespace egr
+}  // namespace egr::egr_utils_api 
diff --git a/paddle/fluid/framework/data_layout_transform.cc b/paddle/fluid/framework/data_layout_transform.cc
@@ -18,8 +18,7 @@
 #include "paddle/phi/core/utils/data_type.h"
 #include "paddle/phi/kernels/funcs/math_function.h"
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 
 std::vector<int> GetAxis(const DataLayout& from, const DataLayout& to) {
   PADDLE_ENFORCE_NE(
@@ -102,5 +101,4 @@ void TransDataLayout(DataLayout from_layout,
   out->set_layout(to_layout);
 }
 
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework 
diff --git a/paddle/fluid/framework/details/variable_visitor.cc b/paddle/fluid/framework/details/variable_visitor.cc
@@ -19,17 +19,13 @@
 
 namespace phi {
 class DenseTensor;
-}  // namespace phi
+}  // namespace phi 
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 class Variable;
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework 
 
-namespace paddle {
-namespace framework {
-namespace details {
+namespace paddle::framework::details {
 template <typename Func>
 static void VisitVariable(Variable* var, Func* func) {
   if (var->IsType<phi::DenseTensor>()) {
@@ -181,6 +177,4 @@ void VariableVisitor::EnforceShapeAndDTypeEQ(const Variable& var1,
   VisitVariable(var2, &visitor);
 }
 
-}  // namespace details
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::details 
diff --git a/paddle/fluid/framework/device_worker.cc b/paddle/fluid/framework/device_worker.cc
@@ -19,10 +19,9 @@ limitations under the License. */
 #include "paddle/fluid/framework/convert_utils.h"
 namespace phi {
 class DenseTensor;
-}  // namespace phi
+}  // namespace phi 
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 
 class Scope;
 
@@ -496,5 +495,4 @@ void DeviceWorker::DumpField(const Scope& scope,
   writer_.Flush();
 }
 
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework 
diff --git a/paddle/fluid/framework/heter_section_worker.cc b/paddle/fluid/framework/heter_section_worker.cc
@@ -20,8 +20,7 @@ limitations under the License. */
 #include "paddle/fluid/platform/device_context.h"
 #include "paddle/fluid/platform/lodtensor_printer.h"
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 
 void SetMicroId(paddle::framework::Scope* scope,
                 platform::DeviceContext* dev_ctx,
@@ -554,6 +553,5 @@ void HeterSectionWorker::TrainFilesWithProfiler() {
   }
 }
 
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework 
 #endif
diff --git a/paddle/fluid/framework/ir/fc_gru_fuse_pass_tester.cc b/paddle/fluid/framework/ir/fc_gru_fuse_pass_tester.cc
@@ -14,11 +14,10 @@
 
 #include "paddle/fluid/framework/ir/fc_gru_fuse_pass_tester.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
-namespace fc_gru_test {
+}  // namespace paddle::framework::ir 
+namespace paddle::framework::ir::fc_gru_test {
 TEST(FcGruFusePass, basic) {
   std::unique_ptr<ir::Graph> graph = PrepareGraph();
   auto pass = PassRegistry::Instance().Get("fc_gru_fuse_pass");
@@ -50,9 +49,6 @@ TEST(FcGruFusePass, basic) {
                         "expectations after fuse"));
 }
 
-}  // namespace fc_gru_test
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir::fc_gru_test 
 
 USE_PASS(fc_gru_fuse_pass);
diff --git a/paddle/fluid/framework/ir/memory_optimize_pass/eager_deletion_pass.cc b/paddle/fluid/framework/ir/memory_optimize_pass/eager_deletion_pass.cc
@@ -26,9 +26,7 @@
 #include "paddle/fluid/framework/ir/graph_helper.h"
 #include "paddle/fluid/framework/ir/memory_optimize_pass/memory_optimization_var_info.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 // op -> variables which can be deleted after op runs
 using OpToVarNameSetMap = std::unordered_map<details::ComputationOpHandle *,
@@ -303,9 +301,7 @@ void EagerDeletionPass::ApplyImpl(ir::Graph *graph) const {
   while_op_eager_deletion_pass->Apply(graph);
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(eager_deletion_pass, paddle::framework::ir::EagerDeletionPass)
     .RequirePassAttr(paddle::framework::ir::kMemOptVarInfoMapList)

diff --git a/paddle/fluid/framework/ir/memory_optimize_pass/while_op_eager_deletion_pass.cc b/paddle/fluid/framework/ir/memory_optimize_pass/while_op_eager_deletion_pass.cc
@@ -18,9 +18,7 @@
 #include "paddle/fluid/operators/controlflow/op_variant.h"
 #include "paddle/fluid/operators/controlflow/while_op_helper.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 using OpVariant = operators::OpVariant;
 
 class WhileOpEagerDeletionPass : public ir::Pass {
@@ -105,9 +103,7 @@ class WhileOpEagerDeletionPass : public ir::Pass {
   }
 };
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(while_op_eager_deletion_pass,
               paddle::framework::ir::WhileOpEagerDeletionPass);
diff --git a/paddle/fluid/framework/ir/onednn/depthwise_conv_onednn_pass.cc b/paddle/fluid/framework/ir/onednn/depthwise_conv_onednn_pass.cc
@@ -17,9 +17,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/op_version_registry.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 class Graph;
 
@@ -101,9 +99,7 @@ void DepthwiseConvMKLDNNPass::ApplyImpl(ir::Graph* graph) const {
   AddStatis(found_depthwise_conv_onednn_count);
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(depthwise_conv_onednn_pass,
               paddle::framework::ir::DepthwiseConvMKLDNNPass);

diff --git a/paddle/fluid/framework/ir/onednn/matmul_activation_onednn_fuse_pass.cc b/paddle/fluid/framework/ir/onednn/matmul_activation_onednn_fuse_pass.cc
@@ -19,9 +19,7 @@
 #include "paddle/fluid/framework/op_version_registry.h"
 #include "paddle/utils/string/pretty_log.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 using string::PrettyLogDetail;
 
@@ -284,9 +282,7 @@ MatmulActivationMkldnnFusePass::MatmulActivationMkldnnFusePass() {
       .End();
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(matmul_activation_onednn_fuse_pass,
               paddle::framework::ir::MatmulActivationMkldnnFusePass);

diff --git a/paddle/fluid/framework/ir/reverse_roll_fuse_pass.cc b/paddle/fluid/framework/ir/reverse_roll_fuse_pass.cc
@@ -33,9 +33,7 @@
   GET_IR_NODE(reshape2_50_op);    \
   GET_IR_NODE(reshape2_50_out);
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 class Node;
 ReverseRollFusePass::ReverseRollFusePass() {  // NOLINT
   AddOpCompat(OpCompat("reshape2"))
@@ -189,9 +187,7 @@ void ReverseRollFusePass::ApplyImpl(ir::Graph* graph) const {
   fuse_count += ApplyPattern(graph, false);
   AddStatis(fuse_count);
 }
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(reverse_roll_fuse_pass,
               paddle::framework::ir::ReverseRollFusePass);

diff --git a/paddle/fluid/framework/ir/seq_concat_fc_fuse_pass.cc b/paddle/fluid/framework/ir/seq_concat_fc_fuse_pass.cc
@@ -17,9 +17,7 @@
 #include "paddle/fluid/framework/ir/graph_pattern_detector.h"
 #include "paddle/fluid/framework/op_version_registry.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 struct FuseExpr {};
 
@@ -340,9 +338,7 @@ void SeqConcatFcFusePass::ApplyImpl(ir::Graph* graph) const {
   AddStatis(fuse_count);
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(seq_concat_fc_fuse_pass,
               paddle::framework::ir::SeqConcatFcFusePass);

diff --git a/paddle/fluid/framework/ir/silu_fuse_pass.cc b/paddle/fluid/framework/ir/silu_fuse_pass.cc
@@ -16,9 +16,7 @@
 #include <string>
 #include "paddle/fluid/framework/op_version_registry.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 void SiluFusePass::ApplyImpl(ir::Graph* graph) const {
   // This pass is used for cutlass, because cutlass can fuse conv + bias + silu
@@ -79,8 +77,6 @@ void SiluFusePass::ApplyImpl(ir::Graph* graph) const {
   gpd(graph, handler);
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(silu_fuse_pass, paddle::framework::ir::SiluFusePass);
diff --git a/paddle/fluid/framework/ir/transfer_layout_pass.cc b/paddle/fluid/framework/ir/transfer_layout_pass.cc
@@ -25,9 +25,7 @@
 #include "paddle/phi/common/place.h"
 #include "paddle/phi/core/dense_tensor.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 namespace {
 
 void InsertLayoutTransOp(ir::Graph *graph,
@@ -317,8 +315,6 @@ void TransferLayoutPass::ApplyImpl(ir::Graph *graph) const {
   AddStatis(static_cast<int>(valid_ops.size()));
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(transfer_layout_pass, paddle::framework::ir::TransferLayoutPass);
diff --git a/paddle/fluid/framework/ir/trt_remove_amp_strategy_op_pass.cc b/paddle/fluid/framework/ir/trt_remove_amp_strategy_op_pass.cc
@@ -23,9 +23,7 @@
 #include "paddle/fluid/framework/ir/node.h"
 #include "paddle/phi/common/data_type.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 namespace {
 template <typename InType, typename OutType>
@@ -150,9 +148,7 @@ void TrtRemoveAMPStrategyOpPass::ApplyImpl(Graph *graph) const {
     }
   }
 }
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(trt_remove_amp_strategy_op_pass,
               paddle::framework::ir::TrtRemoveAMPStrategyOpPass);
diff --git a/paddle/fluid/framework/new_executor/instruction/builtin_combine_instruction.cc b/paddle/fluid/framework/new_executor/instruction/builtin_combine_instruction.cc
@@ -15,8 +15,7 @@
 #include "paddle/fluid/framework/new_executor/instruction/builtin_combine_instruction.h"
 #include "paddle/fluid/framework/new_executor/new_executor_defs.h"
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 
 BuiltinCombineInstruction::BuiltinCombineInstruction(
     size_t id,
@@ -33,5 +32,4 @@ BuiltinCombineInstruction::BuiltinCombineInstruction(
 
 void BuiltinCombineInstruction::Run() {}
 
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework