【PIR API adaptor No.174】 Migrate paddle.randint_like into pir #58953

enkilee · 2023-11-13T09:12:25Z

PR types

Others

PR changes

APIs

Description

新IR Python API适配升级 #58067
No.174 paddle.randint_like
PIR API 推全升级
将 paddle.randint_like 迁移升级至 pir，并更新单测单测覆盖率：1/1

paddle-bot · 2023-11-13T09:12:30Z

你的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.

python/paddle/tensor/random.py

enkilee · 2023-11-17T04:48:09Z

2023-11-17 12:46:24 ======================================================================
2023-11-17 12:46:24 ERROR: test_static_api_with_float32 (test_randint_like.TestRandintLikeAPI)
2023-11-17 12:46:24 ----------------------------------------------------------------------
2023-11-17 12:46:24 Traceback (most recent call last):
2023-11-17 12:46:24   File "/workspace/Paddle/build/python/paddle/pir_utils.py", line 115, in impl
2023-11-17 12:46:24     func(*args, **kwargs)
2023-11-17 12:46:24   File "/workspace/Paddle/build/test/legacy_test/test_randint_like.py", line 138, in test_static_api_with_float32
2023-11-17 12:46:24     outs5 = exe.run(
2023-11-17 12:46:24   File "/workspace/Paddle/build/python/paddle/base/executor.py", line 1707, in run
2023-11-17 12:46:24     res = self._run_pir_impl(
2023-11-17 12:46:24   File "/workspace/Paddle/build/python/paddle/base/executor.py", line 2020, in _run_pir_impl
2023-11-17 12:46:24     self._pir_feed_data(program, feed, scope)
2023-11-17 12:46:24   File "/workspace/Paddle/build/python/paddle/base/executor.py", line 1328, in _pir_feed_data
2023-11-17 12:46:24     cur_feed = feed[feed_target_name]
2023-11-17 12:46:24 KeyError: 'x_bool'

@0x45f @MarioLulab 大佬帮忙看下？为什么会出现这种错误，改了几种都不行

MarioLulab · 2023-11-17T08:14:17Z

executor.py

收到，我在尝试复现。有结果了及时回复你~

MarioLulab · 2023-11-19T09:27:55Z

2023-11-17 12:46:24 ======================================================================
2023-11-17 12:46:24 ERROR: test_static_api_with_float32 (test_randint_like.TestRandintLikeAPI)
2023-11-17 12:46:24 ----------------------------------------------------------------------
2023-11-17 12:46:24 Traceback (most recent call last):
2023-11-17 12:46:24   File "/workspace/Paddle/build/python/paddle/pir_utils.py", line 115, in impl
2023-11-17 12:46:24     func(*args, **kwargs)
2023-11-17 12:46:24   File "/workspace/Paddle/build/test/legacy_test/test_randint_like.py", line 138, in test_static_api_with_float32
2023-11-17 12:46:24     outs5 = exe.run(
2023-11-17 12:46:24   File "/workspace/Paddle/build/python/paddle/base/executor.py", line 1707, in run
2023-11-17 12:46:24     res = self._run_pir_impl(
2023-11-17 12:46:24   File "/workspace/Paddle/build/python/paddle/base/executor.py", line 2020, in _run_pir_impl
2023-11-17 12:46:24     self._pir_feed_data(program, feed, scope)
2023-11-17 12:46:24   File "/workspace/Paddle/build/python/paddle/base/executor.py", line 1328, in _pir_feed_data
2023-11-17 12:46:24     cur_feed = feed[feed_target_name]
2023-11-17 12:46:24 KeyError: 'x_bool'

@0x45f @MarioLulab 大佬帮忙看下？为什么会出现这种错误，改了几种都不行

我已在本地复现并 fix 了。请将： test/legacy_test/test_randint_like.py 里所有的 Program 修改为 paddle.static.Program, program_guard 修改为 paddle.static.program_guard。
因为这和我们单测的执行机制有关系，单测在加入test_with_pir_api装饰器后，会执行一次老ir再执行一次新ir，这里有一个Program的切换过程，Program切换在paddle.static.Program这种情况下是可以切换的，但是如果提前通过import导入Program，由于Program已经导进来了，会造成无法正常切换Program

enkilee · 2023-11-20T06:29:08Z

收到

MarioLulab

nice work~
但是 test/legacy_test/test_zero_dim_tensor.py 里的 TestNoBackwardAPIStatic 还有 test_randint_and_randint_like 单测，麻烦也一起适配一下吧

test/legacy_test/test_randint_like.py

enkilee · 2023-11-21T07:07:16Z

2023-11-21 13:59:49 ======================================================================
2023-11-21 13:59:49 ERROR: test_randint_and_randint_like (test_zero_dim_tensor.TestNoBackwardAPIStatic)
2023-11-21 13:59:49 ----------------------------------------------------------------------
2023-11-21 13:59:49 Traceback (most recent call last):
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\pir_utils.py", line 115, in impl
2023-11-21 13:59:49     func(*args, **kwargs)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\test\legacy_test\test_zero_dim_tensor.py", line 5815, in test_randint_and_randint_like
2023-11-21 13:59:49     out3 = paddle.randint(-10, 10, self.shape)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\tensor\random.py", line 997, in randint
2023-11-21 13:59:49     shape = paddle.utils.convert_shape_to_list(shape)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\utils\layers_utils.py", line 490, in convert_shape_to_list
2023-11-21 13:59:49     shape = [x.item(0) if isinstance(x, Variable) else x for x in shape]
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\utils\layers_utils.py", line 490, in <listcomp>
2023-11-21 13:59:49     shape = [x.item(0) if isinstance(x, Variable) else x for x in shape]
2023-11-21 13:59:49   File "C:\home\workspace\cache\python_venv\lib\site-packages\decorator.py", line 231, in fun
2023-11-21 13:59:49     args, kw = fix(args, kw, sig)
2023-11-21 13:59:49   File "C:\home\workspace\cache\python_venv\lib\site-packages\decorator.py", line 203, in fix
2023-11-21 13:59:49     ba = sig.bind(*args, **kwargs)
2023-11-21 13:59:49   File "C:\Python310\lib\inspect.py", line 3177, in bind
2023-11-21 13:59:49     return self._bind(args, kwargs)
2023-11-21 13:59:49   File "C:\Python310\lib\inspErrors while running CTest
2023-11-21 13:59:49 ect.py", line 3098, in _bind
2023-11-21 13:59:49     raise TypeError('too many positional arguments') from None
2023-11-21 13:59:49 TypeError: too many positional arguments

enkilee · 2023-11-21T07:07:30Z

2023-11-21 13:59:49 ======================================================================
2023-11-21 13:59:49 ERROR: test_randint_and_randint_like (test_zero_dim_tensor.TestNoBackwardAPIStatic)
2023-11-21 13:59:49 ----------------------------------------------------------------------
2023-11-21 13:59:49 Traceback (most recent call last):
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\pir_utils.py", line 115, in impl
2023-11-21 13:59:49     func(*args, **kwargs)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\test\legacy_test\test_zero_dim_tensor.py", line 5815, in test_randint_and_randint_like
2023-11-21 13:59:49     out3 = paddle.randint(-10, 10, self.shape)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\tensor\random.py", line 997, in randint
2023-11-21 13:59:49     shape = paddle.utils.convert_shape_to_list(shape)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\utils\layers_utils.py", line 490, in convert_shape_to_list
2023-11-21 13:59:49     shape = [x.item(0) if isinstance(x, Variable) else x for x in shape]
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\utils\layers_utils.py", line 490, in <listcomp>
2023-11-21 13:59:49     shape = [x.item(0) if isinstance(x, Variable) else x for x in shape]
2023-11-21 13:59:49   File "C:\home\workspace\cache\python_venv\lib\site-packages\decorator.py", line 231, in fun
2023-11-21 13:59:49     args, kw = fix(args, kw, sig)
2023-11-21 13:59:49   File "C:\home\workspace\cache\python_venv\lib\site-packages\decorator.py", line 203, in fix
2023-11-21 13:59:49     ba = sig.bind(*args, **kwargs)
2023-11-21 13:59:49   File "C:\Python310\lib\inspect.py", line 3177, in bind
2023-11-21 13:59:49     return self._bind(args, kwargs)
2023-11-21 13:59:49   File "C:\Python310\lib\inspErrors while running CTest
2023-11-21 13:59:49 ect.py", line 3098, in _bind
2023-11-21 13:59:49     raise TypeError('too many positional arguments') from None
2023-11-21 13:59:49 TypeError: too many positional arguments

python/paddle/tensor/random.py

python/paddle/utils/layers_utils.py

enkilee · 2023-11-24T07:11:06Z

@MarioLulab randint的0维好像有问题

MarioLulab · 2023-11-26T11:46:56Z

@MarioLulab randint的0维好像有问题

请问具体是什么问题呢？有报错栈吗

enkilee · 2023-11-27T01:40:11Z

@MarioLulab 您好：

@MarioLulab randint的0维好像有问题

请问具体是什么问题呢？有报错栈吗

2023-11-21 13:59:49 
2023-11-21 13:59:49 ERROR: test_randint_and_randint_like (test_zero_dim_tensor.TestNoBackwardAPIStatic)
2023-11-21 13:59:49 ----------------------------------------------------------------------
2023-11-21 13:59:49 Traceback (most recent call last):
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\pir_utils.py", line 115, in impl
2023-11-21 13:59:49     func(*args, **kwargs)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\test\legacy_test\test_zero_dim_tensor.py", line 5815, in test_randint_and_randint_like
2023-11-21 13:59:49     out3 = paddle.randint(-10, 10, self.shape)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\tensor\random.py", line 997, in randint
2023-11-21 13:59:49     shape = paddle.utils.convert_shape_to_list(shape)
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\utils\layers_utils.py", line 490, in convert_shape_to_list
2023-11-21 13:59:49     shape = [x.item(0) if isinstance(x, Variable) else x for x in shape]
2023-11-21 13:59:49   File "C:\home\workspace\Paddle\build\python\paddle\utils\layers_utils.py", line 490, in <listcomp>
2023-11-21 13:59:49     shape = [x.item(0) if isinstance(x, Variable) else x for x in shape]
2023-11-21 13:59:49   File "C:\home\workspace\cache\python_venv\lib\site-packages\decorator.py", line 231, in fun
2023-11-21 13:59:49     args, kw = fix(args, kw, sig)
2023-11-21 13:59:49   File "C:\home\workspace\cache\python_venv\lib\site-packages\decorator.py", line 203, in fix
2023-11-21 13:59:49     ba = sig.bind(*args, **kwargs)
2023-11-21 13:59:49   File "C:\Python310\lib\inspect.py", line 3177, in bind
2023-11-21 13:59:49     return self._bind(args, kwargs)
2023-11-21 13:59:49   File "C:\Python310\lib\inspErrors while running CTest
2023-11-21 13:59:49 ect.py", line 3098, in _bind
2023-11-21 13:59:49     raise TypeError('too many positional arguments') from None
2023-11-21 13:59:49 TypeError: too many positional arguments

所以在zero_dim那里，我把randint_like和randint分开了。试着改了下randint的，发现不行，就分开了。

MarioLulab

LGTM

python/paddle/tensor/random.py

test/legacy_test/test_zero_dim_tensor.py

fix

aa681cc

paddle-bot bot added the contributor External developers label Nov 13, 2023

luotao1 added the HappyOpenSource 快乐开源活动issue与PR label Nov 13, 2023

luotao1 assigned luotao1, 0x45f, YuanRisheng and MarioLulab Nov 13, 2023

enkilee added 3 commits November 13, 2023 11:17

fix

2b5bd60

fix

08d7381

fix

c885cd2

luotao1 mentioned this pull request Nov 14, 2023

新IR Python API适配升级 #58067

Closed

0x45f reviewed Nov 15, 2023

View reviewed changes

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

enkilee added 9 commits November 15, 2023 10:01

fix

176d001

fix

6b2e573

fix

60a2d00

fix

7a8c285

test out

75a1068

split test

80919eb

test

b18f75a

fix

ce26cc4

split

91dc248

fix

e801401

MarioLulab reviewed Nov 20, 2023

View reviewed changes

test/legacy_test/test_randint_like.py Show resolved Hide resolved

enkilee added 2 commits November 21, 2023 01:07

fix

42df8d7

fix

fd7f77c

fix

09d332f

enkilee closed this Nov 21, 2023

enkilee reopened this Nov 21, 2023

CI

6828509

0x45f reviewed Nov 23, 2023

View reviewed changes

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

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

python/paddle/utils/layers_utils.py Outdated Show resolved Hide resolved

enkilee added 5 commits November 23, 2023 08:15

fix

3dd6795

fix

e611fe4

fix

9201e14

fix

61e6406

fix

a77db9d

fix

fa6a189

MarioLulab approved these changes Nov 28, 2023

View reviewed changes

0x45f reviewed Nov 28, 2023

View reviewed changes

python/paddle/tensor/random.py Show resolved Hide resolved

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

enkilee added 6 commits November 28, 2023 05:00

fix randint

1b82c84

fix

33e9ced

fix

6c83f19

fix

684c73c

fix

a19238f

fix

82d4e62

MarioLulab reviewed Nov 29, 2023

View reviewed changes

test/legacy_test/test_zero_dim_tensor.py Show resolved Hide resolved

test/legacy_test/test_zero_dim_tensor.py Outdated Show resolved Hide resolved

fix

f8371bf

0x45f approved these changes Nov 30, 2023

View reviewed changes

0x45f merged commit f45fe2a into PaddlePaddle:develop Nov 30, 2023

enkilee deleted the pir-api-174 branch December 14, 2023 08:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

【PIR API adaptor No.174】 Migrate paddle.randint_like into pir #58953

【PIR API adaptor No.174】 Migrate paddle.randint_like into pir #58953

enkilee commented Nov 13, 2023

paddle-bot bot commented Nov 13, 2023

enkilee commented Nov 17, 2023 •

edited

Loading

MarioLulab commented Nov 17, 2023

MarioLulab commented Nov 19, 2023 •

edited

Loading

enkilee commented Nov 20, 2023

MarioLulab left a comment

enkilee commented Nov 21, 2023

enkilee commented Nov 21, 2023

enkilee commented Nov 24, 2023

MarioLulab commented Nov 26, 2023

enkilee commented Nov 27, 2023 •

edited

Loading

MarioLulab left a comment

【PIR API adaptor No.174】 Migrate paddle.randint_like into pir #58953

【PIR API adaptor No.174】 Migrate paddle.randint_like into pir #58953

Conversation

enkilee commented Nov 13, 2023

PR types

PR changes

Description

paddle-bot bot commented Nov 13, 2023

enkilee commented Nov 17, 2023 • edited Loading

MarioLulab commented Nov 17, 2023

MarioLulab commented Nov 19, 2023 • edited Loading

enkilee commented Nov 20, 2023

MarioLulab left a comment

Choose a reason for hiding this comment

enkilee commented Nov 21, 2023

enkilee commented Nov 21, 2023

enkilee commented Nov 24, 2023

MarioLulab commented Nov 26, 2023

enkilee commented Nov 27, 2023 • edited Loading

MarioLulab left a comment

Choose a reason for hiding this comment

enkilee commented Nov 17, 2023 •

edited

Loading

MarioLulab commented Nov 19, 2023 •

edited

Loading

enkilee commented Nov 27, 2023 •

edited

Loading