Fix CPUAPlace CPUPlace, etc (#62214)

co63oc · web-flow · commit 4e0779cbfc02 · 2024-02-29T23:24:07.000+08:00
diff --git a/paddle/fluid/platform/collective_helper.cc b/paddle/fluid/platform/collective_helper.cc
@@ -183,7 +183,7 @@ void NCCLCommContext::CreateNCCLCommMultiTrainer(
       VLOG(1) << "ncclCommInitRank: " << i;
     }
     PADDLE_ENFORCE_GPU_SUCCESS(dynload::ncclGroupEnd());
-    VLOG(1) << "nccl group end seccessss";
+    VLOG(1) << "nccl group end success";
   }
   PADDLE_ENFORCE_EQ(comm_map_.count(ring_id),
                     0,
@@ -261,7 +261,7 @@ NCCLComm* NCCLCommContext::AssignNCCLComm(
             platform::CUDAPlace(dev_id)));
     dev_ctx->set_nccl_comm(comm);
   }
-  VLOG(4) << "add mccl comm: " << comm_map_[ring_id][dev_id].get()
+  VLOG(4) << "add nccl comm: " << comm_map_[ring_id][dev_id].get()
           << ", ring_id:" << ring_id << ", dev_id:" << dev_id;
   return comm_map_[ring_id][dev_id].get();
 }
diff --git a/paddle/fluid/platform/device_event_base.cc b/paddle/fluid/platform/device_event_base.cc
@@ -66,9 +66,9 @@ void DeviceEventRecordCPU(DeviceEvent* event, const DeviceContext* context) {
   auto* wrapper = static_cast<CPUDeviceEventWrapper*>(event->GetEvent().get());
 
   std::unique_lock<std::mutex> lock(wrapper->mutex_);
-  // NOTE: As for CudaEvent_t, it can be used to Record() repeatly. CudaEvent_t
-  // internally reset its status from finished into initialized.
-  // So we simulate the process here.
+  // NOTE: As for CudaEvent_t, it can be used to Record() repeatedly.
+  // CudaEvent_t internally reset its status from finished into initialized. So
+  // we simulate the process here.
   if (wrapper->status_.load() == EventStatus::SUCCESS) {
     VLOG(3) << "Found EventStatus is SUCCESS before RecordCPU. Reset it into "
                "INITIALIZED.";
diff --git a/paddle/fluid/platform/device_event_cpu.h b/paddle/fluid/platform/device_event_cpu.h
@@ -30,7 +30,7 @@ struct CPUDeviceEventWrapper {
         platform::is_cpu_place(place),
         true,
         platform::errors::PreconditionNotMet(
-            "Required device shall be CPUAPlace, but received %d. ", place));
+            "Required device shall be CPUPlace, but received %d. ", place));
   }
   std::mutex mutex_;
   std::condition_variable cv_completed_;
diff --git a/paddle/fluid/platform/device_event_test.cc b/paddle/fluid/platform/device_event_test.cc
@@ -63,7 +63,7 @@ TEST(DeviceEvent, CUDA) {
   status = event.Query();
   ASSERT_EQ(status, false);  // async
 
-  event.Wait(kCPU, context);  // step 3. EventSynchornize
+  event.Wait(kCPU, context);  // step 3. EventSynchronize
   status = event.Query();
   ASSERT_EQ(status, true);  // sync
 
@@ -114,7 +114,7 @@ TEST(DeviceEvent, CUDA) {
   status = event.Query();
   ASSERT_EQ(status, false);  // async
 
-  event.Wait(kCPU, context);  // step 3. EventSynchornize
+  event.Wait(kCPU, context);  // step 3. EventSynchronize
   status = event.Query();
   ASSERT_EQ(status, true);  // sync
 
diff --git a/paddle/fluid/platform/profiler/chrometracing_logger.cc b/paddle/fluid/platform/profiler/chrometracing_logger.cc
@@ -788,7 +788,7 @@ void ChromeTracingLogger::RefineDisplayName(
     "name": "process_name", "pid": %lld, "tid": %lld,
     "ph": "M",
     "args": {
-      "name": "Deivce %lld (%s)"
+      "name": "Device %lld (%s)"
     }
   },
    {
diff --git a/paddle/fluid/platform/profiler/chrometracing_logger.h b/paddle/fluid/platform/profiler/chrometracing_logger.h
@@ -57,7 +57,7 @@ class ChromeTracingLogger : public BaseLogger {
   void RefineDisplayName(std::unordered_map<std::string, std::string>);
   std::string filename_;
   std::ofstream output_file_stream_;
-  static const char* categary_name_[];
+  static const char* category_name_[];
   std::set<std::pair<uint64_t, uint64_t>> pid_tid_set_;
   std::set<std::pair<uint64_t, uint64_t>> deviceid_streamid_set_;
   uint64_t start_time_;
diff --git a/paddle/fluid/platform/profiler/dump/deserialization_reader.cc b/paddle/fluid/platform/profiler/dump/deserialization_reader.cc
@@ -44,12 +44,12 @@ std::unique_ptr<ProfilerResult> DeserializationReader::Parse() {
     return nullptr;
   }
   // restore extra info
-  ExtraInfo extrainfo;
+  ExtraInfo extra_info;
   for (auto indx = 0; indx < node_trees_proto_->extra_info_size(); indx++) {
     ExtraInfoMap extra_info_map = node_trees_proto_->extra_info(indx);
-    extrainfo.AddExtraInfo(extra_info_map.key(),
-                           std::string("%s"),
-                           extra_info_map.value().c_str());
+    extra_info.AddExtraInfo(extra_info_map.key(),
+                            std::string("%s"),
+                            extra_info_map.value().c_str());
   }
 
   // restore NodeTrees
@@ -139,10 +139,10 @@ std::unique_ptr<ProfilerResult> DeserializationReader::Parse() {
         RestoreDeviceProperty(device_property_proto);
   }
   ProfilerResult* profiler_result_ptr =
-      new ProfilerResult(std::move(tree), extrainfo, device_property_map);
+      new ProfilerResult(std::move(tree), extra_info, device_property_map);
 #else
   ProfilerResult* profiler_result_ptr =
-      new ProfilerResult(std::move(tree), extrainfo);
+      new ProfilerResult(std::move(tree), extra_info);
 #endif
   // restore version and span indx
   profiler_result_ptr->SetVersion(node_trees_proto_->version());
diff --git a/paddle/fluid/platform/profiler/dump/serialization_logger.h b/paddle/fluid/platform/profiler/dump/serialization_logger.h
@@ -21,7 +21,7 @@ limitations under the License. */
 namespace paddle {
 namespace platform {
 
-// Dump a NodeTrees into a profobuf file.
+// Dump a NodeTrees into a protobuf file.
 // A SerializationLogger object can only dump a NodeTrees object,
 // creates a file in the constructor and closes the file in the destructor.
 // Should only call LogNodeTrees and LogMetaInfo.
diff --git a/paddle/fluid/platform/profiler/event_tracing.h b/paddle/fluid/platform/profiler/event_tracing.h
@@ -28,7 +28,7 @@ namespace platform {
 // Chrome Trace Viewer Format: Instant Event
 struct RecordInstantEvent {
   /**
-   * @param name: It is the caller's reponsibility to manage the underlying
+   * @param name: It is the caller's responsibility to manage the underlying
    * storage. RecordInstantEvent stores the pointer.
    * @param type: Classification which is used to instruct the profiling
    * data statistics.
diff --git a/paddle/fluid/platform/profiler/profiler.cc b/paddle/fluid/platform/profiler/profiler.cc
@@ -148,19 +148,19 @@ std::unique_ptr<ProfilerResult> Profiler::Stop() {
                     collector.MemEvents(),
                     collector.OperatorSupplementEvents()));
   cpu_utilization_.RecordEndTimeInfo();
-  ExtraInfo extrainfo;
-  extrainfo.AddExtraInfo(std::string("System Cpu Utilization"),
-                         std::string("%f"),
-                         cpu_utilization_.GetCpuUtilization());
-  extrainfo.AddExtraInfo(std::string("Process Cpu Utilization"),
-                         std::string("%f"),
-                         cpu_utilization_.GetCpuCurProcessUtilization());
+  ExtraInfo extra_info;
+  extra_info.AddExtraInfo(std::string("System Cpu Utilization"),
+                          std::string("%f"),
+                          cpu_utilization_.GetCpuUtilization());
+  extra_info.AddExtraInfo(std::string("Process Cpu Utilization"),
+                          std::string("%f"),
+                          cpu_utilization_.GetCpuCurProcessUtilization());
   const std::unordered_map<uint64_t, std::string> thread_names =
       collector.ThreadNames();
   for (const auto& kv : thread_names) {
-    extrainfo.AddExtraInfo(string_format(std::string("%llu"), kv.first),
-                           std::string("%s"),
-                           kv.second.c_str());
+    extra_info.AddExtraInfo(string_format(std::string("%llu"), kv.first),
+                            std::string("%s"),
+                            kv.second.c_str());
   }
 #if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
   std::map<uint32_t, gpuDeviceProp> device_property_map;
@@ -170,10 +170,10 @@ std::unique_ptr<ProfilerResult> Profiler::Stop() {
     device_property_map[device_id] = device_property;
   }
   ProfilerResult* profiler_result_ptr = new platform::ProfilerResult(
-      std::move(tree), extrainfo, device_property_map);
+      std::move(tree), extra_info, device_property_map);
 #else
   ProfilerResult* profiler_result_ptr =
-      new platform::ProfilerResult(std::move(tree), extrainfo);
+      new platform::ProfilerResult(std::move(tree), extra_info);
 #endif
   profiler_result_ptr->SetVersion(std::string(version));
   profiler_result_ptr->SetSpanIndx(span_indx);
diff --git a/paddle/fluid/platform/profiler/utils.cc b/paddle/fluid/platform/profiler/utils.cc
@@ -145,16 +145,16 @@ float CalculateEstOccupancy(uint32_t DeviceId,
 #endif  // PADDLE_WITH_CUPTI
 
 const char* StringTracerMemEventType(TracerMemEventType type) {
-  static const char* categary_name_[] = {// NOLINT
+  static const char* category_name_[] = {// NOLINT
                                          "Allocate",
                                          "Free",
                                          "ReservedAllocate",
                                          "ReservedFree"};
-  return categary_name_[static_cast<int>(type)];
+  return category_name_[static_cast<int>(type)];
 }
 
 const char* StringTracerEventType(TracerEventType type) {
-  static const char* categary_name_[] = {"Operator",  // NOLINT
+  static const char* category_name_[] = {"Operator",  // NOLINT
                                          "Dataloader",
                                          "ProfileStep",
                                          "CudaRuntime",
@@ -169,7 +169,7 @@ const char* StringTracerEventType(TracerEventType type) {
                                          "Communication",
                                          "PythonOp",
                                          "PythonUserDefined"};
-  return categary_name_[static_cast<int>(type)];
+  return category_name_[static_cast<int>(type)];
 }
 
 }  // namespace platform
diff --git a/paddle/fluid/platform/profiler_helper.h b/paddle/fluid/platform/profiler_helper.h
@@ -740,7 +740,7 @@ void AnalyzeEvent(
     size_t *max_name_width,
     OverHead *overhead,
     bool merge_thread) {
-  // In oreder to deal with special event in main thread
+  // In order to deal with special event in main thread
   std::set<std::string> main_thread_event_name;
   for (size_t i = 0; i < (*analyze_events).size(); i++) {
     for (size_t j = 0; j < (*analyze_events)[i].size(); j++) {

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ void NCCLCommContext::CreateNCCLCommMultiTrainer(`
`183`	`183`	`VLOG(1) << "ncclCommInitRank: " << i;`
`184`	`184`	`}`
`185`	`185`	`PADDLE_ENFORCE_GPU_SUCCESS(dynload::ncclGroupEnd());`
`186`		`- VLOG(1) << "nccl group end seccessss";`
	`186`	`+ VLOG(1) << "nccl group end success";`
`187`	`187`	`}`
`188`	`188`	`PADDLE_ENFORCE_EQ(comm_map_.count(ring_id),`
`189`	`189`	`0,`
`@@ -261,7 +261,7 @@ NCCLComm* NCCLCommContext::AssignNCCLComm(`
`261`	`261`	`platform::CUDAPlace(dev_id)));`
`262`	`262`	`dev_ctx->set_nccl_comm(comm);`
`263`	`263`	`}`
`264`		`- VLOG(4) << "add mccl comm: " << comm_map_[ring_id][dev_id].get()`
	`264`	`+ VLOG(4) << "add nccl comm: " << comm_map_[ring_id][dev_id].get()`
`265`	`265`	`<< ", ring_id:" << ring_id << ", dev_id:" << dev_id;`
`266`	`266`	`return comm_map_[ring_id][dev_id].get();`
`267`	`267`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ struct CPUDeviceEventWrapper {`
`30`	`30`	`platform::is_cpu_place(place),`
`31`	`31`	`true,`
`32`	`32`	`platform::errors::PreconditionNotMet(`
`33`		`- "Required device shall be CPUAPlace, but received %d. ", place));`
	`33`	`+ "Required device shall be CPUPlace, but received %d. ", place));`
`34`	`34`	`}`
`35`	`35`	`std::mutex mutex_;`
`36`	`36`	`std::condition_variable cv_completed_;`
Original file line number	Diff line number	Diff line change
`@@ -788,7 +788,7 @@ void ChromeTracingLogger::RefineDisplayName(`
`788`	`788`	`"name": "process_name", "pid": %lld, "tid": %lld,`
`789`	`789`	`"ph": "M",`
`790`	`790`	`"args": {`
`791`		`- "name": "Deivce %lld (%s)"`
	`791`	`+ "name": "Device %lld (%s)"`
`792`	`792`	`}`
`793`	`793`	`},`
`794`	`794`	`{`