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

[phi::DenseTensor] Replace Tensor with phi::DenseTensor #48682

Merged
merged 12 commits into from
Dec 7, 2022
Merged

[phi::DenseTensor] Replace Tensor with phi::DenseTensor #48682

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
18cac1a
Replace Tensor with phi::DenseTensor
Liyulingyue Dec 3, 2022
399e332
fix uniform_random_op.cc
Liyulingyue Dec 3, 2022
c3e7e1d
replace Tensor
Liyulingyue Dec 3, 2022
db57e7b
replace Tensor
Liyulingyue Dec 3, 2022
737ee31
replace Tensor
Liyulingyue Dec 3, 2022
d54f34c
replace Tensor
Liyulingyue Dec 3, 2022
32b6b59
replace Tensor
Liyulingyue Dec 3, 2022
51184e1
replace Tensor
Liyulingyue Dec 3, 2022
d3dca20
replace Tensor
Liyulingyue Dec 3, 2022
5932d4a
replace Tensor
Liyulingyue Dec 3, 2022
0cee595
resume nce_op.h
Liyulingyue Dec 3, 2022
dfac070
convert all ‘phi::DenseTensor’ in comments to 'Tensor'
Liyulingyue Dec 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
35 changes: 18 additions & 17 deletions paddle/fluid/imperative/gradient_accumulator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ TType* GetEmptyInnerTensor(paddle::experimental::Tensor* dst) {
dst->defined(),
false,
platform::errors::Fatal(
"The underlying Tensor implementation should be nullptr"));
Copy link
Contributor

Choose a reason for hiding this comment

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

imperative目录中已经开始使用上层Tensor的概念了，此文件中的这些注释内容目前不用修改

Copy link
Contributor Author

Choose a reason for hiding this comment

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

imperative目录中已经开始使用上层Tensor的概念了，此文件中的这些注释内容目前不用修改

done. everything resumed

"The underlying phi::DenseTensor implementation should be nullptr"));
dst->set_impl(std::make_shared<TType>());
auto* dst_tensor = static_cast<TType*>(dst->impl().get());
return dst_tensor;
Expand Down Expand Up @@ -634,25 +634,26 @@ void GradientAccumulator::AccumulateGrad() {
}

void GradientAccumulator::CallGradientHooks() {
PADDLE_ENFORCE_EQ(var_->IsLeafGrad(),
true,
platform::errors::Unavailable(
"Only leaf gradient Tensor can deal with by gradient "
"hook in gradient accumulator."));
PADDLE_ENFORCE_EQ(
SumGradCompleted(),
var_->IsLeafGrad(),
true,
platform::errors::PreconditionNotMet(
"Only can call gradient hooks after sum gradient completed."));
platform::errors::Unavailable(
"Only leaf gradient phi::DenseTensor can deal with by gradient "
"hook in gradient accumulator."));
PADDLE_ENFORCE_EQ(
HasInnerVar(),
SumGradCompleted(),
true,
platform::errors::PreconditionNotMet(
"Leaf Tensor's inner var is nullptr when call gradient hook."));
"Only can call gradient hooks after sum gradient completed."));
PADDLE_ENFORCE_EQ(HasInnerVar(),
true,
platform::errors::PreconditionNotMet(
"Leaf phi::DenseTensor's inner var is nullptr when "
"call gradient hook."));
PADDLE_ENFORCE_EQ(
inner_var_->Var().IsInitialized(),
true,
platform::errors::PreconditionNotMet("Leaf Tensor's inner var "
platform::errors::PreconditionNotMet("Leaf phi::DenseTensor's inner var "
"is not initialized when "
"call gradient hook."));
if (var_->HasVariableWrapperHook()) {
Expand All @@ -671,11 +672,11 @@ void GradientAccumulator::CallGradientHooks() {
}

void GradientAccumulator::CallReduceHooks() {
PADDLE_ENFORCE_EQ(
var_->IsLeafGrad(),
true,
platform::errors::Unavailable("Only leaf gradient Tensor can deal with "
"by reduce hook in gradient accumulator."));
PADDLE_ENFORCE_EQ(var_->IsLeafGrad(),
true,
platform::errors::Unavailable(
"Only leaf gradient phi::DenseTensor can deal with "
"by reduce hook in gradient accumulator."));
PADDLE_ENFORCE_EQ(SumGradCompleted(),
true,
platform::errors::PreconditionNotMet(
Expand Down
4 changes: 1 addition & 3 deletions paddle/fluid/operators/abs_op_mlu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ limitations under the Licnse. */
namespace paddle {
namespace operators {

using Tensor = phi::DenseTensor;

template <typename T>
class AbsMLUKernel : public framework::OpKernel<T> {
public:
Expand Down Expand Up @@ -54,7 +52,7 @@ class AbsGradMLUKernel : public framework::OpKernel<T> {
MLUCnnlOpTensorDesc mul_op_desc(
CNNL_OP_TENSOR_MUL, ToCnnlDataType<T>(), CNNL_NOT_PROPAGATE_NAN);

Tensor sign_x;
phi::DenseTensor sign_x;
sign_x.mutable_data<T>(x->dims(), ctx.GetPlace());

MLUCnnl::Sign(ctx,
Expand Down
2 changes: 0 additions & 2 deletions paddle/fluid/operators/abs_op_npu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ limitations under the Licnse. */
namespace paddle {
namespace operators {

using Tensor = phi::DenseTensor;

template <typename DeviceContext, typename T>
class AbsNPUKernel : public framework::OpKernel<T> {
public:
Expand Down
4 changes: 1 addition & 3 deletions paddle/fluid/operators/activation_op_mlu.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ limitations under the Licnse. */
namespace paddle {
namespace operators {

using Tensor = phi::DenseTensor;

template <cnnlActivationMode_t act_mode, typename T>
class ActivationMLUKernel : public framework::OpKernel<T> {
public:
Expand Down Expand Up @@ -442,7 +440,7 @@ class ReciprocalGradMLUKernel : public framework::OpKernel<T> {
auto* dx = ctx.Output<phi::DenseTensor>(framework::GradVarName("X"));
auto place = ctx.GetPlace();
dx->mutable_data<T>(place);
Tensor square_out;
phi::DenseTensor square_out;
square_out.Resize(out->dims());
square_out.mutable_data<T>(place);
MLUCnnlTensorDesc out_desc(*out);
Expand Down
Loading