Skip to content

add new api paddle.Tensor.fill_diagonal_#34460

Merged
jeff41404 merged 1 commit intoPaddlePaddle:developfrom
zhiboniu:develop_fill_diagonal_
Aug 17, 2021
Merged

add new api paddle.Tensor.fill_diagonal_#34460
jeff41404 merged 1 commit intoPaddlePaddle:developfrom
zhiboniu:develop_fill_diagonal_

Conversation

@zhiboniu
Copy link
Contributor

@zhiboniu zhiboniu commented Jul 28, 2021 •
edited
Loading

PR types

Others

PR changes

APIs

Describe

补充缺失API，新增 api paddle.Tensor.fill_diagonal_
功能：实现对Tensor对角线向量值的修改。

使用示例：
x = paddle.ones((3,3))
x.fill_diagonal_(5)

tensor([[5., 1., 1.],
[1., 5., 1.],
[1., 1., 5.]])

@paddle-bot-old
Copy link

paddle-bot-old bot commented Jul 28, 2021

Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

jeff41404
jeff41404 reviewed Aug 2, 2021
View reviewed changes
paddle/fluid/operators/fill_diagonal_inplace_op.cc Outdated
Comment on lines 47 to 49
Copy link
Contributor

@jeff41404 jeff41404 Aug 2, 2021

Choose a reason for hiding this comment

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

说明改一下？

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 5, 2021

Choose a reason for hiding this comment

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

done

jeff41404
jeff41404 reviewed Aug 2, 2021
View reviewed changes
paddle/fluid/operators/fill_diagonal_inplace_op.cc Outdated
Copy link
Contributor

@jeff41404 jeff41404 Aug 2, 2021

Choose a reason for hiding this comment

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

“the clipped tensor”的说明在这里有什么特殊意义不，是否去掉？

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 5, 2021

Choose a reason for hiding this comment

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

done，已修改

jeff41404
jeff41404 reviewed Aug 6, 2021
View reviewed changes
paddle/fluid/operators/fill_diagonal_op.cc Outdated
Comment on lines 95 to 98
Copy link
Contributor

@jeff41404 jeff41404 Aug 6, 2021

Choose a reason for hiding this comment

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

常规做法是先 out->mutable_data 分配内存后再使用 TensorCopy，这里反过来是否有特殊考虑

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 6, 2021

Choose a reason for hiding this comment

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

done, TensorCopy中也有out->mutable_data，所以其实都可以。不过也已经修改。

jeff41404
jeff41404 reviewed Aug 6, 2021
View reviewed changes
paddle/fluid/operators/fill_diagonal_op.cu Outdated
Comment on lines 61 to 49
Copy link
Contributor

@jeff41404 jeff41404 Aug 6, 2021

Choose a reason for hiding this comment

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

常规做法是先 out->mutable_data 分配内存后再使用 TensorCopy，这里反过来是否有特殊考虑

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 6, 2021

Choose a reason for hiding this comment

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

done，同上已修改。

jeff41404
jeff41404 reviewed Aug 6, 2021
View reviewed changes
paddle/fluid/operators/fill_diagonal_op.cc Outdated
Copy link
Contributor

@jeff41404 jeff41404 Aug 6, 2021

Choose a reason for hiding this comment

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

反向的逻辑中是否也可以使用TensorCopy 批量实现数据cp

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 6, 2021

Choose a reason for hiding this comment

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

done，已修改。

jeff41404
jeff41404 reviewed Aug 6, 2021
View reviewed changes
paddle/fluid/operators/fill_diagonal_op.cu Outdated
Copy link
Contributor

@jeff41404 jeff41404 Aug 6, 2021

Choose a reason for hiding this comment

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

反向的逻辑中是否也可以使用TensorCopy 批量实现数据cp

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 6, 2021

Choose a reason for hiding this comment

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

done，已修改。

jiangjiajun
jiangjiajun requested changes Aug 9, 2021
View reviewed changes
paddle/fluid/operators/fill_diagonal_op.cc Outdated
Copy link
Collaborator

@jiangjiajun jiangjiajun Aug 9, 2021

Choose a reason for hiding this comment

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

value只能是float吗

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 13, 2021

Choose a reason for hiding this comment

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

以float类型读取python数值，然后填入时转化为实际类型填入。

paddle/fluid/operators/fill_diagonal_op.cc Outdated
Copy link
Collaborator

@jiangjiajun jiangjiajun Aug 9, 2021

Choose a reason for hiding this comment

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

注释的代码如无需要就直接删除吧

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 12, 2021

Choose a reason for hiding this comment

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

done

python/paddle/fluid/tests/unittests/test_tensor_fill_diagonal_.py Outdated
Copy link
Collaborator

@jiangjiajun jiangjiajun Aug 9, 2021

Choose a reason for hiding this comment

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

Kernel注册了Bool类型，也加上bool类型的测试

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 12, 2021

Choose a reason for hiding this comment

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

done

jiangjiajun
jiangjiajun previously approved these changes Aug 13, 2021
View reviewed changes
Copy link
Collaborator

@jiangjiajun jiangjiajun left a comment

Choose a reason for hiding this comment

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

LGTM

jzhang533
jzhang533 previously approved these changes Aug 13, 2021
View reviewed changes
Copy link
Contributor

@jzhang533 jzhang533 left a comment

Choose a reason for hiding this comment

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

LGTM

XiaoguangHu01
XiaoguangHu01 previously approved these changes Aug 13, 2021
View reviewed changes
Copy link
Contributor

@XiaoguangHu01 XiaoguangHu01 left a comment

Choose a reason for hiding this comment

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

LG API

python/paddle/tensor/manipulation.py Outdated
Copy link
Contributor

@XiaoguangHu01 XiaoguangHu01 Aug 13, 2021

Choose a reason for hiding this comment

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

wrap参数缺少说明

Copy link
Contributor Author

@zhiboniu zhiboniu Aug 13, 2021

Choose a reason for hiding this comment

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

done, 已添加

@zhiboniu zhiboniu dismissed stale reviews from XiaoguangHu01, jzhang533, and jiangjiajun via a7376d0 August 13, 2021 09:33
XiaoguangHu01
XiaoguangHu01 approved these changes Aug 16, 2021
View reviewed changes
Copy link
Contributor

@XiaoguangHu01 XiaoguangHu01 left a comment

Choose a reason for hiding this comment

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

LG API

jzhang533
jzhang533 approved these changes Aug 16, 2021
View reviewed changes
Copy link
Contributor

@jzhang533 jzhang533 left a comment

Choose a reason for hiding this comment

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

LGTM

@zhiboniu zhiboniu changed the title add api fill_diagonal_inplace add new api paddle.Tensor.fill_diagonal_ Aug 17, 2021
jeff41404
jeff41404 approved these changes Aug 17, 2021
View reviewed changes
Copy link
Contributor

@jeff41404 jeff41404 left a comment

Choose a reason for hiding this comment

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

LGTM

@jeff41404 jeff41404 merged commit 5de576b into PaddlePaddle:develop Aug 17, 2021
@zhiboniu zhiboniu deleted the develop_fill_diagonal_ branch September 27, 2021 10:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jzhang533 jzhang533 jzhang533 approved these changes

@jeff41404 jeff41404 jeff41404 approved these changes

@XiaoguangHu01 XiaoguangHu01 XiaoguangHu01 approved these changes

@jiangjiajun jiangjiajun jiangjiajun left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@zhiboniu @jzhang533 @jeff41404 @jiangjiajun @XiaoguangHu01