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.

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

[PHI] Migrate softplus kernel #47406

Merged
merged 51 commits into from
Nov 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
00c2aca
add extra attr property set
chenwhql Sep 20, 2022
28e9710
add type_info for all context
chenwhql Sep 21, 2022
cd630f0
add onednn context to all context
chenwhql Sep 21, 2022
d633672
fix context compile error
chenwhql Sep 23, 2022
d651bf9
simplify conv kernel args
chenwhql Sep 23, 2022
84c56fa
pass runtime attr into dev_ctx
chenwhql Sep 26, 2022
24ea5b4
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Sep 26, 2022
fc67372
fix marco error
chenwhql Sep 26, 2022
ed7b59f
clear conv_grad_kernel extra args
chenwhql Sep 28, 2022
23cab07
merge conv_grad_grad into conv_grad
chenwhql Sep 28, 2022
123edd2
clear conv2d_grad_grad extra attrs
chenwhql Sep 28, 2022
d29a519
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Sep 28, 2022
b3aaf86
remove redundant imports
Silv3S Sep 29, 2022
3839f84
migrate softmax
Silv3S Sep 29, 2022
853b1db
clear yaml and eager extra attr
chenwhql Sep 30, 2022
62ce48b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Sep 30, 2022
de52450
fix conv1d error
chenwhql Oct 10, 2022
2c55350
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Oct 10, 2022
03f6893
change to thread local
chenwhql Oct 11, 2022
49bcebe
fix npu compile failed
chenwhql Oct 11, 2022
ada7d0c
try to fix windows compile failed
chenwhql Oct 11, 2022
22ccfa9
add conv2d onednn phi kernel
chenwhql Oct 13, 2022
9602334
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Oct 14, 2022
6331512
fix ci bugs (#36)
YuanRisheng Oct 17, 2022
37afcf6
fix compile bugs (#38)
YuanRisheng Oct 17, 2022
39e2529
fix extra input transform bug (#39)
YuanRisheng Oct 18, 2022
16d595c
support dynamic created attr (#40)
YuanRisheng Oct 21, 2022
0d61412
resolve conflict with develop
chenwhql Oct 23, 2022
722b256
Merge branch 'adapto_extra_attr_in_phi' of https://github.com/chenwhq…
chenwhql Oct 23, 2022
8d59887
resolve conflict with develop
chenwhql Oct 24, 2022
c0cdb15
reset extra info gen code
chenwhql Oct 24, 2022
42bc76b
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
chenwhql Oct 24, 2022
dafdbcc
rm conv_grad_grad kernel
chenwhql Oct 24, 2022
e6d5312
reimpl pass attr adapting
chenwhql Oct 24, 2022
2b7c43d
resolve conflict with develop
chenwhql Oct 24, 2022
12e18f1
add int attr support
chenwhql Oct 24, 2022
2ea1a2b
remove vector inputnames creating
chenwhql Oct 25, 2022
d32b0be
Merge branch 'develop' into phi_migration_part_7
Silv3S Oct 25, 2022
b80ef68
merge dev
Silv3S Oct 25, 2022
148eebc
fix map at error
chenwhql Oct 25, 2022
2d42912
adjust attribute
Silv3S Oct 25, 2022
35b47af
Merge remote-tracking branch 'chen/adapto_extra_attr_in_phi' into sof…
Silv3S Oct 25, 2022
9111348
adapt funcs to PHI
Silv3S Oct 25, 2022
d92c4c7
Merge branch 'develop' into softmax_attributes
Silv3S Oct 27, 2022
4050733
init
Silv3S Oct 27, 2022
694f3be
adjust imports
Silv3S Oct 27, 2022
bbd33eb
support postops
Silv3S Oct 27, 2022
d4e7b66
format codeblocks
Silv3S Oct 27, 2022
d8c988d
Merge branch 'develop' into phi_softplus
Silv3S Nov 2, 2022
83ba50b
revert changes to softmax
Silv3S Nov 2, 2022
39738a0
Merge branch 'develop' into phi_softplus
Silv3S Nov 3, 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
65 changes: 0 additions & 65 deletions paddle/fluid/operators/mkldnn/activation_mkldnn_op.cc

This file was deleted.

105 changes: 0 additions & 105 deletions paddle/fluid/operators/mkldnn/softplus_mkldnn_op.h

This file was deleted.

100 changes: 100 additions & 0 deletions paddle/phi/kernels/onednn/softplus_kernel.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
// Copyright (c) 2022 PaddlePaddle Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

#include "paddle/phi/kernels/activation_kernel.h"

#include "paddle/phi/backends/onednn/onednn_reuse.h"
#include "paddle/phi/core/kernel_registry.h"

namespace phi {

template <typename T>
class SoftplusOneDNNHandler
: public funcs::OneDNNHandlerNoCachingT<T, dnnl::binary> {
public:
SoftplusOneDNNHandler(const OneDNNContext& dev_ctx,
const phi::DenseTensor* x,
const float beta)
: funcs::OneDNNHandlerNoCachingT<T, dnnl::binary>(dev_ctx.GetEngine(),
dev_ctx.GetPlace()) {
dnnl::post_ops post_ops;
post_ops.append_eltwise(
1.0f, dnnl::algorithm::eltwise_soft_relu, 0.0f, 0.0f);
if (beta != 1.0f) {
post_ops.append_eltwise(
1.0f, dnnl::algorithm::eltwise_linear, 1.0f / beta, 0.0f);
}
funcs::AppendActivation(dev_ctx, post_ops);
dnnl::primitive_attr attrs;
attrs.set_post_ops(post_ops);

auto x_tz = phi::vectorize(x->dims());
auto beta_tz = std::vector<int64_t>(x_tz.size(), 1);
auto beta_md = dnnl::memory::desc(beta_tz,
funcs::OneDNNGetDataType<T>(),
funcs::GetPlainOneDNNFormat(x_tz.size()));

this->AcquireForwardPrimitiveDescriptor(attrs,
dnnl::algorithm::binary_mul,
x->mem_desc(),
beta_md,
x->mem_desc());
}

std::shared_ptr<dnnl::memory> AcquireBetaMemory(const float* beta) {
return this->AcquireMemoryFromPrimitive(this->fwd_pd_->src1_desc(),
funcs::to_void_cast<float>(beta));
}
};

template <typename T, typename Context>
void SoftplusKernel(const Context& dev_ctx,
const DenseTensor& x,
float beta,
float threshold,
DenseTensor* out) {
SoftplusOneDNNHandler<T> handler(dev_ctx, &x, beta);

auto src_memory_p = handler.AcquireSrcMemory(&x);
auto beta_memory_p = handler.AcquireBetaMemory(&beta);
std::shared_ptr<dnnl::memory> dst_memory_p = nullptr;
if (x.IsSharedBufferWith(*out)) {
dst_memory_p = src_memory_p;
dev_ctx.template Alloc<T>(out);
} else {
dst_memory_p = handler.AcquireDstMemory(out);
}
auto binary_p = handler.AcquireForwardPrimitive();

auto& astream = OneDNNContext::tls().get_stream();

const std::unordered_map<int, dnnl::memory> args = {
{DNNL_ARG_SRC_0, *src_memory_p},
{DNNL_ARG_SRC_1, *beta_memory_p},
{DNNL_ARG_DST, *dst_memory_p}};

binary_p->execute(astream, args);
astream.wait();

out->set_mem_desc(dst_memory_p->get_desc());
}

} // namespace phi

PD_REGISTER_KERNEL(softplus,
OneDNN,
ONEDNN,
phi::SoftplusKernel,
float,
phi::dtype::bfloat16) {}