【PIR API adaptor No.58, 62, 64, 70】Migrate some ops into pir #59230

longranger2 · 2023-11-21T15:44:58Z

PR types

Others

PR changes

APIs

Description

PIR API 推全升级
将如下算子迁移升级至 pir，并更新单测

Dirichlet（0/3）：test_dirichlet_op.py单测暂不打开，因为暂时还没有想到好的办法去添加这个 self.python_api
test/distribution/test_dirichlet_op.py未适配该单测
eigvals（19/19）
ELU（1/2）：其中一个是用来检测error的
scaled_dot_product_attention
新IR Python API适配升级 #58067

longranger2 · 2023-11-21T15:46:36Z

第70个这个不清楚要怎么进行修改呢？paddle.nn.functional.scaled_dot_product_attention

MarioLulab · 2023-11-23T02:48:00Z

scaled_dot_product_attention

可以先对应适配 flash_attention，然后在 scaled_dot_product_attention 和 flash_attention 的相关单测中打开 pir 检查

MarioLulab · 2023-11-28T02:20:44Z

test/distribution/test_dirichlet_op.py

@@ -31,6 +31,7 @@ class TestDirichletOp(OpTest):

    def setUp(self):
        self.op_type = "dirichlet"
+        self.python_api = paddle.distribution.Dirichlet
        self.alpha = np.array((1.0, 2.0))


python_api 需要是一个 callable 对象，其调用的结果是返回结果。比方说这里的 self.python_api = paddle.distribution.Dirichlet，如果调用只是实例化了一个 Dirichlet 对象；而 self.python_api = paddle.distribution.Dirichlet(...).sample，这个 self.python_api 被调用才是返回一个结果。这里单测的结果需要和 self._hypothesis_testing 作比较，所以 self.python_api 需要根据 self._hypothesis_testing 相应的计算类型进行对应的设置

这个单测的适配先跳过吧，可以在 pr 描述里补充说明一下~ 我暂时还没有想到好的办法去添加这个 self.python_api

test/distribution/test_dirichlet_op.py

MarioLulab · 2023-11-28T02:29:35Z

test/legacy_test/test_activation_op.py

该文件下还有 TestELU 单测，以及被 create_test_act_bf16_class 和 create_test_act_fp16_class 创建的 bf16 和 fp16 的 TestELU 单测遗漏了~ 麻烦一起适配一下吧

MarioLulab · 2023-11-28T02:36:58Z

test/legacy_test/test_flash_attention.py

@@ -152,9 +153,20 @@ def test_unpadded(self):
            q.grad.numpy(), q_.grad.numpy(), rtol=5e-03, atol=1e-03
        )

-        # test static
+    @test_with_pir_api
+    def test_static_unpadded(self):


想问下这里为何适配了 flash_attn_unpadded 的单测？

看错了😭

MarioLulab · 2023-11-28T02:37:31Z

test/legacy_test/test_flash_attention.py

@@ -255,9 +271,30 @@ def test_all(self):
            q.grad.numpy(), q_.grad.numpy(), rtol=5e-03, atol=1e-03
        )

-        # test static
+    def test_static_all(self):


需要使用 @test_with_pir_api 装饰

MarioLulab

python/paddle/distribution/dirichlet.py 里的 _dirichlet 函数需要适配 pir mode

test/distribution/test_distribution_dirichlet_static.py

MarioLulab · 2023-11-29T13:55:12Z

test/distribution/test_dirichlet_op.py

@@ -31,6 +31,7 @@ class TestDirichletOp(OpTest):

    def setUp(self):
        self.op_type = "dirichlet"
+        self.python_api = paddle.distribution.Dirichlet
        self.alpha = np.array((1.0, 2.0))


这个单测的适配先跳过吧，可以在 pr 描述里补充说明一下~ 我暂时还没有想到好的办法去添加这个 self.python_api

MarioLulab · 2023-12-04T03:24:35Z

test/distribution/test_distribution_dirichlet_static.py

@@ -32,15 +33,23 @@
 )
 class TestDirichlet(unittest.TestCase):


TestDirichlet 还是建议单独写一个针对 pir 的单测，因为此处旧 ir 单测与 pir 单测兼容起来比较麻烦，可读性较差。比如 TestDirichletPir
其 setUp 阶段：

def setUp(self): with paddle.pir_utils.IrGuard(): self.program = paddle.static.Program() with paddle.static.program_guard(self.program): conc = paddle.static.data( 'conc', self.concentration.shape, self.concentration.dtype ) self._paddle_diric = paddle.distribution.Dirichlet(conc) self.feeds = {'conc': self.concentration}

单测写成如下形式：

def test_all(self): with paddle.pir_utils.IrGuard(): self._test_mean(self.program) self._test_variance(self.program) ...

MarioLulab · 2023-12-18T07:53:17Z

辛苦解决一下冲突~

longranger2 · 2023-12-24T14:15:00Z

done

MarioLulab · 2023-12-26T05:01:35Z

test/distribution/test_distribution_dirichlet_static.py

+    @test_with_pir_api
+    def test_mean(self):
+        with paddle.static.program_guard(self.program):
+            [out] = self.executor.run(
+                self.program,
+                feed=self.feeds,
+                fetch_list=[self._paddle_diric.mean],
+            )
+            np.testing.assert_allclose(
+                out,
+                scipy.stats.dirichlet.mean(self.concentration),
+                rtol=RTOL.get(str(self.concentration.dtype)),
+                atol=ATOL.get(str(self.concentration.dtype)),
+            )


Suggested change

@test_with_pir_api

def test_mean(self):

with paddle.static.program_guard(self.program):

[out] = self.executor.run(

self.program,

feed=self.feeds,

fetch_list=[self._paddle_diric.mean],

)

np.testing.assert_allclose(

out,

scipy.stats.dirichlet.mean(self.concentration),

rtol=RTOL.get(str(self.concentration.dtype)),

atol=ATOL.get(str(self.concentration.dtype)),

)

def test_mean(self):

with paddle.pir_utils.IrGuard():

with paddle.static.program_guard(self.program):

[out] = self.executor.run(

self.program,

feed=self.feeds,

fetch_list=[self._paddle_diric.mean],

)

np.testing.assert_allclose(

out,

scipy.stats.dirichlet.mean(self.concentration),

rtol=RTOL.get(str(self.concentration.dtype)),

atol=ATOL.get(str(self.concentration.dtype)),

)

此处不宜使用 @test_with_pir_api，被 @test_with_pir_api 修饰的单测会在旧 ir 模式和 pir 模式下分别运行一次。因为该单测为 pir 单测，所以我们只需要在 Pir 模式下运行就好了。使用 paddle.pir_utils.IrGuard() 作为上下文管理器可以切换到 pir 模式进行组网

MarioLulab · 2023-12-26T05:01:55Z

test/distribution/test_distribution_dirichlet_static.py

+                atol=ATOL.get(str(self.concentration.dtype)),
+            )
+
+    @test_with_pir_api


同上，需要修改

MarioLulab · 2023-12-26T05:02:00Z

test/distribution/test_distribution_dirichlet_static.py

+                atol=ATOL.get(str(self.concentration.dtype)),
+            )
+
+    @test_with_pir_api


同上，需要修改

MarioLulab · 2023-12-26T05:02:07Z

test/distribution/test_distribution_dirichlet_static.py

+                atol=ATOL.get(str(self.concentration.dtype)),
+            )
+
+    @test_with_pir_api


同上，需要修改

MarioLulab · 2023-12-26T05:02:11Z

test/distribution/test_distribution_dirichlet_static.py

+                atol=ATOL.get(str(self.concentration.dtype)),
+            )
+
+    @test_with_pir_api


同上，需要修改

MarioLulab · 2023-12-26T05:03:04Z

test/distribution/test_distribution_dirichlet_static.py

+    def test_all(self):
+        self._test_mean(self.program)
+        self._test_variance(self.program)
+        self._test_prob(self.program)
+        self._test_log_prob(self.program)
+        self._test_entropy(self.program)


Suggested change

def test_all(self):

self._test_mean(self.program)

self._test_variance(self.program)

self._test_prob(self.program)

self._test_log_prob(self.program)

self._test_entropy(self.program)

该单测可以删除了，因为当前不存在 _test_mean 等函数

MarioLulab · 2023-12-26T05:04:51Z

test/distribution/test_dirichlet_op.py

+        self.python_api = paddle.distribution.Dirichlet(self.alpha).sample(
+            self.sample_shape
+        )


Suggested change

self.python_api = paddle.distribution.Dirichlet(self.alpha).sample(

self.sample_shape

)

先复原对 test/distribution/test_dirichlet_op.py 文件的改动，并在 pr 描述里说明一下未适配该单测~

paddle-ci-bot · 2024-01-05T03:14:57Z

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

paddle-ci-bot · 2024-01-14T03:03:38Z

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

YuanRisheng · 2024-01-16T06:34:01Z

@longranger2 辛苦重新提交代码解决一下代码冲突

0x45f · 2024-01-24T02:46:37Z

相关API我们内部来进行适配吧~

paddle-ci-bot · 2024-01-25T03:10:51Z

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

migrate Dirichlet, eigvals, ELU into pir

111150c

luotao1 mentioned this pull request Nov 21, 2023

新IR Python API适配升级 #58067

Closed

luotao1 added contributor External developers HappyOpenSource 快乐开源活动issue与PR labels Nov 22, 2023

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

longranger2 added 3 commits November 26, 2023 17:35

fix bug

e8cbd34

migrate flash_attention into pir

2b54a58

fix bug

473af57

MarioLulab reviewed Nov 28, 2023

View reviewed changes

fix bug

bf4f8e2

MarioLulab reviewed Nov 29, 2023

View reviewed changes

longranger2 added 2 commits December 3, 2023 10:32

fix bug

d4919d4

fix bug

658fe16

MarioLulab reviewed Dec 4, 2023

View reviewed changes

longranger2 added 2 commits December 24, 2023 22:12

fix bug

ea2667e

fix bug

534c928

Update test_distribution_dirichlet_static.py

737a127

MarioLulab reviewed Dec 26, 2023

View reviewed changes

fix bug

8fca8f9

Merge branch 'PaddlePaddle:develop' into pir7

33253f2

fix bug

9711cc9

luotao1 closed this Mar 7, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

【PIR API adaptor No.58, 62, 64, 70】Migrate some ops into pir #59230

【PIR API adaptor No.58, 62, 64, 70】Migrate some ops into pir #59230

longranger2 commented Nov 21, 2023 •

edited

longranger2 commented Nov 21, 2023

MarioLulab commented Nov 23, 2023

MarioLulab Nov 28, 2023

MarioLulab Nov 29, 2023

This comment was marked as off-topic.

This comment was marked as resolved.

MarioLulab Nov 28, 2023

MarioLulab Nov 28, 2023

longranger2 Nov 28, 2023 •

edited

MarioLulab Nov 28, 2023

MarioLulab left a comment

This comment was marked as resolved.

MarioLulab Nov 29, 2023

MarioLulab Dec 4, 2023

MarioLulab commented Dec 18, 2023

longranger2 commented Dec 24, 2023

MarioLulab Dec 26, 2023

MarioLulab Dec 26, 2023

MarioLulab Dec 26, 2023

MarioLulab Dec 26, 2023

MarioLulab Dec 26, 2023

MarioLulab Dec 26, 2023

MarioLulab Dec 26, 2023

paddle-ci-bot bot commented Jan 5, 2024

paddle-ci-bot bot commented Jan 14, 2024

YuanRisheng commented Jan 16, 2024

0x45f commented Jan 24, 2024

paddle-ci-bot bot commented Jan 25, 2024

	self.python_api = paddle.distribution.Dirichlet(self.alpha).sample(
	self.sample_shape
	)

【PIR API adaptor No.58, 62, 64, 70】Migrate some ops into pir #59230

【PIR API adaptor No.58, 62, 64, 70】Migrate some ops into pir #59230

Conversation

longranger2 commented Nov 21, 2023 • edited

PR types

PR changes

Description

longranger2 commented Nov 21, 2023

MarioLulab commented Nov 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as off-topic.

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

longranger2 Nov 28, 2023 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MarioLulab left a comment

Choose a reason for hiding this comment

This comment was marked as resolved.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MarioLulab commented Dec 18, 2023

longranger2 commented Dec 24, 2023

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

paddle-ci-bot bot commented Jan 5, 2024

paddle-ci-bot bot commented Jan 14, 2024

YuanRisheng commented Jan 16, 2024

0x45f commented Jan 24, 2024

paddle-ci-bot bot commented Jan 25, 2024

longranger2 commented Nov 21, 2023 •

edited

longranger2 Nov 28, 2023 •

edited