part 6

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

Hide file tree

Showing 50 changed files with 117 additions and 267 deletions.
diff --git a/paddle/fluid/distributed/collective/reducer.cc b/paddle/fluid/distributed/collective/reducer.cc
@@ -21,8 +21,7 @@
 PD_DECLARE_bool(use_stream_safe_cuda_allocator);
 COMMON_DECLARE_string(allocator_strategy);
 
-namespace paddle {
-namespace distributed {
+namespace paddle::distributed {
 
 static bool IsStreamSafeAllocator() {
   return (FLAGS_allocator_strategy == "auto_growth" &&
@@ -1367,5 +1366,4 @@ std::ostream &operator<<(std::ostream &out, const EagerGroup &group) {
   return out;
 }
 
-}  //  namespace distributed
-}  //  namespace paddle
+}  // namespace paddle::distributed 
diff --git a/paddle/fluid/distributed/fleet_executor/message_service.cc b/paddle/fluid/distributed/fleet_executor/message_service.cc
@@ -18,8 +18,7 @@
 #include "paddle/fluid/distributed/fleet_executor/global.h"
 #include "paddle/fluid/distributed/fleet_executor/message_bus.h"
 
-namespace paddle {
-namespace distributed {
+namespace paddle::distributed {
 
 void MessageServiceImpl::ReceiveInterceptorMessage(
     google::protobuf::RpcController* control_base,
@@ -46,6 +45,5 @@ void MessageServiceImpl::IncreaseBarrierCount(
   response->set_rst(true);
 }
 
-}  // namespace distributed
-}  // namespace paddle
+}  // namespace paddle::distributed 
 #endif
diff --git a/paddle/fluid/distributed/ps/service/communicator/communicator.cc b/paddle/fluid/distributed/ps/service/communicator/communicator.cc
@@ -25,8 +25,7 @@ limitations under the License. */
 #define LEARNING_RATE_DECAY_COUNTER "@LR_DECAY_COUNTER@"
 #define STEP_COUNTER "@PS_STEP_COUNTER@"
 
-namespace paddle {
-namespace distributed {
+namespace paddle::distributed {
 
 using phi::SelectedRows;
 
@@ -1590,5 +1589,4 @@ void FLCommunicator::StartCoordinator(
       new std::thread(&FLCommunicator::SendThreadAsync, this));
 }
 
-}  // namespace distributed
-}  // namespace paddle
+}  // namespace paddle::distributed 
diff --git a/paddle/fluid/framework/fleet/metrics.cc b/paddle/fluid/framework/fleet/metrics.cc
@@ -21,8 +21,7 @@
 #include "paddle/fluid/framework/lod_tensor.h"
 
 #if defined(PADDLE_WITH_PSLIB) || defined(PADDLE_WITH_PSCORE)
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 
 std::shared_ptr<Metric> Metric::s_instance_ = nullptr;
 
@@ -393,6 +392,5 @@ BasicAucCalculator::WuaucRocData BasicAucCalculator::computeSingleUserAuc(
   return {tp, fp, auc};
 }
 
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework 
 #endif
diff --git a/paddle/fluid/framework/ir/embedding_fc_lstm_fuse_pass.cc b/paddle/fluid/framework/ir/embedding_fc_lstm_fuse_pass.cc
@@ -20,9 +20,7 @@
 #include "paddle/fluid/framework/op_version_registry.h"
 #include "paddle/phi/kernels/funcs/blas/blas.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 static int BuildFusion(Graph* graph,
                        const std::string& name_scope,
@@ -288,9 +286,7 @@ void EmbeddingFCLSTMFusePass::ApplyImpl(ir::Graph* graph) const {
   AddStatis(fusion_count);
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(embedding_fc_lstm_fuse_pass,
               paddle::framework::ir::EmbeddingFCLSTMFusePass);

diff --git a/paddle/fluid/framework/ir/fused_continuous_same_ops_pass.cc b/paddle/fluid/framework/ir/fused_continuous_same_ops_pass.cc
@@ -21,19 +21,16 @@
 
 namespace phi {
 class DenseTensor;
-}  // namespace phi
+}  // namespace phi 
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 class Scope;
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework 
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
-namespace patterns {
+}  // namespace paddle::framework::ir 
+namespace paddle::framework::ir::patterns {
 
 struct ContinuousSameOpsPattern : public PatternBase {
   ContinuousSameOpsPattern(PDPattern* pattern,
@@ -85,7 +82,8 @@ ContinuousSameOpsPattern::ContinuousSameOpsPattern(
       .LinksTo({second_out_var_node});
 }
 
-}  // namespace patterns
+}  // namespace paddle::framework::ir::patterns 
+namespace paddle::framework::ir {
 
 /*
 Fused continuous same ops into one.
@@ -221,9 +219,7 @@ void FusedContinuousSameOpsPass::ApplyImpl(ir::Graph* graph) const {
   LOG(INFO) << "Total delete op counts: " << total_delete_op_count;
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(fused_continuous_same_ops_pass,
               paddle::framework::ir::FusedContinuousSameOpsPass);

diff --git a/paddle/fluid/framework/ir/fused_feedforward_pass.cc b/paddle/fluid/framework/ir/fused_feedforward_pass.cc
@@ -19,9 +19,7 @@
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/platform/enforce.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 void FusedFeedForwardPass::ApplyImpl(ir::Graph *graph) const {
   FusePassBase::Init(scope_name, graph);
@@ -752,9 +750,7 @@ ir::Graph *FusedFeedForwardPass::FusedFeedForwardBwd(
   return graph;
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(fused_feedforward_pass,
               paddle::framework::ir::FusedFeedForwardPass);
diff --git a/paddle/fluid/framework/ir/fusion_group/code_generator_helper.cc b/paddle/fluid/framework/ir/fusion_group/code_generator_helper.cc
@@ -19,10 +19,7 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/ir/fusion_group/operation.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
-namespace fusion_group {
+namespace paddle::framework::ir::fusion_group {
 
 template <typename T>
 static T StringTo(const std::string& str) {
@@ -219,7 +216,4 @@ std::string OperationExpression::GetExpression(
   return ret.str();
 }
 
-}  // namespace fusion_group
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir::fusion_group 
diff --git a/paddle/fluid/framework/ir/memory_optimize_pass/reference_count_pass.cc b/paddle/fluid/framework/ir/memory_optimize_pass/reference_count_pass.cc
@@ -23,9 +23,7 @@
 #include "paddle/fluid/framework/ir/memory_optimize_pass/reference_count_pass_helper.h"
 #include "paddle/fluid/framework/ir/pass.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 class Graph;
 
@@ -362,9 +360,7 @@ void ReferenceCountPass::ApplyImpl(ir::Graph *graph) const {
   }
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(reference_count_pass, paddle::framework::ir::ReferenceCountPass)
     .RequirePassAttr(paddle::framework::ir::kMemOptVarInfoMapList)

diff --git a/paddle/fluid/framework/ir/onednn/cpu_bfloat16_placement_pass.cc b/paddle/fluid/framework/ir/onednn/cpu_bfloat16_placement_pass.cc
@@ -21,9 +21,7 @@ limitations under the License. */
 #include "paddle/fluid/platform/onednn_helper.h"
 #include "paddle/utils/string/pretty_log.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 using string::PrettyLogDetail;
 
@@ -111,9 +109,7 @@ int CPUBfloat16PlacementPass::RemoveUnsupportedOperators(
   return detected_operators;
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(cpu_bfloat16_placement_pass,
               paddle::framework::ir::CPUBfloat16PlacementPass)

diff --git a/paddle/fluid/framework/ir/onednn/fc_onednn_pass.cc b/paddle/fluid/framework/ir/onednn/fc_onednn_pass.cc
@@ -17,15 +17,11 @@
 #include "paddle/phi/core/enforce.h"
 #include "paddle/utils/string/pretty_log.h"
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 class OpDesc;
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework 
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 class Graph;
 
@@ -85,8 +81,6 @@ void FCMKLDNNPass::ApplyImpl(ir::Graph* graph) const {
   }
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(fc_onednn_pass, paddle::framework::ir::FCMKLDNNPass);
diff --git a/paddle/fluid/framework/ir/preln_layernorm_x_fuse_pass.cc b/paddle/fluid/framework/ir/preln_layernorm_x_fuse_pass.cc
@@ -19,18 +19,11 @@ 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 Node;
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
-namespace paddle {
-namespace framework {
-namespace ir {
-namespace patterns {
+namespace paddle::framework::ir::patterns {
 
 struct PrelnLayerNormX : public PatternBase {
   PrelnLayerNormX(PDPattern *pattern, const std::string &name_scope)
@@ -86,7 +79,8 @@ void PrelnLayerNormX::operator()(PDNode *x,
       .LinksTo({layer_norm_out_var});
 }
 
-}  // namespace patterns
+}  // namespace paddle::framework::ir::patterns 
+namespace paddle::framework::ir {
 
 int PrelnLayerNormXFusePass::ApplyLayerNormShiftPattern(
     ir::Graph *graph) const {
@@ -253,9 +247,7 @@ void PrelnLayerNormXFusePass::ApplyImpl(ir::Graph *graph) const {
   AddStatis(found_subgraph_count);
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(preln_layernorm_x_fuse_pass,
               paddle::framework::ir::PrelnLayerNormXFusePass);

diff --git a/paddle/fluid/framework/ir/seqpool_concat_fuse_pass.cc b/paddle/fluid/framework/ir/seqpool_concat_fuse_pass.cc
@@ -16,19 +16,13 @@
 
 #include <string>
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 class Node;
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 #define MAX_CONCAT_INPUTS 200
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 PDNode* BuildSeqPoolConcatPattern(PDPattern* pattern,
                                   const std::string& name_scope,
@@ -217,9 +211,7 @@ void SeqPoolConcatFusePass::ApplyImpl(ir::Graph* graph) const {
   AddStatis(fusion_count);
 }
 
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(seqpool_concat_fuse_pass,
               paddle::framework::ir::SeqPoolConcatFusePass);
diff --git a/paddle/fluid/framework/ir/sync_batch_norm_pass.cc b/paddle/fluid/framework/ir/sync_batch_norm_pass.cc
@@ -15,9 +15,7 @@ limitations under the License. */
 #include "glog/logging.h"
 #include "paddle/fluid/framework/ir/pass.h"
 
-namespace paddle {
-namespace framework {
-namespace ir {
+namespace paddle::framework::ir {
 
 class Graph;
 
@@ -43,8 +41,6 @@ class SyncBatchNormPass : public Pass {
     }
   }
 };
-}  // namespace ir
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework::ir 
 
 REGISTER_PASS(sync_batch_norm_pass, paddle::framework::ir::SyncBatchNormPass);
diff --git a/paddle/fluid/framework/new_executor/garbage_collector/fast_garbage_collector.cc b/paddle/fluid/framework/new_executor/garbage_collector/fast_garbage_collector.cc
@@ -14,8 +14,7 @@
 
 #include "paddle/fluid/framework/new_executor/garbage_collector/fast_garbage_collector.h"
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 
 void InterpreterCoreFastGarbageCollector::Add(Variable* var,
                                               const Instruction&) {
@@ -102,5 +101,4 @@ void InterpreterCoreFastGarbageCollector::Add(Garbage garbage) {
   }
 }
 
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework 
diff --git a/paddle/fluid/framework/op_registry.cc b/paddle/fluid/framework/op_registry.cc
@@ -17,8 +17,7 @@ limitations under the License. */
 
 #include "glog/logging.h"
 
-namespace paddle {
-namespace framework {
+namespace paddle::framework {
 
 std::unique_ptr<OperatorBase> OpRegistry::CreateOp(
     const std::string& type,
@@ -140,5 +139,4 @@ std::unique_ptr<OperatorBase> OpRegistry::CreateOp(const OpDesc& op_desc) {
   return op;
 }
 
-}  // namespace framework
-}  // namespace paddle
+}  // namespace paddle::framework