Fix is_sparese is_sparse, etc (#62258)

co63oc · web-flow · commit 512d59406023 · 2024-03-01T11:16:12.000+08:00
diff --git a/paddle/fluid/distributed/collective/reducer.cc b/paddle/fluid/distributed/collective/reducer.cc
@@ -894,7 +894,7 @@ void EagerReducer::MarkVarReady(const size_t var_index,
             "The sparse parameter[%d][%s] should have gradient. "
             "Currently, DataParallel does not support sparse "
             "parameters without generating gradients during training. "
-            "For example, if is_sparese=True is used in Embedding, "
+            "For example, if is_sparse=True is used in Embedding, "
             "the current step of this parameter cannot generate gradient "
             "because of stop_gradient/detach, where error will occur.",
             var_index,
diff --git a/paddle/fluid/distributed/ps/service/brpc_ps_client.cc b/paddle/fluid/distributed/ps/service/brpc_ps_client.cc
@@ -402,7 +402,7 @@ int DownpourBrpcClosure::check_response(size_t request_idx, int cmd_id) {
 int DownpourBrpcClosure::check_save_response(size_t request_idx, int cmd_id) {
   int32_t feasign_size = 0;
   if (_cntls[request_idx]->Failed()) {
-    LOG(ERROR) << "resquest cmd_id:" << cmd_id
+    LOG(ERROR) << "request cmd_id:" << cmd_id
                << " failed, "
                   "err:"
                << _cntls[request_idx]->ErrorText();
@@ -426,7 +426,7 @@ std::string DownpourBrpcClosure::get_response(size_t request_idx, int cmd_id) {
 
 int FlClientBrpcClosure::check_response(size_t request_idx, int cmd_id) {
   if (_cntls[request_idx]->Failed()) {
-    LOG(ERROR) << "resquest cmd_id:" << cmd_id
+    LOG(ERROR) << "request cmd_id:" << cmd_id
                << " failed, "
                   "err:"
                << _cntls[request_idx]->ErrorText();
@@ -1712,7 +1712,7 @@ void BrpcPsClient::PushSparseTaskConsume() {
           merge_status[shard_idx].wait();
         }
 
-        // meger到task_list[0]
+        // merge到task_list[0]
         auto async_task = new SparseAsyncTask(*(task_list[0].get()));
 
         task_queue->Put(std::move(async_task));
diff --git a/paddle/fluid/distributed/ps/service/brpc_ps_server.cc b/paddle/fluid/distributed/ps/service/brpc_ps_server.cc
@@ -262,7 +262,7 @@ void BrpcPsService::service(google::protobuf::RpcController *cntl_base,
   brpc::ClosureGuard done_guard(done);
   std::string log_label("ReceiveCmd-");
   if (!request->has_table_id()) {
-    set_response_code(*response, -1, "PsRequestMessage.tabel_id is required");
+    set_response_code(*response, -1, "PsRequestMessage.table_id is required");
     return;
   }
 
@@ -307,7 +307,7 @@ int32_t BrpcPsService::PullDense(Table *table,
     set_response_code(
         response,
         -1,
-        "PsRequestMessage.datas is requeired at least 1 for num of dense");
+        "PsRequestMessage.datas is required at least 1 for num of dense");
     return 0;
   }
   CostTimer timer("pserver_server_pull_dense");
@@ -409,7 +409,7 @@ int32_t BrpcPsService::Barrier(Table *table,
   if (request.params_size() < 1) {
     set_response_code(response,
                       -1,
-                      "PsRequestMessage.params is requeired at "
+                      "PsRequestMessage.params is required at "
                       "least 1 for num of sparse_key");
     return 0;
   }
@@ -436,7 +436,7 @@ int32_t BrpcPsService::PushSparseParam(Table *table,
   if (request.params_size() < 1) {
     set_response_code(response,
                       -1,
-                      "PsRequestMessage.params is requeired at "
+                      "PsRequestMessage.params is required at "
                       "least 1 for num of sparse_key");
     return 0;
   }
@@ -515,7 +515,7 @@ int32_t BrpcPsService::PullSparse(Table *table,
   if (request.params_size() < 1) {
     set_response_code(response,
                       -1,
-                      "PsRequestMessage.params is requeired at "
+                      "PsRequestMessage.params is required at "
                       "least 1 for num of sparse_key");
     return 0;
   }
@@ -565,7 +565,7 @@ int32_t BrpcPsService::PushSparse(Table *table,
   if (request.params_size() < 1) {
     set_response_code(response,
                       -1,
-                      "PsRequestMessage.params is requeired at "
+                      "PsRequestMessage.params is required at "
                       "least 1 for num of sparse_key");
     return 0;
   }
@@ -616,7 +616,7 @@ int32_t BrpcPsService::LoadOneTable(Table *table,
     set_response_code(
         response,
         -1,
-        "PsRequestMessage.datas is requeired at least 2 for path & load_param");
+        "PsRequestMessage.datas is required at least 2 for path & load_param");
     return -1;
   }
   if (table->Load(request.params(0), request.params(1)) != 0) {
@@ -649,7 +649,7 @@ int32_t BrpcPsService::SaveOneTable(Table *table,
     set_response_code(
         response,
         -1,
-        "PsRequestMessage.datas is requeired at least 2, path&mode");
+        "PsRequestMessage.datas is required at least 2, path&mode");
     return -1;
   }
   table->Flush();
@@ -691,7 +691,7 @@ int32_t BrpcPsService::SaveCacheTable(Table *table,
     set_response_code(
         response,
         -1,
-        "PsRequestMessage.datas is requeired at least 3, path&mode");
+        "PsRequestMessage.datas is required at least 3, path&mode");
     return -1;
   }
   table->Flush();
@@ -717,7 +717,7 @@ int32_t BrpcPsService::CacheShuffle(Table *table,
   if (request.params_size() < 3) {
     set_response_code(response,
                       -1,
-                      "PsRequestMessage.datas is requeired at least 3, "
+                      "PsRequestMessage.datas is required at least 3, "
                       "path&mode&cache_threshold");
     return -1;
   }
@@ -805,7 +805,7 @@ int32_t BrpcPsService::ShrinkTable(Table *table,
     set_response_code(
         response,
         -1,
-        "PsRequestMessage.datas is requeired at least 1, threshold");
+        "PsRequestMessage.datas is required at least 1, threshold");
     return -1;
   }
   table->Flush();
diff --git a/paddle/fluid/distributed/ps/service/coordinator_client.h b/paddle/fluid/distributed/ps/service/coordinator_client.h
@@ -81,7 +81,7 @@ class CoordinatorServiceHandle {
     lck.unlock();
     VLOG(0) << "last_round_total_fl_clients_num: "
             << last_round_total_fl_clients_num
-            << ", has recved fl client num: " << _fl_clients_count.load();
+            << ", has received fl client num: " << _fl_clients_count.load();
     return;
   }
 
@@ -102,7 +102,7 @@ class CoordinatorServiceHandle {
         timeline.Pause();
         query_wait_time += timeline.ElapsedSec();
       }
-      // LOG(WARNNING) << "fl-ps > query_wait_time exceed!";
+      // LOG(WARNING) << "fl-ps > query_wait_time exceed!";
       return true;
     };
 
diff --git a/paddle/fluid/distributed/ps/service/graph_brpc_server.cc b/paddle/fluid/distributed/ps/service/graph_brpc_server.cc
@@ -247,7 +247,7 @@ void GraphBrpcService::service(google::protobuf::RpcController *cntl_base,
   brpc::ClosureGuard done_guard(done);
   std::string log_label("ReceiveCmd-");
   if (!request->has_table_id()) {
-    set_response_code(*response, -1, "PsRequestMessage.tabel_id is required");
+    set_response_code(*response, -1, "PsRequestMessage.table_id is required");
     return;
   }
 
diff --git a/paddle/fluid/imperative/prepared_operator.h b/paddle/fluid/imperative/prepared_operator.h
@@ -559,7 +559,7 @@ void BuildDygraphPhiKernelContext(const phi::KernelSignature& kernel_signature,
         PADDLE_ENFORCE_NOT_NULL(
             attr_ptr,
             platform::errors::NotFound("(%s) is not found in AttributeMap when "
-                                       "buildind dygraph KernelContext.",
+                                       "building dygraph KernelContext.",
                                        attr_names[i]));
         auto& attr = *attr_ptr;
         switch (attr_defs[i].type_index) {
diff --git a/paddle/fluid/imperative/reducer.cc b/paddle/fluid/imperative/reducer.cc
@@ -493,8 +493,10 @@ void Reducer::PrepareDeps(const std::unordered_set<GradOpNode *> &init_nodes) {
                 "using PyLayer in a DataParallel model, you can skip gradient "
                 "synchronization among multiple cards by 'no_sync', and "
                 "manually implement 'all_reduce' before model optimization. "
-                "There is an example showing specific implemetation processing "
-                "in offical docs: https://www.paddlepaddle.org.cn/documentation"
+                "There is an example showing specific implementation "
+                "processing "
+                "in official docs: "
+                "https://www.paddlepaddle.org.cn/documentation"
                 "/docs/api/paddle/DataParallel_cn.html"));
       }
       ++node_deps_[grad_pending_node.get()];

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ void GraphBrpcService::service(google::protobuf::RpcController *cntl_base,`
`247`	`247`	`brpc::ClosureGuard done_guard(done);`
`248`	`248`	`std::string log_label("ReceiveCmd-");`
`249`	`249`	`if (!request->has_table_id()) {`
`250`		`- set_response_code(*response, -1, "PsRequestMessage.tabel_id is required");`
	`250`	`+ set_response_code(*response, -1, "PsRequestMessage.table_id is required");`
`251`	`251`	`return;`
`252`	`252`	`}`
`253`	`253`