[NewIR] No.13 Migrate paddle.multiply into pir (PaddlePaddle#57175)

danleifeng · Sep 14, 2023 · 96983a7 · 96983a7
1 parent b1ad1ec
commit 96983a7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/python/paddle/tensor/math.py b/python/paddle/tensor/math.py
@@ -1081,7 +1081,7 @@ def multiply(x, y, name=None):
               [2, 4, 6]]])
 
     """
-    if in_dynamic_mode():
+    if in_dynamic_or_pir_mode():
         return _C_ops.multiply(x, y)
     else:
         if x.dtype != y.dtype:

diff --git a/test/legacy_test/test_elementwise_mul_op.py b/test/legacy_test/test_elementwise_mul_op.py
@@ -47,7 +47,10 @@ def setUp(self):
 
     def test_check_output(self):
         # TODO(wangzhongpu): support mkldnn op in dygraph mode
-        self.check_output(check_dygraph=(not self.use_mkldnn))
+        self.check_output(
+            check_dygraph=(not self.use_mkldnn),
+            check_new_ir=(not self.use_mkldnn),
+        )
 
     def test_check_grad_normal(self):
         # TODO(wangzhongpu): support mkldnn op in dygraph mode
@@ -56,6 +59,7 @@ def test_check_grad_normal(self):
             'Out',
             check_dygraph=(not self.use_mkldnn),
             check_prim=True,
+            check_new_ir=(not self.use_mkldnn),
         )
 
     def test_check_grad_ingore_x(self):
@@ -66,6 +70,7 @@ def test_check_grad_ingore_x(self):
             no_grad_set=set("X"),
             check_dygraph=(not self.use_mkldnn),
             check_prim=True,
+            check_new_ir=(not self.use_mkldnn),
         )
 
     def test_check_grad_ingore_y(self):
@@ -76,6 +81,7 @@ def test_check_grad_ingore_y(self):
             no_grad_set=set('Y'),
             check_dygraph=(not self.use_mkldnn),
             check_prim=True,
+            check_new_ir=(not self.use_mkldnn),
         )
 
     def init_input_output(self):
@@ -193,14 +199,15 @@ def test_check_output(self):
         self.check_output()
 
     def test_check_grad_normal(self):
-        self.check_grad(['X', 'Y'], 'Out', check_prim=True)
+        self.check_grad(['X', 'Y'], 'Out', check_prim=True, check_new_ir=True)
 
     def test_check_grad_ingore_x(self):
         self.check_grad(
             ['Y'],
             'Out',
             no_grad_set=set("X"),
             check_prim=True,
+            check_new_ir=True,
         )
 
     def test_check_grad_ingore_y(self):
@@ -209,6 +216,7 @@ def test_check_grad_ingore_y(self):
             'Out',
             no_grad_set=set('Y'),
             check_prim=True,
+            check_new_ir=True,
         )
 
     def if_enable_cinn(self):
@@ -264,7 +272,8 @@ def setUp(self):
 
     def test_check_output(self):
         self.check_output(
-            check_dygraph=self.check_dygraph, check_prim=self.check_prim
+            check_dygraph=self.check_dygraph,
+            check_prim=self.check_prim,
         )
 
     def test_check_grad_normal(self):
@@ -418,6 +427,7 @@ def test_check_grad_normal(self):
             'Out',
             check_dygraph=(not self.use_mkldnn),
             check_prim=True,
+            check_new_ir=(not self.use_mkldnn),
         )
 
     def test_check_grad_ingore_x(self):
@@ -428,6 +438,7 @@ def test_check_grad_ingore_x(self):
             no_grad_set=set("X"),
             check_dygraph=(not self.use_mkldnn),
             check_prim=True,
+            check_new_ir=(not self.use_mkldnn),
         )
 
     def test_check_grad_ingore_y(self):
@@ -438,6 +449,7 @@ def test_check_grad_ingore_y(self):
             no_grad_set=set('Y'),
             check_dygraph=(not self.use_mkldnn),
             check_prim=True,
+            check_new_ir=(not self.use_mkldnn),
         )