Skip to content
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

Jump to bottom

[Kernel Selection] Simplify kernel selection process in phi, reduce search number to half #47771

Merged
merged 4 commits into from
Dec 9, 2022
Merged

[Kernel Selection] Simplify kernel selection process in phi, reduce search number to half #47771

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9cb3aa8
simplify SelectKernelOrThrowError function in phi
jiahy0825 Nov 8, 2022
a8c201c
opt kernel_selection process
jiahy0825 Dec 7, 2022
4d4d9e9
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
jiahy0825 Dec 8, 2022
dc16870
polish code, fix backend error
jiahy0825 Dec 8, 2022
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
24 changes: 4 additions & 20 deletions paddle/phi/core/kernel_factory.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,16 +113,13 @@ KernelResult KernelFactory::SelectKernelOrThrowError(
kernels_.end(),
phi::errors::NotFound("The kernel `%s` is not registered.", kernel_name));

KernelKey kernel_key = const_kernel_key;
KernelKey kernel_key = KernelKey(const_kernel_key.backend(),
phi::DataLayout::ALL_LAYOUT,
const_kernel_key.dtype());
#if defined(PADDLE_WITH_CUDA) || defined(PADDLE_WITH_HIP)
if (kernel_key.backend() == Backend::GPUDNN) {
auto kernel_iter = iter->second.find(
{Backend::GPUDNN, kernel_key.layout(), kernel_key.dtype()});
if (kernel_iter == iter->second.end() &&
kernel_key.layout() != phi::DataLayout::ALL_LAYOUT) {
kernel_iter = iter->second.find(
{Backend::GPUDNN, DataLayout::ALL_LAYOUT, kernel_key.dtype()});
}
{Backend::GPUDNN, phi::DataLayout::ALL_LAYOUT, kernel_key.dtype()});
if (kernel_iter != iter->second.end()) {
return {kernel_iter->second, false};
}
Expand All @@ -131,13 +128,6 @@ KernelResult KernelFactory::SelectKernelOrThrowError(
}
#endif
auto kernel_iter = iter->second.find(kernel_key);
// TODO(chenweihang): polish refind impl here
if (kernel_iter == iter->second.end() &&
kernel_key.layout() != phi::DataLayout::ALL_LAYOUT) {
phi::KernelKey any_layout_kernel_key(
kernel_key.backend(), phi::DataLayout::ALL_LAYOUT, kernel_key.dtype());
kernel_iter = iter->second.find(any_layout_kernel_key);
}

PADDLE_ENFORCE_NE(
kernel_iter == iter->second.end() && kernel_key.backend() == Backend::CPU,
Expand All @@ -161,12 +151,6 @@ KernelResult KernelFactory::SelectKernelOrThrowError(
phi::KernelKey cpu_kernel_key(
phi::Backend::CPU, kernel_key.layout(), kernel_key.dtype());
kernel_iter = iter->second.find(cpu_kernel_key);
if (kernel_iter == iter->second.end() &&
kernel_key.layout() != phi::DataLayout::ALL_LAYOUT) {
phi::KernelKey any_layout_kernel_key(
phi::Backend::CPU, phi::DataLayout::ALL_LAYOUT, kernel_key.dtype());
kernel_iter = iter->second.find(any_layout_kernel_key);
}

PADDLE_ENFORCE_NE(
kernel_iter,
Expand Down