rebuild matmul pass: trt and gpu_cpu

PaddlePaddle · Feb 8, 2022 · 29c4a74 · 29c4a74 · paddle-bot-old · Feb 9, 2022
1 parent 38da4e9
commit 29c4a74
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/python/paddle/fluid/contrib/slim/quantization/quant2_int8_mkldnn_pass.py b/python/paddle/fluid/contrib/slim/quantization/quant2_int8_mkldnn_pass.py
@@ -410,16 +410,16 @@ def _optimize_fp32_graph(self, graph):
         graph = self._apply_pass(graph, 'multi_gru_fuse_pass')
         graph = self._apply_pass(graph, 'multi_gru_seq_fuse_pass')
         graph = self._apply_pass(graph, 'seq_concat_fc_fuse_pass')
-        graph = self._apply_pass(graph, 'squeeze2_matmul_fuse_pass')
-        graph = self._apply_pass(graph, 'reshape2_matmul_fuse_pass')
-        graph = self._apply_pass(graph, 'flatten2_matmul_fuse_pass')
+        graph = self._apply_pass(graph, 'gpu_cpu_squeeze2_matmul_fuse_pass')
+        graph = self._apply_pass(graph, 'gpu_cpu_reshape2_matmul_fuse_pass')
+        graph = self._apply_pass(graph, 'gpu_cpu_flatten2_matmul_fuse_pass')
         graph = self._apply_pass(graph, 'matmul_v2_scale_fuse_pass')
         graph = self._apply_pass(graph, 'squared_mat_sub_fuse_pass')
         graph = self._apply_pass(graph, 'is_test_pass')
-        graph = self._apply_pass(graph, 'map_matmul_v2_to_mul_pass')
-        graph = self._apply_pass(graph, 'map_matmul_v2_to_matmul_pass')
+        graph = self._apply_pass(graph, 'gpu_cpu_map_matmul_v2_to_mul_pass')
+        graph = self._apply_pass(graph, 'gpu_cpu_map_matmul_v2_to_matmul_pass')
         graph = self._apply_pass(graph, 'matmul_scale_fuse_pass')
-        graph = self._apply_pass(graph, 'map_matmul_to_mul_pass')
+        graph = self._apply_pass(graph, 'gpu_cpu_map_matmul_to_mul_pass')
         graph = self._apply_pass(graph, 'repeated_fc_relu_fuse_pass')
         graph = self._apply_pass(graph, 'mkldnn_placement_pass',
                                  ['mkldnn_enabled_op_types'], [set()])

diff --git a/python/paddle/fluid/tests/unittests/ir/inference/test_flatten2_matmul_fuse_pass.py b/python/paddle/fluid/tests/unittests/ir/inference/test_flatten2_matmul_fuse_pass.py
@@ -174,7 +174,7 @@ def test(self):
             quant=False,
             max_examples=50,
             max_duration=1000,
-            passes=["flatten2_matmul_fuse_pass"])
+            passes=["gpu_cpu_flatten2_matmul_fuse_pass"])
 
 
 if __name__ == "__main__":

diff --git a/python/paddle/fluid/tests/unittests/ir/inference/test_map_matmul_to_mul_pass.py b/python/paddle/fluid/tests/unittests/ir/inference/test_map_matmul_to_mul_pass.py
@@ -116,7 +116,7 @@ def test(self):
         self.run_and_statis(
             quant=False,
             max_examples=100,
-            passes=["map_matmul_to_mul_pass"],
+            passes=["gpu_cpu_map_matmul_to_mul_pass"],
             max_duration=180)
 
 

diff --git a/python/paddle/fluid/tests/unittests/ir/inference/test_map_matmul_v2_to_matmul_pass.py b/python/paddle/fluid/tests/unittests/ir/inference/test_map_matmul_v2_to_matmul_pass.py
@@ -127,7 +127,7 @@ def test(self):
         self.run_and_statis(
             quant=False,
             max_examples=100,
-            passes=["map_matmul_v2_to_matmul_pass"])
+            passes=["gpu_cpu_map_matmul_v2_to_matmul_pass"])
 
 
 if __name__ == "__main__":

diff --git a/python/paddle/fluid/tests/unittests/ir/inference/test_map_matmul_v2_to_mul_pass.py b/python/paddle/fluid/tests/unittests/ir/inference/test_map_matmul_v2_to_mul_pass.py
@@ -110,8 +110,9 @@ def sample_program_config(self, draw):
 
     def test(self):
         self.run_and_statis(
-            quant=False, max_examples=100,
-            passes=["map_matmul_v2_to_mul_pass"])
+            quant=False,
+            max_examples=100,
+            passes=["gpu_cpu_map_matmul_v2_to_mul_pass"])
 
 
 if __name__ == "__main__":

diff --git a/...e/fluid/tests/unittests/ir/inference/test_mkldnn_matmul_v2_transpose_reshape_fuse_pass.py b/...e/fluid/tests/unittests/ir/inference/test_mkldnn_matmul_v2_transpose_reshape_fuse_pass.py
@@ -132,7 +132,7 @@ def generate_input(type):
         return program_config
 
     def sample_predictor_configs(self, program_config):
-        # map_matmul_v2_to_matmul_pass will affect the type of final fused op 
+        # gpu_cpu_map_matmul_v2_to_matmul_pass will affect the type of final fused op 
         fused_op = "matmul_v2"
         input1_dim1 = program_config.inputs["input_data1"].shape[0]
         input2_dim1 = program_config.inputs["input_data2"].shape[0]

diff --git a/python/paddle/fluid/tests/unittests/ir/inference/test_reshape2_matmul_fuse_pass.py b/python/paddle/fluid/tests/unittests/ir/inference/test_reshape2_matmul_fuse_pass.py
@@ -172,7 +172,7 @@ def test(self):
             quant=False,
             max_examples=50,
             max_duration=1000,
-            passes=["reshape2_matmul_fuse_pass"])
+            passes=["gpu_cpu_reshape2_matmul_fuse_pass"])
 
 
 if __name__ == "__main__":

diff --git a/python/paddle/fluid/tests/unittests/ir/inference/test_squeeze2_matmul_fuse_pass.py b/python/paddle/fluid/tests/unittests/ir/inference/test_squeeze2_matmul_fuse_pass.py
@@ -180,7 +180,7 @@ def test(self):
             quant=False,
             max_examples=50,
             max_duration=1000,
-            passes=["squeeze2_matmul_fuse_pass"])
+            passes=["gpu_cpu_squeeze2_matmul_fuse_pass"])
 
 
 if __name__ == "__main__":