Skip to content

[Phi] mv kernel #39861

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

Merged
merged 1 commit into from
Feb 25, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 7 additions & 8 deletions paddle/fluid/operators/mv_op.cc
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,13 @@ 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/fluid/operators/mv_op.h"
#include <algorithm>
#include <utility>
#include <vector>

#include "paddle/fluid/framework/op_registry.h"
#include "paddle/fluid/framework/op_version_registry.h"

namespace paddle {
namespace operators {

Expand Down Expand Up @@ -116,10 +122,3 @@ REGISTER_OPERATOR(mv, ops::MVOp, ops::MVOpMaker,
ops::MVOpGradMaker<paddle::framework::OpDesc>,
ops::MVOpGradMaker<paddle::imperative::OpBase>);
REGISTER_OPERATOR(mv_grad, ops::MVOpGrad);

REGISTER_OP_CPU_KERNEL(
mv, ops::MVKernel<paddle::platform::CPUDeviceContext, float>,
ops::MVKernel<paddle::platform::CPUDeviceContext, double>);
REGISTER_OP_CPU_KERNEL(
mv_grad, ops::MVGradKernel<paddle::platform::CPUDeviceContext, float>,
ops::MVGradKernel<paddle::platform::CPUDeviceContext, double>);
94 changes: 0 additions & 94 deletions paddle/fluid/operators/mv_op.cu

This file was deleted.

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

This file was deleted.

72 changes: 72 additions & 0 deletions paddle/phi/kernels/cpu/mv_grad_kernel.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
// 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/mv_grad_kernel.h"

#include "paddle/phi/backends/cpu/cpu_context.h"
#include "paddle/phi/core/kernel_registry.h"
#include "paddle/phi/kernels/funcs/blas/blas.h"

namespace phi {

template <typename T, typename Context>
void MvGradKernel(const Context& dev_ctx,
const DenseTensor& x,
const DenseTensor& vec,
const DenseTensor& out_grad,
DenseTensor* x_grad,
DenseTensor* vec_grad) {
auto dout = out_grad;
auto dx = x_grad;
auto dvec = vec_grad;

auto dim_x = x.dims();
int m = dim_x[0];
int n = dim_x[1];

// get data ptr
const T* x_data = x.data<T>();
const T* vec_data = vec.data<T>();
const T* dout_data = dout.data<T>();

if (dx) {
T* dx_data = dev_ctx.template Alloc<T>(dx);

for (int i = 0; i < m; ++i) {
for (int j = 0; j < n; ++j) {
dx_data[i * n + j] = dout_data[i] * vec_data[j];
}
}
}

if (dvec) {
T* dvec_data = dev_ctx.template Alloc<T>(dvec);

auto blas = phi::funcs::GetBlas<Context, T>(dev_ctx);

blas.GEMV(true,
dim_x[0],
dim_x[1],
static_cast<T>(1),
x_data,
dout_data,
static_cast<T>(0),
dvec_data);
}
}

} // namespace phi

PD_REGISTER_KERNEL(mv_grad, CPU, ALL_LAYOUT, phi::MvGradKernel, float, double) {
}
Copy link
Contributor

Choose a reason for hiding this comment

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

这个pre-commit处理的换行吗,有点别扭,不如直接在kernel name那里换个行

Copy link
Contributor Author

Choose a reason for hiding this comment

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

是的,pre-commit 某种情况下会这样自动更新一下,后来我又改回来了,但是又会导致 CI (应该是 PR-CI-Static-Check) 失败,必须这样才能通过。

你们是否可以和 PR-CI-Static-Check 确认一下,这种看着确实有点别扭。

22 changes: 22 additions & 0 deletions paddle/phi/kernels/cpu/mv_kernel.cc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
// 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/mv_kernel.h"

#include "paddle/phi/backends/cpu/cpu_context.h"
#include "paddle/phi/core/kernel_registry.h"

#include "paddle/phi/kernels/impl/mv_kernel_impl.h"

PD_REGISTER_KERNEL(mv, CPU, ALL_LAYOUT, phi::MvKernel, float, double) {}
Loading