Fix Unsuppored Unsupported (#60984)

co63oc · web-flow · commit 49c5e2ba2e42 · 2024-01-22T10:47:57.000+08:00
diff --git a/paddle/phi/backends/c_comm_lib.h b/paddle/phi/backends/c_comm_lib.h
@@ -59,9 +59,9 @@ inline CCLReduceOp ToXCCLReduceOp(int reduce_type) {
       red_type = phi::ccl::CCLReduceOp::AVG;
       break;
     default:
-      PADDLE_THROW(
-          errors::Unavailable("Unsuppored reduce type. Reduce type must be one "
-                              "of SUM, MAX, MIN, PRODUCT and AVG."));
+      PADDLE_THROW(errors::Unavailable(
+          "Unsupported reduce type. Reduce type must be one "
+          "of SUM, MAX, MIN, PRODUCT and AVG."));
   }
   return red_type;
 }
diff --git a/paddle/phi/backends/device_code.cc b/paddle/phi/backends/device_code.cc
@@ -135,7 +135,7 @@ void GPUDeviceCode::CheckAvailableStatus() {
 #endif
 
   int driver_version = 0;
-  int dirver_major = 0;
+  int driver_major = 0;
   int driver_minor = 0;
 #ifdef PADDLE_WITH_HIP
   hipError_t driver_result = dynload::hipDriverGetVersion(&driver_version);
@@ -144,11 +144,11 @@ void GPUDeviceCode::CheckAvailableStatus() {
   CUresult driver_result = dynload::cuDriverGetVersion(&driver_version);
   if (driver_result == CUDA_SUCCESS) {
 #endif
-    dirver_major = driver_version / 1000;
+    driver_major = driver_version / 1000;
     driver_minor = (driver_version % 1000) / 10;
   }
 
-  LOG_FIRST_N(INFO, 1) << "CUDA Driver Version: " << dirver_major << "."
+  LOG_FIRST_N(INFO, 1) << "CUDA Driver Version: " << driver_major << "."
                        << driver_minor << "; NVRTC Version: " << nvrtc_major
                        << "." << nvrtc_minor;
 #ifdef PADDLE_WITH_HIP
diff --git a/paddle/phi/backends/gpu/cuda/cuda_graph.cc b/paddle/phi/backends/gpu/cuda/cuda_graph.cc
@@ -283,7 +283,7 @@ void CUDAGraphNodeLauncher::KernelNodeLaunch(
     parameterSetter_t parameterSetter,
     cudaKernelCallback_t cudakernelCallback) {
   if (phi::backends::gpu::CUDAGraph::IsThisThreadCapturing()) {
-    unsigned int id = GenerateIndentifier();
+    unsigned int id = GenerateIdentifier();
 
     parameterSetters[cudaFunc][id] = parameterSetter;
     cudakernelCallback(id);
diff --git a/paddle/phi/backends/gpu/cuda/cuda_graph.h b/paddle/phi/backends/gpu/cuda/cuda_graph.h
@@ -174,7 +174,7 @@ class CUDAGraphNodeLauncher {
   CUDAGraphNodeLauncher() : id(0) {}
   DISABLE_COPY_AND_ASSIGN(CUDAGraphNodeLauncher);
 
-  unsigned int GenerateIndentifier() { return id++; }
+  unsigned int GenerateIdentifier() { return id++; }
 
   unsigned int id;
   std::unordered_map<cudaFunction_t, std::map<unsigned int, parameterSetter_t>>
diff --git a/paddle/phi/backends/gpu/gpu_context.cc b/paddle/phi/backends/gpu/gpu_context.cc
@@ -245,8 +245,8 @@ struct GPUContext::Impl {
   ~Impl() {
     backends::gpu::GPUDeviceGuard guard(place_.device);
     if (owned_) {
-      DestoryInternalWorkspace();
-      DestoryInternalEigenDevice();
+      DestroyInternalWorkspace();
+      DestroyInternalEigenDevice();
       phi::DestroySparseHandle(sparse_handle_);
       phi::DestroySolverHandle(solver_handle_);
       phi::DestroyDnnHandle(dnn_handle_);
@@ -283,7 +283,7 @@ struct GPUContext::Impl {
     workspace_ = new DnnWorkspaceHandle(allocator_, stream());
   }
 
-  void DestoryInternalWorkspace() {
+  void DestroyInternalWorkspace() {
     if (owned_ && workspace_ != nullptr) {
       delete workspace_;
       workspace_ = nullptr;
@@ -338,7 +338,7 @@ struct GPUContext::Impl {
     eigen_device_ = new Eigen::GpuDevice(eigen_stream_.get());
   }
 
-  void DestoryInternalEigenDevice() {
+  void DestroyInternalEigenDevice() {
     if (owned_ && eigen_device_ != nullptr) {
       delete eigen_device_;
       eigen_device_ = nullptr;
@@ -479,7 +479,7 @@ struct GPUContext::Impl {
   }
 
   solverHandle_t GetSolverHandle() {
-    std::call_once(flag_slover_, [&]() {
+    std::call_once(flag_solver_, [&]() {
       if (!solver_handle_) {
         if (!solver_handle_creator_) {
           phi::InitSolverHandle(&solver_handle_, stream());
@@ -778,7 +778,7 @@ struct GPUContext::Impl {
   std::once_flag flag_blas_;
   std::once_flag flag_blaslt_;
   std::once_flag flag_dnn_;
-  std::once_flag flag_slover_;
+  std::once_flag flag_solver_;
   std::once_flag flag_cublas_;
   std::once_flag flag_tensorcore_cublas_;
   std::once_flag flag_eigen_device_;
diff --git a/paddle/phi/backends/gpu/gpu_decls.h b/paddle/phi/backends/gpu/gpu_decls.h
@@ -23,7 +23,7 @@ namespace phi {
 #define DECLARE_TYPE_FOR_GPU(GPU_TYPE, CUDA_TYPE, ROCM_TYPE) \
   using GPU_TYPE = ROCM_TYPE;
 
-#else  // PADDLE_WITH_CDUA
+#else  // PADDLE_WITH_CUDA
 
 #define DECLARE_TYPE_FOR_GPU(GPU_TYPE, CUDA_TYPE, ROCM_TYPE) \
   using GPU_TYPE = CUDA_TYPE;
diff --git a/paddle/phi/backends/gpu/gpu_launch_config.h b/paddle/phi/backends/gpu/gpu_launch_config.h
@@ -133,11 +133,11 @@ inline GpuLaunchConfig GetGpuLaunchConfig1D(const phi::GPUContext& context,
   int64_t active_threads_num = numel / vec_size;
   if (active_threads_num / (sm_count << 1) < limit_threads) {
     // Round up threads number into an exponential multiple of 2, while number
-    // of acitve blocks is about twice of SM, to acquire better performance.
+    // of active blocks is about twice of SM, to acquire better performance.
     threads = RoundToPowerOfTwo(active_threads_num / (sm_count << 1));
   } else if (active_threads_num / (sm_count << 2) < limit_threads) {
     // Round up threads number into an exponential multiple of 2, while number
-    // of acitve blocks is about 4 times of SM, to acquire better performance.
+    // of active blocks is about 4 times of SM, to acquire better performance.
     threads = RoundToPowerOfTwo(active_threads_num / (sm_count << 2));
   }
   // Number of threads per block shall be larger than 64.
diff --git a/paddle/phi/backends/gpu/gpu_types.h b/paddle/phi/backends/gpu/gpu_types.h
@@ -33,7 +33,7 @@ namespace phi {
 #define DECLARE_TYPE_FOR_GPU(GPU_TYPE, CUDA_TYPE, ROCM_TYPE) \
   using GPU_TYPE = ROCM_TYPE;
 
-#else  // PADDLE_WITH_CDUA
+#else  // PADDLE_WITH_CUDA
 
 #define DECLARE_TYPE_FOR_GPU(GPU_TYPE, CUDA_TYPE, ROCM_TYPE) \
   using GPU_TYPE = CUDA_TYPE;
diff --git a/paddle/phi/backends/stream.cc b/paddle/phi/backends/stream.cc
@@ -44,7 +44,7 @@ const stream_t& Stream::raw_stream() const { return stream_; }
 
 void Stream::set_stream(stream_t stream) { stream_ = stream; }
 
-// For compatiable
+// For compatible
 Stream::Stream(const Place& place, stream_t stream)
     : place_(place),
       device_(phi::DeviceManager::GetDeviceWithPlace(place)),
diff --git a/paddle/phi/backends/xpu/xpu_info.cc b/paddle/phi/backends/xpu/xpu_info.cc
@@ -56,11 +56,11 @@ int GetDriverVersion() {
 
 //! Get the version of XPU Runtime
 int GetRuntimeVersion() {
-  uint32_t rumtime_version_major = 0;
-  uint32_t rumtime_version_minor = 0;
+  uint32_t runtime_version_major = 0;
+  uint32_t runtime_version_minor = 0;
   PADDLE_ENFORCE_XPU_SUCCESS(
-      xpu_get_runtime_version(&rumtime_version_major, &rumtime_version_minor));
-  int runtime_version = rumtime_version_major * 10 + rumtime_version_minor;
+      xpu_get_runtime_version(&runtime_version_major, &runtime_version_minor));
+  int runtime_version = runtime_version_major * 10 + runtime_version_minor;
   return runtime_version;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ inline CCLReduceOp ToXCCLReduceOp(int reduce_type) {`
`59`	`59`	`red_type = phi::ccl::CCLReduceOp::AVG;`
`60`	`60`	`break;`
`61`	`61`	`default:`
`62`		`- PADDLE_THROW(`
`63`		`- errors::Unavailable("Unsuppored reduce type. Reduce type must be one "`
`64`		`- "of SUM, MAX, MIN, PRODUCT and AVG."));`
	`62`	`+ PADDLE_THROW(errors::Unavailable(`
	`63`	`+ "Unsupported reduce type. Reduce type must be one "`
	`64`	`+ "of SUM, MAX, MIN, PRODUCT and AVG."));`
`65`	`65`	`}`
`66`	`66`	`return red_type;`
`67`	`67`	`}`