Skip to content

[XPU] Fix some typos on XPU #69826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 2, 2024
Merged

[XPU] Fix some typos on XPU #69826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions paddle/phi/kernels/fusion/xpu/fused_rope_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down
23 changes: 4 additions & 19 deletions paddle/phi/kernels/fusion/xpu/weight_only_linear_kernel_xpu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>(),
Expand All @@ -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."));
Expand Down Expand Up @@ -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");
}
Expand Down
2 changes: 1 addition & 1 deletion paddle/phi/kernels/xpu/clip_grad_kernel.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down