Skip to content

【CUDA Kernel No.11、41】算子Kernel修复 #2236

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

Open
Le-soleile wants to merge 15 commits into
base: develop
Choose a base branch
from
Open

【CUDA Kernel No.11、41】算子Kernel修复 #2236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
30bfa0f
fix
Le-soleile Nov 29, 2025
e58f073
fix
Le-soleile Nov 29, 2025
e81294d
The original code naming convention has not been updated
Le-soleile Dec 2, 2025
7786ec5
Merge branch 'develop' into 11、41
Le-soleile Dec 2, 2025
4f643bd
Merge branch 'develop' into 11、41
Le-soleile Dec 3, 2025
e1610c2
Merge branch 'develop' into 11、41
YqGe585 Dec 4, 2025
c13ab6b
Update data type conversion functions in CUDA kernels
Le-soleile Dec 8, 2025
b48658e
Merge branch 'develop' into 11、41
Le-soleile Dec 8, 2025
652a841
Update complex_kernel_register.cu
Le-soleile Dec 8, 2025
c3cba2b
Update data type functions in complex kernel register
Le-soleile Dec 8, 2025
77f02a3
Fix include path for fused_softmax_mask_upper_triangle
Le-soleile Dec 14, 2025
ce6080d
Fix include statement for fused_softmax_mask_upper_triangle
Le-soleile Dec 14, 2025
4b77379
Merge branch 'develop' into 11、41
Le-soleile Dec 14, 2025
82339b4
Update fused_softmax_mask_upper_triangle_kernel_register.cu
Le-soleile Dec 14, 2025
e436cc4
Update fused_softmax_mask_upper_triangle_kernel_register.cu
Le-soleile Dec 14, 2025
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
9 changes: 5 additions & 4 deletions backends/iluvatar_gpu/kernels/cuda_kernels/complex_kernel_register.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/phi/common/data_type.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/gpu/complex_kernel.cu" // NOLINT
#include "paddle/phi/kernels/complex_kernel.h"

PD_CUSTOM_KERNEL_REGISTER(conj,
iluvatar_gpu,
Expand All @@ -34,7 +35,7 @@ PD_CUSTOM_KERNEL_REGISTER(real,
phi::RealKernel,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {
kernel->OutputAt(0).SetDataType(phi::dtype::ToReal(kernel_key.dtype()));
kernel->OutputAt(0).SetDataType(phi::ToRealType(kernel_key.dtype()));
}

PD_CUSTOM_KERNEL_REGISTER(imag,
Expand All @@ -43,10 +44,10 @@ PD_CUSTOM_KERNEL_REGISTER(imag,
phi::ImagKernel,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {
kernel->OutputAt(0).SetDataType(phi::dtype::ToReal(kernel_key.dtype()));
kernel->OutputAt(0).SetDataType(phi::ToRealType(kernel_key.dtype()));
}

PD_CUSTOM_KERNEL_REGISTER(
complex, iluvatar_gpu, ALL_LAYOUT, phi::ComplexKernel, float, double) {
kernel->OutputAt(0).SetDataType(phi::dtype::ToComplex(kernel_key.dtype()));
kernel->OutputAt(0).SetDataType(phi::ToComplexType(kernel_key.dtype()));
}
1 change: 0 additions & 1 deletion ...ds/iluvatar_gpu/kernels/cuda_kernels/fused_softmax_mask_upper_triangle_kernel_register.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
// limitations under the License.
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/fused_softmax_mask_upper_triangle_kernel.h"
#include "paddle/phi/kernels/fusion/gpu/fused_softmax_mask_upper_triangle_kernel.cu" // NOLINT
#include "paddle/phi/kernels/fusion/gpu/fused_softmax_mask_upper_triangle_utils.h"

PD_CUSTOM_KERNEL_REGISTER(fused_softmax_mask_upper_triangle,
Expand Down
9 changes: 5 additions & 4 deletions backends/metax_gpu/kernels/cuda_kernels/complex_kernel_register.cu
View file
Open in desktop
Copy link
Member

@YqGe585 YqGe585 Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

编译报错https://github.com/PaddlePaddle/PaddleCustomDevice/actions/runs/19928332563/job/57133953009?pr=2236#step:6:3099
phi::dtype::ToReal需要某个头文件，否则缺少声明导致编译报错

Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/phi/common/data_type.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/gpu/complex_kernel.cu" // NOLINT
#include "paddle/phi/kernels/complex_kernel.h"

PD_CUSTOM_KERNEL_REGISTER(conj,
metax_gpu,
Expand All @@ -34,7 +35,7 @@ PD_CUSTOM_KERNEL_REGISTER(real,
phi::RealKernel,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {
kernel->OutputAt(0).SetDataType(phi::dtype::ToReal(kernel_key.dtype()));
kernel->OutputAt(0).SetDataType(phi::ToRealType(kernel_key.dtype()));
}

PD_CUSTOM_KERNEL_REGISTER(imag,
Expand All @@ -43,10 +44,10 @@ PD_CUSTOM_KERNEL_REGISTER(imag,
phi::ImagKernel,
phi::dtype::complex<float>,
phi::dtype::complex<double>) {
kernel->OutputAt(0).SetDataType(phi::dtype::ToReal(kernel_key.dtype()));
kernel->OutputAt(0).SetDataType(phi::ToRealType(kernel_key.dtype()));
}

PD_CUSTOM_KERNEL_REGISTER(
complex, metax_gpu, ALL_LAYOUT, phi::ComplexKernel, float, double) {
kernel->OutputAt(0).SetDataType(phi::dtype::ToComplex(kernel_key.dtype()));
kernel->OutputAt(0).SetDataType(phi::ToComplexType(kernel_key.dtype()));
}
1 change: 0 additions & 1 deletion backends/metax_gpu/kernels/fusion/fused_softmax_mask_upper_triangle_kernel_register.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
// limitations under the License.
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/fused_softmax_mask_upper_triangle_kernel.h"
#include "paddle/phi/kernels/fusion/gpu/fused_softmax_mask_upper_triangle_kernel.cu" // NOLINT
#include "paddle/phi/kernels/fusion/gpu/fused_softmax_mask_upper_triangle_utils.h"

PD_CUSTOM_KERNEL_REGISTER(fused_softmax_mask_upper_triangle,
Expand Down
Loading