[Paddle Tensor No.6][BUPT] 新增 `Tensor.ror` #69463

ZHOU05030 · 2024-11-18T09:27:41Z

PR Category

User Experience

PR Types

New features

Description

Paddle Tensor 规范化：新增 Tensor.__ror__，复用已有接口 Tensor.__or__

paddle-bot · 2024-11-18T09:27:49Z

你的PR提交成功，感谢你对开源项目的贡献!
请关注后续CI自动化测试结果，详情请参考Paddle-CI手册。
Your PR has been submitted. Thanks for your contribution!
Please wait for the result of CI firstly. See Paddle CI Manual for details.

HydrogenSulfate · 2024-11-18T12:27:53Z

python/paddle/__init__.py

+    bitwise_ror,
+    bitwise_ror_,


__ror__用bitwise_or实现，不需要新建一个叫做bitwise_ror的公开API，名字可以叫__ror__

HydrogenSulfate · 2024-11-18T12:30:11Z

python/paddle/tensor/__init__.py

+    bitwise_ror,
+    bitwise_ror_,


__ror__用bitwise_or实现，不需要新建一个叫做bitwise_ror的公开API，名字可以叫__ror__

HydrogenSulfate · 2024-11-18T12:30:20Z

python/paddle/tensor/__init__.py

+    'bitwise_ror',
+    'bitwise_ror_',


__ror__用bitwise_or实现，不需要新建一个叫做bitwise_ror的公开API，名字可以叫__ror__

HydrogenSulfate · 2024-11-18T12:36:20Z

python/paddle/tensor/__init__.py

@@ -859,6 +863,7 @@
 magic_method_func = [
    ('__and__', 'bitwise_and'),
    ('__or__', 'bitwise_or'),
+    ('__ror__', 'bitwise_ror'),


参考https://github.com/PaddlePaddle/Paddle/pull/69348/files#diff-94874b963229e87b138530acb9d94ff6a761a80c6e51ea766d56a7b3fc9784f1

HydrogenSulfate · 2024-11-18T12:39:17Z

python/paddle/tensor/logic.py

这个文件应该不用改

感谢指正，那这个__ror__函数我应该在哪个文件里实现呢？

HydrogenSulfate · 2024-11-18T12:40:58Z

test/legacy_test/test_bitwise_op.py

单测添加参考：https://github.com/PaddlePaddle/Paddle/pull/69231/files

HydrogenSulfate · 2024-11-18T12:41:40Z

提交代码之前请先安装 pre-commit:

HydrogenSulfate · 2024-11-19T11:32:38Z

python/paddle/tensor/logic.py

+def __ror__(
+    x: Tensor, y: Tensor, out: Tensor | None = None, name: str | None = None
+) -> Tensor:
+    return bitwise_or(y, x)


y可能是非Tensor类型，参考这个PR修改一下：https://github.com/PaddlePaddle/Paddle/pull/69348/files#diff-0417a927e0148c22ecb722f950e2f9704d6e899e9899521f0a269b173ceb2de2R7772-R7783

HydrogenSulfate · 2024-11-19T11:33:36Z

test/legacy_test/test_math_op_patch_pir.py

这个文件能加一个动态图的测试吗？期望是 np.ndarray | Tensor 或者 int | Tensor，来触发 __ror__，参考：https://github.com/PaddlePaddle/Paddle/pull/69348/files#diff-60c4d2d54c7500c4405914e9c50c03203923aa4fb48bba1e68d0362be2377ca1

HydrogenSulfate · 2024-11-20T03:27:16Z

python/paddle/tensor/logic.py

+    if isinstance(y, int):
+        y = paddle.to_tensor(y, dtype=x.dtype)


此处是否需要考虑布尔类型？

HydrogenSulfate · 2024-11-20T03:28:39Z

test/legacy_test/test_math_op_patch_pir.py

@@ -230,6 +230,13 @@ def test_bitwise_or(self):
            paddle.to_tensor(x_np), paddle.to_tensor(y_np)
        )
        res_np_d = x_np.__or__(y_np)
+        res_np_e = x_np.__or__(y_np)


这里建议用x_np.__ror__(y_np)

HydrogenSulfate · 2024-11-20T03:29:20Z

test/legacy_test/test_math_op_patch_pir.py

+        tensor_x = paddle.to_tensor(x_np)
+        tensor_y = paddle.to_tensor(y_np)


x应该是python的内置类型(int/bool)，y是Tensor，这样才能触发y.__ror__，否则触发的是x.__or__

HydrogenSulfate · 2024-11-20T03:29:44Z

test/legacy_test/test_math_op_patch_pir.py

单测修改一下，感觉没测试到预期的代码上

HydrogenSulfate · 2024-11-20T08:33:54Z

python/paddle/tensor/logic.py

+        return bitwise_or(y, x, out=out, name=name)
+    else:
+        raise TypeError(
+            f"unsupported operand type(s) for |: '{type(y).__name__}' and 'Tensor' ."


Suggested change

f"unsupported operand type(s) for |: '{type(y).__name__}' and 'Tensor' ."

f"unsupported operand type(s) for |: '{type(y).__name__}' and 'Tensor'"

HydrogenSulfate · 2024-11-20T08:34:36Z

test/legacy_test/test_math_op_patch_pir.py

@@ -239,14 +240,26 @@ def test_bitwise_or(self):
                b = x | y
                c = x.bitwise_or(y)
                d = x.__or__(y)
-                (b_np, c_np, d_np) = exe.run(
+                e = x.__ror__(y)


此处是不是应该用y.__ror__(x)？

HydrogenSulfate · 2024-11-20T08:36:32Z

test/legacy_test/test_math_op_patch_pir.py

+    def test_dygraph_ror(self):
+        paddle.disable_static()
+        x_int = 5
+        y_np = np.random.randint(0, 2, [2, 3, 5]).astype("int32")
+        y_tensor = paddle.to_tensor(y_np)
+        res_ror = x_int | y_tensor
+        res_py = x_int | (y_tensor.numpy())
+        np.testing.assert_array_equal(res_py, res_ror)
+        paddle.enable_static()



其余类型也都测一下，包括应该允许运算的int32/64、bool，以及不允许运算的float32/64、complex64/128，单测参考：https://github.com/PaddlePaddle/Paddle/pull/69348/files#diff-60c4d2d54c7500c4405914e9c50c03203923aa4fb48bba1e68d0362be2377ca1R493-R587

HydrogenSulfate · 2024-11-20T08:38:21Z

test/legacy_test/test_math_op_patch_pir.py

还有一个：test/legacy_test/test_math_op_patch.py 也需要添加单测吧？

HydrogenSulfate · 2024-11-21T03:20:25Z

python/paddle/tensor/logic.py

+    out: Tensor | None = None,
+    name: str | None = None,
+) -> Tensor:
+    if paddle.in_dynamic_mode():


这句话不用吧？动静态图应该都要适配的

HydrogenSulfate · 2024-11-21T03:22:10Z

test/legacy_test/test_math_op_patch.py

+    @prog_scope()
+    def test_ror(self):
+        x_np = np.random.randint(-100, 100, [2, 3, 5]).astype("int32")
+        y_np = np.random.randint(-100, 100, [2, 3, 5]).astype("int32")
+        out_np = x_np | y_np
+
+        x = paddle.static.data(name="x", shape=[2, 3, 5], dtype="int32")
+        y = paddle.static.data(name="y", shape=[2, 3, 5], dtype="int32")
+        z = x | y
+        out_ror = y.__ror__(x)
+
+        exe = base.Executor()
+        exe = base.Executor()
+        out = exe.run(
+            base.default_main_program(),
+            feed={"x": x_np, "y": y_np},
+            fetch_list=[z, out_ror],
+        )
+        np.testing.assert_array_equal(out[0], out_np)
+        np.testing.assert_array_equal(out[1], out_np)
+


静态图单测使用 "|" 运算符来触发 __ror__，不要直接调__ror__，参考：https://github.com/PaddlePaddle/Paddle/pull/69348/files#diff-60c4d2d54c7500c4405914e9c50c03203923aa4fb48bba1e68d0362be2377ca1

HydrogenSulfate · 2024-11-22T02:06:09Z

python/paddle/tensor/logic.py

+    elif isinstance(y, paddle.base.libpaddle.pir.Value):
+        return bitwise_or(y, x, out=out, name=name)


这个pir.Value分支应该是不需要的吧？如果pir.Value应该直接能触发y的__or__？

HydrogenSulfate · 2024-11-22T02:06:44Z

test/legacy_test/test_math_op_patch_pir.py

                )
                np.testing.assert_array_equal(res_np_b, b_np)
                np.testing.assert_array_equal(res_np_c, c_np)
                np.testing.assert_array_equal(res_np_d, d_np)
+                np.testing.assert_array_equal(res_np_e, e_np)
+
+    def test_dygraph_ror(self):


参考同文件的其它代码，添加pir的测试

HydrogenSulfate · 2024-11-22T05:10:30Z

test/legacy_test/test_math_op_patch.py

+        z = x_int | y
+        exe = paddle.static.Executor(place)
+        out = exe.run(
+            feed={'x': x_int, 'y': y_np},


feed里的'x': x_int应该是不需要的吧？可以确认下

HydrogenSulfate · 2024-11-22T05:11:10Z

test/legacy_test/test_math_op_patch.py

+        x_bool = True
+        res_ror_bool = x_bool | y
+        out_bool = exe.run(
+            feed={'x': x_bool, 'y': y_np},


同上，'x': x_bool应该可以删掉，因为这只是一个int，没有对应的Variable占位符

HydrogenSulfate · 2024-11-22T05:13:29Z

test/legacy_test/test_math_op_patch_pir.py

+        paddle.enable_static()
+        with paddle.pir_utils.IrGuard():
+            main_program, exe, program_guard = new_program()
+            with program_guard:
+                x_int = 5
+                y_np = np.random.randint(-100, 100, [2, 3, 5]).astype("int32")
+                y = paddle.static.data("y", y_np.shape, dtype=y_np.dtype)
+                z = x_int | y
+                out = exe.run(
+                    main_program,
+                    feed={'x': x_int, 'y': y_np},
+                    fetch_list=[z],
+                )
+                out_ref = x_int | y_np
+                np.testing.assert_array_equal(out[0], out_ref)
+                x_bool = True
+                res_ror_bool = x_bool | y
+                out_bool = exe.run(
+                    main_program,
+                    feed={'x': x_bool, 'y': y_np},
+                    fetch_list=[res_ror_bool],
+                )
+                res_py_bool = x_bool | y_np
+                np.testing.assert_array_equal(out_bool[0], res_py_bool)
+
+                for x_invalid in (
+                    np.float32(5.0),
+                    np.float64(5.0),
+                    np.complex64(5),
+                    np.complex128(5.0 + 2j),
+                ):
+                    with self.assertRaises(TypeError):
+                        x_invalid | y


pir的单测不要写到test_dygraph_ror里，可以新建一个函数

HydrogenSulfate

python/paddle/tensor/tensor.prototype.pyi 这里再补充一下

HydrogenSulfate · 2024-11-22T10:40:32Z

python/paddle/tensor/logic.py

@@ -1290,6 +1290,21 @@ def bitwise_or(
    )


+def __ror__(
+    x: Tensor,
+    y: Tensor | int | bool,


y不会是Tensor

HydrogenSulfate · 2024-11-25T02:42:12Z

提交代码请前请使用pre-commit或者手动修改一下import的顺序：

…y-stuff

HydrogenSulfate

LGTM

add tensor.ror

0b7d37c

paddle-bot bot added the contributor External developers label Nov 18, 2024

ZHOU05030 changed the title ~~add tensor.ror~~ [Paddle Tensor No.6] 新增 Tensor.__ror__ Nov 18, 2024

luotao1 mentioned this pull request Nov 18, 2024

【快乐开源】Paddle Tensor 规范化 #69082

Closed

ZHOU05030 and others added 3 commits November 18, 2024 18:42

修改测试文件

9c656f6

修改测试文件

da50f62

修改测试文件

fbf7bd8

ZHOU05030 changed the title ~~[Paddle Tensor No.6] 新增 Tensor.__ror__~~ [Paddle Tensor No.6][BUPT] 新增 Tensor.__ror__ Nov 18, 2024

ZHOU05030 added 2 commits November 18, 2024 11:25

修改单测文件

d8753a3

修改init文件

d7cf30c

HydrogenSulfate changed the title ~~[Paddle Tensor No.6][BUPT] 新增 Tensor.__ror__~~ [Paddle Tensor No.6][BUPT] 新增 Tensor.__ror__ Nov 18, 2024

HydrogenSulfate reviewed Nov 18, 2024

View reviewed changes

luotao1 assigned luotao1 and HydrogenSulfate Nov 19, 2024

luotao1 added the HappyOpenSource Pro 进阶版快乐开源活动，更具挑战性的任务 label Nov 19, 2024

添加 __ror__

fe7d090

HydrogenSulfate reviewed Nov 19, 2024

View reviewed changes

ZHOU05030 added 2 commits November 19, 2024 15:18

添加动态图测试

90aa056

修改bug

94871b1

HydrogenSulfate reviewed Nov 20, 2024

View reviewed changes

ZHOU05030 added 3 commits November 20, 2024 07:34

添加单侧动态测试

61d58ec

修改动态图测试

a94b756

增加数据类型判断

ea4125e

HydrogenSulfate reviewed Nov 20, 2024

View reviewed changes

ZHOU05030 added 2 commits November 20, 2024 10:59

添加test_math_op_patch文件

f458b03

修改bug

b926b32

HydrogenSulfate reviewed Nov 21, 2024

View reviewed changes

修改静态图测试

4d6ad06

HydrogenSulfate reviewed Nov 22, 2024

View reviewed changes

ZHOU05030 added 2 commits November 22, 2024 02:58

添加pir的测试部分

1e367e2

修改if逻辑

3e22e18

HydrogenSulfate reviewed Nov 22, 2024

View reviewed changes

修改pir测试

7f6ab52

HydrogenSulfate reviewed Nov 22, 2024

View reviewed changes

ZHOU05030 added 5 commits November 22, 2024 10:54

添加tensor.prototype.pyi

f877fb6

Resolve merge conflict in __init__.py

71ecd47

Resolve merge conflict in __init__.py

e738d94

Merge branch 'develop' into my-stuff

9321efa

Resolve merge conflict in tensor.__init__.py

1935338

ZHOU05030 added 2 commits November 25, 2024 02:57

Merge branch 'my-stuff' of https://github.com/ZHOU05030/Paddle into m…

d88d66c

…y-stuff

pre-commit

0e6b587

HydrogenSulfate approved these changes Nov 25, 2024

View reviewed changes

HydrogenSulfate merged commit f2cd9aa into PaddlePaddle:develop Nov 25, 2024
27 of 28 checks passed

ZHOU05030 mentioned this pull request Dec 1, 2024

[WeeklyReports] 2024.11.18~2024.11.29 周报收集 PFCCLab/Starter#414

Open

74 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Paddle Tensor No.6][BUPT] 新增 `Tensor.ror` #69463

[Paddle Tensor No.6][BUPT] 新增 `Tensor.ror` #69463

ZHOU05030 commented Nov 18, 2024 •

edited by HydrogenSulfate

Loading

paddle-bot bot commented Nov 18, 2024

HydrogenSulfate Nov 18, 2024

HydrogenSulfate Nov 18, 2024

HydrogenSulfate Nov 18, 2024

HydrogenSulfate Nov 18, 2024

HydrogenSulfate Nov 18, 2024

ZHOU05030 Nov 18, 2024

HydrogenSulfate Nov 18, 2024

HydrogenSulfate commented Nov 18, 2024

HydrogenSulfate Nov 19, 2024

HydrogenSulfate Nov 19, 2024

HydrogenSulfate Nov 20, 2024

HydrogenSulfate Nov 20, 2024

HydrogenSulfate Nov 20, 2024

HydrogenSulfate Nov 20, 2024

HydrogenSulfate Nov 20, 2024

HydrogenSulfate Nov 20, 2024

HydrogenSulfate Nov 20, 2024

HydrogenSulfate Nov 20, 2024

HydrogenSulfate Nov 21, 2024

HydrogenSulfate Nov 21, 2024

HydrogenSulfate Nov 22, 2024

HydrogenSulfate Nov 22, 2024

HydrogenSulfate Nov 22, 2024

HydrogenSulfate Nov 22, 2024

HydrogenSulfate Nov 22, 2024

HydrogenSulfate left a comment

HydrogenSulfate Nov 22, 2024

HydrogenSulfate commented Nov 25, 2024

HydrogenSulfate left a comment

		if isinstance(y, int):
		y = paddle.to_tensor(y, dtype=x.dtype)

		tensor_x = paddle.to_tensor(x_np)
		tensor_y = paddle.to_tensor(y_np)

	f"unsupported operand type(s) for \|: '{type(y).__name__}' and 'Tensor' ."
	f"unsupported operand type(s) for \|: '{type(y).__name__}' and 'Tensor'"

		elif isinstance(y, paddle.base.libpaddle.pir.Value):
		return bitwise_or(y, x, out=out, name=name)

[Paddle Tensor No.6][BUPT] 新增 Tensor.__ror__ #69463

[Paddle Tensor No.6][BUPT] 新增 Tensor.__ror__ #69463

Conversation

ZHOU05030 commented Nov 18, 2024 • edited by HydrogenSulfate Loading

PR Category

PR Types

Description

paddle-bot bot commented Nov 18, 2024

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

HydrogenSulfate commented Nov 18, 2024

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

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HydrogenSulfate left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

HydrogenSulfate commented Nov 25, 2024

HydrogenSulfate left a comment

Choose a reason for hiding this comment

[Paddle Tensor No.6][BUPT] 新增 `Tensor.ror` #69463

[Paddle Tensor No.6][BUPT] 新增 `Tensor.ror` #69463

ZHOU05030 commented Nov 18, 2024 •

edited by HydrogenSulfate

Loading