update static list and open train for some subgraphs (PaddlePaddle#65489)

Author: xiaoyao0115

test/ir/pir/cinn/sub_graphs/CMakeLists.txt

@@ -1,63 +1,31 @@
 if(WITH_GPU)
   set(STATIC_BUILD_TESTS
-      test_sub_graph_0
-      test_sub_graph_1
-      test_sub_graph_2
-      test_sub_graph_3
-      test_sub_graph_5
-      test_sub_graph_10
       test_sub_graph_12
-      test_sub_graph_13
-      test_sub_graph_16
-      test_sub_graph_17
-      test_sub_graph_18
-      test_sub_graph_22
       test_sub_graph_23
-      test_sub_graph_24
-      test_sub_graph_25
-      test_sub_graph_26
-      test_sub_graph_27
-      test_sub_graph_28
-      test_sub_graph_29
-      test_sub_graph_30
-      test_sub_graph_31
-      test_sub_graph_33
       test_sub_graph_34
-      test_sub_graph_40
       test_sub_graph_42
       test_sub_graph_43
-      test_sub_graph_44
       test_sub_graph_48
       test_sub_graph_49
       test_sub_graph_add_n
       test_sub_graph_add
-      test_sub_graph_avg_pool2d
       test_sub_graph_chunk
-      test_sub_graph_max_pool2d
-      test_sub_graph_reshape
-      test_sub_graph_swish
       test_sub_graph_mul_method
-      test_sub_graph_adaptive_avg_pool2d
+      test_sub_graph_squeeze_unsqueeze
       test_sub_graph_52
-      test_sub_graph_55
       test_sub_graph_56
-      test_sub_graph_59
       test_sub_graph_61
       test_sub_graph_62
-      test_sub_graph_63
-      test_sub_graph_66
       test_sub_graph_67
       test_sub_graph_69
       test_sub_graph_73
-      test_sub_graph_74
       test_sub_graph_77
       test_sub_graph_79
       test_sub_graph_80
       test_sub_graph_82
-      test_sub_graph_84
+      test_sub_graph_85
       test_sub_graph_86
-      test_sub_graph_87
-      test_sub_graph_88)
+      test_sub_graph_87)
 
   file(
     GLOB DYNAMIC_BUILD_TESTS

test/ir/pir/cinn/sub_graphs/base.py

@@ -96,17 +96,29 @@ def test_ast_prim_cinn(self):
                     st.numpy(), cinn.numpy(), atol=self.atol
                 )
         if self.with_train:
-            st_loss = st_out.mean()
+            if type(st_out) == tuple:
+                st_loss, cinn_loss = 0, 0
+                for i in range(len(st_out)):
+                    st_loss += st_out[i].mean()
+                    cinn_loss += cinn_out[i].mean()
+            else:
+                st_loss = st_out.mean()
+                cinn_loss = cinn_out.mean()
             st_loss.backward()
             st_grad = []
             for i in range(len(st_inputs)):
-                if st_inputs[i].dtype != paddle.int64:
+                if (
+                    st_inputs[i].dtype != paddle.int64
+                    and st_inputs[i].grad is not None
+                ):
                     st_grad.append(st_inputs[i].grad.numpy().copy())
-            cinn_loss = cinn_out.mean()
             cinn_loss.backward()
             cinn_grad = []
             for i in range(len(cinn_inputs)):
-                if cinn_inputs[i].dtype != paddle.int64:
+                if (
+                    cinn_inputs[i].dtype != paddle.int64
+                    and cinn_inputs[i].grad is not None
+                ):
                     cinn_grad.append(cinn_inputs[i].grad.numpy().copy())
             for i in range(len(cinn_grad)):
                 np.testing.assert_allclose(

test/ir/pir/cinn/sub_graphs/test_sub_graph_0.py

@@ -135,6 +135,7 @@ def init(self):
             paddle.rand(shape=[22, 512, 7, 7], dtype=paddle.float32),
         )
         self.net = LayerCase
+        self.with_train = False
 
     def set_flags(self):
         # NOTE(Aurelius84): cinn_op.pool2d only support pool_type='avg' under adaptive=True

test/ir/pir/cinn/sub_graphs/test_sub_graph_14.py

@@ -72,7 +72,6 @@ def init(self):
             paddle.rand(shape=[22, 128, 56, 56], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_16.py

@@ -115,7 +115,6 @@ def init(self):
             paddle.rand(shape=[22, 28, 56, 56], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
 
     def set_flags(self):
         # NOTE(Aurelius84): cinn_op.pool2d only support pool_type='avg' under adaptive=True

test/ir/pir/cinn/sub_graphs/test_sub_graph_18.py

@@ -68,8 +68,8 @@ def init(self):
             paddle.rand(shape=[22, 1536, 8, 8], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_precision_compare = False
+        self.with_train = False
 
     # NOTE output mismatch with prim
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_20.py

@@ -77,7 +77,6 @@ def init(self):
             paddle.rand(shape=[86, 192], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_25.py

@@ -68,8 +68,8 @@ def init(self):
             paddle.rand(shape=[11, 1280, 7, 7], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_precision_compare = False
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_26.py

@@ -93,6 +93,7 @@ def init(self):
         )
         self.net = LayerCase
         self.atol = 1e-5
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_27.py

@@ -64,6 +64,7 @@ def init(self):
         )
         self.net = LayerCase
         self.with_precision_compare = False
+        self.with_train = False
 
     # NOTE prim + cinn lead to error
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_28.py

@@ -68,8 +68,8 @@ def init(self):
             paddle.rand(shape=[10, 320, 8, 8], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_precision_compare = False
+        self.with_train = False
 
     # NOTE prim + cinn lead to error
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_29.py

@@ -68,8 +68,8 @@ def init(self):
             paddle.rand(shape=[10, 2048, 10, 10], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_precision_compare = False
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_30.py

@@ -694,6 +694,7 @@ def init(self):
         )
         self.net = LayerCase
         self.atol = 1e-1
+        self.with_train = False
 
     # NOTE prim + cinn lead to error
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_31.py

@@ -66,8 +66,8 @@ def init(self):
             paddle.rand(shape=[22, 288, 14, 14], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.atol = 1e-8
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_33.py

@@ -84,8 +84,8 @@ def init(self):
             paddle.rand(shape=[10, 256, 14, 14], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.atol = 1e-5
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_34.py

@@ -57,8 +57,8 @@ def init(self):
             paddle.rand(shape=[10, 32, 56, 56], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.atol = 1e-8
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_43.py

@@ -258,7 +258,6 @@ def init(self):
             paddle.rand(shape=[1, 2048, 24, 36], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.atol = 1e-5
 
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_44.py

@@ -143,7 +143,6 @@ def init(self):
             paddle.rand(shape=[1, 100, 256], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.atol = 1e-8
         self.with_cinn = False
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_48.py

@@ -190,8 +190,8 @@ def init(self):
             paddle.rand(shape=[1, 625, 1], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.atol = 1e-5
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_49.py

@@ -66,7 +66,6 @@ def init(self):
             paddle.rand(shape=[1], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_54.py

@@ -117,7 +117,6 @@ def init(self):
             paddle.rand(shape=[1, 96, 128, 128], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_56.py

@@ -74,7 +74,6 @@ def init(self):
             paddle.rand(shape=[24], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
 
     # NOTE prim + cinn lead to error
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_57.py

@@ -42,7 +42,6 @@ def init(self):
         self.input_specs = []
         self.inputs = ()
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_61.py

@@ -91,7 +91,6 @@ def init(self):
             paddle.rand(shape=[1, 4], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.atol = 1e-5
 
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_62.py

@@ -71,7 +71,6 @@ def init(self):
             paddle.rand(shape=[1], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.atol = 1e-8
 
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_65.py

@@ -55,7 +55,6 @@ def init(self):
         ]
         self.inputs = (paddle.rand(shape=[2, 2002], dtype=paddle.float32),)
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_66.py

@@ -64,7 +64,6 @@ def init(self):
         ]
         self.inputs = (paddle.rand(shape=[2, 1788], dtype=paddle.float32),)
         self.net = LayerCase
-        self.with_train = False
 
     # NOTE prim + cinn lead to error
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_67.py

@@ -134,8 +134,8 @@ def init(self):
             paddle.randint(low=0, high=10, shape=[1], dtype=paddle.int32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_cinn = False
+        self.with_train = False
 
     # NOTE prim + cinn lead to error
 

test/ir/pir/cinn/sub_graphs/test_sub_graph_69.py

@@ -65,8 +65,8 @@ def init(self):
             paddle.rand(shape=[1, 171888, 4], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_precision_compare = False
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_7.py

@@ -80,8 +80,8 @@ def init(self):
             paddle.randint(low=0, high=10, shape=[49, 49], dtype=paddle.int64),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_cinn = False
+        self.with_train = False
 
     # NOTE prim + cinn lead to error
     # NOTE can not pass when atol=1e-8 with prim

test/ir/pir/cinn/sub_graphs/test_sub_graph_72.py

@@ -143,7 +143,6 @@ def init(self):
         self.input_specs = []
         self.inputs = ()
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_73.py

@@ -98,8 +98,8 @@ def init(self):
             paddle.rand(shape=[2], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_cinn = False
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_74.py

@@ -75,8 +75,8 @@ def init(self):
             paddle.rand(shape=[2], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
         self.with_precision_compare = False
+        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_77.py

@@ -209,7 +209,6 @@ def init(self):
             paddle.rand(shape=[1], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':

test/ir/pir/cinn/sub_graphs/test_sub_graph_80.py

@@ -125,7 +125,6 @@ def init(self):
             paddle.rand(shape=[1, 3, 48, 48, 1], dtype=paddle.float32),
         )
         self.net = LayerCase
-        self.with_train = False
 
 
 if __name__ == '__main__':