-
Notifications
You must be signed in to change notification settings - Fork 5.6k
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] transpose2_grad op migration #46139
Merged
YuanRisheng
merged 22 commits into
PaddlePaddle:develop
from
paulinagacek:transpose2_grad_op_migration
Oct 10, 2022
Merged
Changes from 13 commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
ebd80bf
op migrated, Copy(OneDNNContext, ...) added
paulinagacek 490e6dc
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek addde63
mutable_data & op registration in fluid removed
paulinagacek 35ec9b7
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek 28ffdb7
Merge branch 'transpose2_grad_op_migration' of https://github.com/Pau…
paulinagacek 78f8af6
refactoring
paulinagacek 8501e7f
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek fbe2c5d
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek bd49216
OneDNNGetDataType to uppercase
paulinagacek fa1369b
missing cpu check added, handler moved to .h file
paulinagacek d2603a1
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek 2cbe8f4
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek d566a95
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek d33d261
name changed to transpose_grad
paulinagacek 6d8de58
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek 372b367
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek cf4eaf0
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek 131bdc3
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek 6a344c8
Copy changed back to TensorCopy
paulinagacek e70eb82
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek 9470a6c
Resizing corrected, Copy(OneDNNContext) removed
paulinagacek 14881c2
Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…
paulinagacek File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
// 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/transpose_grad_kernel.h" | ||
|
||
#include "paddle/phi/backends/onednn/onednn_reuse.h" | ||
#include "paddle/phi/core/kernel_registry.h" | ||
|
||
namespace phi { | ||
template <typename T, typename Context> | ||
void TransposeGradKernel(const Context& dev_ctx, | ||
const DenseTensor& out_grad, | ||
const std::vector<int>& axis, | ||
DenseTensor* x_grad) { | ||
PADDLE_ENFORCE_EQ(dev_ctx.GetPlace().GetType() == phi::AllocationType::CPU, | ||
true, | ||
errors::PreconditionNotMet( | ||
"Operator DNNL TransposeGrad must use CPUPlace")); | ||
if (!x_grad) return; | ||
|
||
const auto& onednn_engine = dev_ctx.GetEngine(); | ||
std::vector<int> reversed_axis(axis); | ||
int ndims = axis.size(); | ||
if (ndims == 1) { | ||
Copy(dev_ctx, out_grad, out_grad.place(), false, x_grad); | ||
x_grad->set_format(out_grad.format()); | ||
return; | ||
} | ||
|
||
for (size_t i = 0; i < axis.size(); i++) { | ||
reversed_axis[axis[i]] = i; | ||
} | ||
|
||
const T* out_grad_data = out_grad.data<T>(); | ||
dev_ctx.template Alloc<T>(x_grad); | ||
auto nchw_tz = vectorize<int64_t>(out_grad.dims()); | ||
|
||
funcs::TransposeOneDNNHandler<T> handler( | ||
dev_ctx, nchw_tz, reversed_axis, onednn_engine); | ||
|
||
auto transpose_src_memory_p = handler.AcquireSrcMemory( | ||
out_grad.format(), funcs::to_void_cast<T>(out_grad_data)); | ||
auto transpose_dst_memory_p = | ||
handler.AcquireDstMemory(x_grad, dev_ctx.GetPlace()); | ||
auto transpose_p = | ||
handler.AcquireTranspose(transpose_dst_memory_p, transpose_src_memory_p); | ||
|
||
auto& astream = OneDNNContext::tls().get_stream(); | ||
transpose_p->execute( | ||
astream, *transpose_src_memory_p, *transpose_dst_memory_p); | ||
astream.wait(); | ||
} | ||
|
||
} // namespace phi | ||
|
||
PD_REGISTER_KERNEL( | ||
transpose2_grad, OneDNN, ALL_LAYOUT, phi::TransposeGradKernel, float) {} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
transpose2
in Fluid is renamed totranspose
in PHI. So , the registered name should betranspose_grad
and this file should be renamedtranspose_grad_kernel.cc
. On the other hand, CI-coverage is not successful, maybe the reason is that the registerd name is wrong.