[XPU] Fix some typos on XPU (#69826)

cqulilujia · web-flow · commit e7f09be6f884 · 2024-12-02T14:22:08.000+08:00
diff --git a/paddle/phi/kernels/fusion/xpu/fused_rope_utils.h b/paddle/phi/kernels/fusion/xpu/fused_rope_utils.h
@@ -296,7 +296,7 @@ void XPUFusedRotaryEveryTwo(const Context& dev_ctx,
         num_heads,
         head_dim,
         {seq_len * num_heads * head_dim, num_heads * head_dim, head_dim, 1},
-        std::string("BLHD").c_str(),
+        "BLHD",
         true);
     PADDLE_ENFORCE_XDNN_SUCCESS(ret, single_func_name);
   } else {
@@ -316,7 +316,7 @@ void XPUFusedRotaryEveryTwo(const Context& dev_ctx,
         {seq_len * num_heads * head_dim, num_heads * head_dim, head_dim, 1},
         {seq_len * num_heads_k * head_dim, num_heads_k * head_dim, head_dim, 1},
         num_heads_k,
-        std::string("BLHD").c_str(),
+        "BLHD",
         true);
     PADDLE_ENFORCE_XDNN_SUCCESS(ret, fusion_func_name);
   }
@@ -333,7 +333,7 @@ void XPUFusedRotaryEveryTwo(const Context& dev_ctx,
         num_heads_v,
         head_dim,
         {seq_len * num_heads_v * head_dim, num_heads_v * head_dim, head_dim, 1},
-        std::string("BLHD").c_str(),
+        "BLHD",
         true);
     PADDLE_ENFORCE_XDNN_SUCCESS(ret, single_func_name);
   }
diff --git a/paddle/phi/kernels/fusion/xpu/weight_only_linear_kernel_xpu.cc b/paddle/phi/kernels/fusion/xpu/weight_only_linear_kernel_xpu.cc
@@ -58,21 +58,14 @@ void WeightOnlyLinearKernel(const Context& dev_ctx,
             false,
             weight_dtype == "int8" ? 127.f : 7.f,
             0.f);
-        PADDLE_ENFORCE_EQ(
-            r,
-            0,
-            common::errors::Fatal(
-                "scale failed, scale related variable `r` is %d", r));
+        PADDLE_ENFORCE_XDNN_SUCCESS(r, "scale");
         r = baidu::xpu::api::cast<XPUType, float>(
             xpu_ctx->x_context(),
             reinterpret_cast<const XPUType*>(
                 max_value_fp16.data<phi::dtype::float16>()),
             max_value.data<float>(),
             max_value.numel());
-        PADDLE_ENFORCE_EQ(r,
-                          0,
-                          common::errors::Fatal(
-                              "cast failed, related variable `r` is %d", r));
+        PADDLE_ENFORCE_XDNN_SUCCESS(r, "cast");
       } else if (weight_scale.dtype() == phi::DataType::FLOAT32) {
         r = baidu::xpu::api::scale(xpu_ctx->x_context(),
                                    weight_scale.data<float>(),
@@ -81,10 +74,7 @@ void WeightOnlyLinearKernel(const Context& dev_ctx,
                                    false,
                                    weight_dtype == "int8" ? 127.f : 7.f,
                                    0.f);
-        PADDLE_ENFORCE_EQ(r,
-                          0,
-                          common::errors::Fatal(
-                              "scale failed, related variable `r` is %d", r));
+        PADDLE_ENFORCE_XDNN_SUCCESS(r, "scale");
       } else {
         PADDLE_THROW(common::errors::Unimplemented(
             "Only support that weight scale as type float32 ot float16."));
@@ -129,12 +119,7 @@ void WeightOnlyLinearKernel(const Context& dev_ctx,
                 : nullptr,
             baidu::xpu::api::Activation_t::LINEAR,
             max_value.data<float>());
-        PADDLE_ENFORCE_EQ(r,
-                          0,
-                          common::errors::Fatal(
-                              "baidu::xpu::api::gpt_fc_fusion failed, related "
-                              "variable `r` is %d",
-                              r));
+        PADDLE_ENFORCE_XDNN_SUCCESS(r, "gpt_fc_fusion");
       } else if (weight_dtype == "int4") {
         PD_THROW("only support int8 weight only now");
       }
diff --git a/paddle/phi/kernels/xpu/clip_grad_kernel.cc b/paddle/phi/kernels/xpu/clip_grad_kernel.cc
@@ -36,7 +36,7 @@ void ClipGradKernel(const Context& ctx,
                       x.numel(),
                       static_cast<XPUDataType>(min.to<T>()),
                       static_cast<XPUDataType>(max.to<T>()));
-  PADDLE_ENFORCE_XDNN_SUCCESS(r, "clip_grad");
+  PADDLE_ENFORCE_XDNN_SUCCESS(r, "clamp_grad");
 }
 }  // namespace phi
 

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ void ClipGradKernel(const Context& ctx,`
`36`	`36`	`x.numel(),`
`37`	`37`	`static_cast<XPUDataType>(min.to<T>()),`
`38`	`38`	`static_cast<XPUDataType>(max.to<T>()));`
`39`		`- PADDLE_ENFORCE_XDNN_SUCCESS(r, "clip_grad");`
	`39`	`+ PADDLE_ENFORCE_XDNN_SUCCESS(r, "clamp_grad");`
`40`	`40`	`}`
`41`	`41`	`} // namespace phi`
`42`	`42`