【Hackathon 5 No.2】Add index_fill / index_fill_ API to Paddle -part #57416

Patrick-Star125 · 2023-09-16T11:33:41Z

PR types

New features

PR changes

APIs

Description

Add index_fill/index_fill_ API to Paddle

Link

Rfc PR: PaddlePaddle/community#621
docs PR: PaddlePaddle/docs#6284

待完成

RFC文档修改
中文文档

paddle-ci-bot · 2023-09-29T03:03:44Z

Sorry to inform you that c49cd3d's CIs have passed for more than 7 days. To prevent PR conflicts, you need to re-run all CIs manually.

paddle-ci-bot · 2023-10-07T03:18:04Z

Sorry to inform you that dfb2947's CIs have passed for more than 7 days. To prevent PR conflicts, you need to re-run all CIs manually.

… index

zoooo0820

static-check中提示示例代码格式问题，辛苦也再根据报错信息中给出的参考文档修改下

zoooo0820 · 2023-10-11T06:47:09Z

python/paddle/tensor/manipulation.py

+
+    if inplace:
+        x[:] = out
+        return x


此处，如果是inplace，是否可以不要调用clone+setitem赋值，而是直接使用index_put_赋值；如果非inplace，是否可以不需要额外的clone操作

the implementation solution in rfc shoule be also changed.

current implementation is same with rfc API design already

in rfc this line: out = paddle.clone(x) at else branch need to be delete ?

zoooo0820 · 2023-10-11T07:15:24Z

test/legacy_test/test_index_fill.py

+        self.x_shape = (10, 15, 10)
+        self.axis = 1
+
+


补充下complex类型的测试吧

index_put不支持complex类型的输入

增加了float16类型的测试

zoooo0820 · 2023-10-11T07:16:10Z

test/legacy_test/test_index_fill.py

+                ref_res = compute_index_put_ref(
+                    self.x_np, self.axis, self.index_np, self.value
+                )
+                np.testing.assert_allclose(ref_res, pd_res, atol=1e-5)


这几个assert能否使用默认的atol阈值

Patrick-Star125 · 2023-10-11T09:22:35Z

Done

zoooo0820 · 2023-10-12T03:32:46Z

Done

@Patrick-Star125 辛苦再看下static-check中显示的示例代码格式，以及单测中atol阈值设置这两个问题呢

Patrick-Star125 · 2023-10-12T11:29:31Z

@zoooo0820 似乎static-check中报错不太明确，我主要参考这个PR的写法，样例代码在我线下都是可以正常执行的

sunzhongkai588 · 2023-10-13T03:56:44Z

@zoooo0820 似乎static-check中报错不太明确，我主要参考这个PR的写法，样例代码在我线下都是可以正常执行的

@Patrick-Star125

static-check 代码示例没通过，报以下错，应该是没 import numpy。请尽量不使用 numpy，直接创建paddle tensor。

另外，示例代码检查默认是cpu环境，输出需要和cpu环境下一致。

详细规范请务必参考 python文档示例代码规范

Patrick-Star125 · 2023-10-16T02:41:37Z

Done

zoooo0820

LGTM

jeff41404 · 2023-10-17T01:55:57Z

python/paddle/tensor/manipulation.py

+    if axis < 0:
+        axis = axis + x_dim
+
+    if not (isinstance(axis, int)) or (axis > x_dim - 1) or axis < -x_dim:


The negative axis has been processed in L5183 above, so the judgment condition here should be axis < 0 not axis < -x_dim.

jeff41404 · 2023-10-17T01:57:37Z

python/paddle/tensor/manipulation.py

+        axis (int): The dimension along which to index.
+        index (Tensor): The 1-D Tensor containing the indices to index.
+            The data type of ``index`` must be int32 or int64.


The order of parameters in the document should be consistent with the order of parameters in the function.

jeff41404 · 2023-10-17T02:08:28Z

test/legacy_test/test_index_fill.py

+paddle.enable_static()
+
+
+def compute_index_put_ref(x, axis, index, value):


compute_index_fill_ref is more suitable?

Is the logic of compute_index_put_ref too complex? and it is better to use Numpy's fancy indexing, eg, x=np.transpose(x, perm); x[index] = value; x=np.transpose(x, perm) be simpler and easier to understand?

jeff41404

LGTM

python/paddle/tensor/manipulation.py

Co-authored-by: zachary sun <70642955+sunzhongkai588@users.noreply.github.com>

paddle-ci-bot · 2023-10-28T03:12:03Z

Sorry to inform you that 59e28c3's CIs have passed for more than 7 days. To prevent PR conflicts, you need to re-run all CIs manually.

… index

luotao1 · 2023-11-02T10:10:01Z

请解决下冲突以及codestyle流水线的问题

sunzhongkai588

LGTM for docs

…addle#57416) * init index_fill API * modify api design * format code * optimize process * format code * adjust computation process * sample code format * fix code example * modify test reference * Update documentation Co-authored-by: zachary sun <70642955+sunzhongkai588@users.noreply.github.com> --------- Co-authored-by: zachary sun <70642955+sunzhongkai588@users.noreply.github.com>

co63oc · 2023-12-09T00:15:53Z

import paddle
x = paddle.eye(num_rows=3, num_columns=4)
indices = paddle.to_tensor(data=[0, 2])
value = -1
result = x.index_fill(axis=1, index=indices, value=value)
print(result)

result = x.index_fill_(axis=1, index=indices, value=value)
print(result)
print(x)

Tensor(shape=[3, 4], dtype=float32, place=Place(gpu:0), stop_gradient=True,
       [[-1.,  0., -1.,  0.],
        [-1.,  1., -1.,  0.],
        [-1.,  0., -1.,  0.]])
Tensor(shape=[3, 4], dtype=float32, place=Place(gpu:0), stop_gradient=True,
       [[-1., -1., -1., -1.],
        [ 0.,  1.,  0.,  0.],
        [-1., -1., -1., -1.]])
Tensor(shape=[3, 4], dtype=float32, place=Place(gpu:0), stop_gradient=True,
       [[-1., -1., -1., -1.],
        [ 0.,  1.,  0.,  0.],
        [-1., -1., -1., -1.]])

The index_fill and index_fill_ versions have different calculation results

@Patrick-Star125

Patrick-Star125 · 2023-12-09T07:07:30Z

@co63oc this pr has been submitted for this bug, thank you for your feedback

init index_fill API

d5cbe06

Patrick-Star125 mentioned this pull request Sep 16, 2023

【Hackathon 5th No.2】为 Paddle 新增 index_fill API RFC PaddlePaddle/community#621

Merged

Patrick-Star125 changed the title ~~init index_fill API~~ 【Hackathon 5 No.2】Add index_fill / index_fill_ API to Paddle Sep 16, 2023

paddle-bot bot added the contributor External developers label Sep 16, 2023

luotao1 added the PaddlePaddle Hackathon label Sep 18, 2023

luotao1 assigned luotao1 and zoooo0820 Sep 18, 2023

Ligoml mentioned this pull request Sep 18, 2023

【PaddlePaddle Hackathon 5th】开源贡献个人挑战赛 #57262

Open

Patrick-Star125 added 3 commits September 20, 2023 14:15

modify api design

df9168c

format code

e00a55e

optimize process

c49cd3d

resolve conflicts

dfb2947

Patrick-Star125 added 2 commits October 8, 2023 14:11

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

42b76c7

… index

format code

be92d15

zoooo0820 reviewed Oct 11, 2023

View reviewed changes

adjust computation process

7e49400

sample code format

752035f

luotao1 assigned sunzhongkai588 Oct 13, 2023

fix code example

bf0ccf6

zoooo0820 approved these changes Oct 16, 2023

View reviewed changes

jeff41404 reviewed Oct 17, 2023

View reviewed changes

Patrick-Star125 added 2 commits October 18, 2023 11:23

modify test reference

faa792f

resovle conflict

d87864b

jeff41404 previously approved these changes Oct 19, 2023

View reviewed changes

sunzhongkai588 reviewed Oct 20, 2023

View reviewed changes

python/paddle/tensor/manipulation.py Outdated Show resolved Hide resolved

Patrick-Star125 dismissed jeff41404’s stale review via 59e28c3 October 20, 2023 05:49

Update documentation

59e28c3

Co-authored-by: zachary sun <70642955+sunzhongkai588@users.noreply.github.com>

Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into…

ba887af

… index

format code

1b4e076

sunzhongkai588 approved these changes Nov 3, 2023

View reviewed changes

luotao1 merged commit c1a72a4 into PaddlePaddle:develop Nov 3, 2023
28 checks passed

luotao1 changed the title ~~【Hackathon 5 No.2】Add index_fill / index_fill_ API to Paddle~~ 【Hackathon 5 No.2】Add index_fill / index_fill_ API to Paddle -part Nov 3, 2023

Patrick-Star125 mentioned this pull request Nov 3, 2023

【Hackathon 5th No.2】为 Paddle 新增 index_fill API PaddlePaddle/docs#6284

Merged

This comment was marked as abuse.

Sign in to view

Patrick-Star125 mentioned this pull request Dec 2, 2023

【Hackathon 5th No.12】Add AdaptiveLogSoftmaxWithLoss API to Paddle PaddlePaddle/docs#6346

Closed

Patrick-Star125 deleted the index branch December 9, 2023 06:46

Patrick-Star125 mentioned this pull request Dec 9, 2023

Fix inconsistency between index_fill and index_fill_ #59863

Merged

co63oc mentioned this pull request Dec 10, 2023

【Hackathon 5th No.47】API转换 103-124 PaddlePaddle/PaConvert#346

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

【Hackathon 5 No.2】Add index_fill / index_fill_ API to Paddle -part #57416

【Hackathon 5 No.2】Add index_fill / index_fill_ API to Paddle -part #57416

Patrick-Star125 commented Sep 16, 2023 •

edited

Loading

paddle-ci-bot bot commented Sep 29, 2023

paddle-ci-bot bot commented Oct 7, 2023

zoooo0820 left a comment

zoooo0820 Oct 11, 2023

jeff41404 Oct 17, 2023 •

edited

Loading

Patrick-Star125 Oct 18, 2023

jeff41404 Oct 19, 2023

zoooo0820 Oct 11, 2023

Patrick-Star125 Oct 11, 2023

zoooo0820 Oct 11, 2023

Patrick-Star125 Oct 12, 2023

Patrick-Star125 commented Oct 11, 2023

zoooo0820 commented Oct 12, 2023

Patrick-Star125 commented Oct 12, 2023

sunzhongkai588 commented Oct 13, 2023 •

edited

Loading

Patrick-Star125 commented Oct 16, 2023

zoooo0820 left a comment

jeff41404 Oct 17, 2023 •

edited

Loading

Patrick-Star125 Oct 18, 2023

jeff41404 Oct 17, 2023

Patrick-Star125 Oct 18, 2023

jeff41404 Oct 17, 2023

jeff41404 Oct 17, 2023

Patrick-Star125 Oct 18, 2023

jeff41404 left a comment

paddle-ci-bot bot commented Oct 28, 2023

luotao1 commented Nov 2, 2023

sunzhongkai588 left a comment

This comment was marked as abuse.

co63oc commented Dec 9, 2023 •

edited

Loading

Patrick-Star125 commented Dec 9, 2023

		paddle.enable_static()


		def compute_index_put_ref(x, axis, index, value):

【Hackathon 5 No.2】Add index_fill / index_fill_ API to Paddle -part #57416

【Hackathon 5 No.2】Add index_fill / index_fill_ API to Paddle -part #57416

Conversation

Patrick-Star125 commented Sep 16, 2023 • edited Loading

PR types

PR changes

Description

Link

paddle-ci-bot bot commented Sep 29, 2023

paddle-ci-bot bot commented Oct 7, 2023

zoooo0820 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeff41404 Oct 17, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Patrick-Star125 commented Oct 11, 2023

zoooo0820 commented Oct 12, 2023

Patrick-Star125 commented Oct 12, 2023

sunzhongkai588 commented Oct 13, 2023 • edited Loading

Patrick-Star125 commented Oct 16, 2023

zoooo0820 left a comment

Choose a reason for hiding this comment

jeff41404 Oct 17, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jeff41404 left a comment

Choose a reason for hiding this comment

paddle-ci-bot bot commented Oct 28, 2023

luotao1 commented Nov 2, 2023

sunzhongkai588 left a comment

Choose a reason for hiding this comment

This comment was marked as abuse.

co63oc commented Dec 9, 2023 • edited Loading

Patrick-Star125 commented Dec 9, 2023

Patrick-Star125 commented Sep 16, 2023 •

edited

Loading

jeff41404 Oct 17, 2023 •

edited

Loading

sunzhongkai588 commented Oct 13, 2023 •

edited

Loading

jeff41404 Oct 17, 2023 •

edited

Loading

co63oc commented Dec 9, 2023 •

edited

Loading