fix bug (#58640)

risemeup1 · web-flow · commit 234bdf6bb56a · 2023-11-08T11:29:59.000+08:00
diff --git a/paddle/fluid/framework/CMakeLists.txt b/paddle/fluid/framework/CMakeLists.txt
@@ -880,8 +880,7 @@ cc_library(
 cc_library(
   executor_cache
   SRCS executor_cache.cc
-  DEPS parallel_executor standalone_executor pir_adaptor pd_inplace_pass
-       pd_op_to_kernel_pass pir)
+  DEPS parallel_executor standalone_executor pir_adaptor transform pir)
 cc_library(
   prune
   SRCS prune.cc
diff --git a/paddle/fluid/framework/new_executor/CMakeLists.txt b/paddle/fluid/framework/new_executor/CMakeLists.txt
@@ -13,11 +13,10 @@ set(STANDALONE_EXECUTOR_DEPS
     interpretercore_garbage_collector
     workqueue
     op_dialect_vjp
-    pd_op_to_kernel_pass
+    transform
     pir_adaptor
     program_translator
     instruction_base
-    pd_inplace_pass
     pir
     plan)
 
diff --git a/paddle/fluid/pir/transforms/CMakeLists.txt b/paddle/fluid/pir/transforms/CMakeLists.txt
@@ -1,43 +1,16 @@
-file(GLOB FUSION_PASS_SRCS "fusion/*.cc")
-
-cc_library(
-  fusion_passes
-  SRCS ${FUSION_PASS_SRCS}
-  DEPS drr)
-
-cc_library(
-  transform_general_functions
-  SRCS transform_general_functions.cc
-  DEPS op_dialect)
-
-cc_library(
-  pd_op_to_kernel_pass
-  SRCS pd_op_to_kernel_pass.cc
-  DEPS op_dialect op_dialect_vjp)
-
-cc_library(
-  pd_constant_folding_pass
-  SRCS constant_folding_pass.cc
-  DEPS standalone_executor pd_op_to_kernel_pass transform_general_functions)
-
-cc_library(
-  dead_code_elimination_pass
-  SRCS dead_code_elimination_pass.cc
-  DEPS op_dialect_vjp pir)
-
-cc_library(
-  pd_inplace_pass
-  SRCS inplace_pass.cc
-  DEPS op_dialect)
+file(GLOB_RECURSE transforms_srcs "*.cc")
+if(NOT WITH_CINN)
+  list(REMOVE_ITEM transforms_srcs
+       ${CMAKE_CURRENT_SOURCE_DIR}/build_cinn_pass.cc)
+endif()
 
-cc_library(
-  replace_fetch_with_shadow_output_pass
-  SRCS replace_fetch_with_shadow_output_pass.cc
-  DEPS op_dialect_vjp pir)
+set(transforms_deps drr op_dialect op_dialect_vjp standalone_executor pir)
 
 if(WITH_CINN)
-  cc_library(
-    pd_build_cinn_pass
-    SRCS build_cinn_pass.cc
-    DEPS op_dialect_vjp cinn_op_dialect pir cinnapi)
+  set(transforms_deps ${transforms_deps} cinn_op_dialect cinnapi)
 endif()
+
+cc_library(
+  transform
+  SRCS ${transforms_srcs}
+  DEPS ${transforms_deps})
diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt
@@ -41,10 +41,7 @@ set(PYBIND_DEPS
     pir_adaptor
     op_dialect_vjp
     program_translator
-    pd_inplace_pass
-    fusion_passes
-    replace_fetch_with_shadow_output_pass
-    dead_code_elimination_pass
+    transform
     pir
     new_profiler
     jit_layer
@@ -55,7 +52,7 @@ set(PYBIND_DEPS
     auto_parallel)
 
 if(WITH_CINN)
-  set(PYBIND_DEPS ${PYBIND_DEPS} pd_build_cinn_pass op_with_group_merge_pass)
+  set(PYBIND_DEPS ${PYBIND_DEPS} transform op_with_group_merge_pass)
 endif()
 
 if(WITH_PSCORE)
diff --git a/test/cpp/pir/cinn/CMakeLists.txt b/test/cpp/pir/cinn/CMakeLists.txt
@@ -53,7 +53,7 @@ if(WITH_TESTING AND WITH_CINN)
     pir_all_path_test.cc
     DEPS
     op_with_group_merge_pass
-    pd_build_cinn_pass
+    transform
     cinn_op_dialect
     pd_to_cinn_pass
     add_broadcast_to_elementwise_pass)
@@ -68,11 +68,11 @@ if(WITH_TESTING AND WITH_CINN)
     add_broadcast_to_elementwise_pass
     op_with_group_merge_pass
     cinn_op_dialect
-    pd_build_cinn_pass)
+    transform)
   set_tests_properties(test_group_op PROPERTIES LABELS "RUN_TYPE=CINN")
 
   paddle_test(test_pir_build_cinn_pass SRCS build_cinn_pass_test.cc DEPS
-              pd_build_cinn_pass pir)
+              transform pir)
   set_tests_properties(test_pir_build_cinn_pass PROPERTIES LABELS
                                                            "RUN_TYPE=CINN")
 endif()
diff --git a/test/cpp/pir/kernel_dialect/CMakeLists.txt b/test/cpp/pir/kernel_dialect/CMakeLists.txt
@@ -3,7 +3,7 @@ cc_test_old(
   SRCS
   ir_kernel_dialect_pass_test.cc
   DEPS
-  pd_op_to_kernel_pass
+  transform
   program_translator
   op_dialect
   pir
diff --git a/test/cpp/pir/pattern_rewrite/CMakeLists.txt b/test/cpp/pir/pattern_rewrite/CMakeLists.txt
@@ -1,6 +1,4 @@
-set(PATTERN_REWRITE_TEST_DEPS
-    pd_constant_folding_pass dead_code_elimination_pass
-    transform_general_functions gtest op_dialect_vjp pir)
+set(PATTERN_REWRITE_TEST_DEPS transform gtest op_dialect_vjp pir)
 
 if(WITH_DISTRIBUTE)
   set(PATTERN_REWRITE_TEST_DEPS ${PATTERN_REWRITE_TEST_DEPS} fleet_executor
@@ -13,27 +11,27 @@ cc_test_old(pattern_rewrite_test SRCS pattern_rewrite_test.cc DEPS
 cc_test(
   drr_test
   SRCS drr_test.cc
-  DEPS drr dead_code_elimination_pass)
+  DEPS drr transform)
 
 cc_test(
   drr_same_type_binding_test
   SRCS drr_same_type_binding_test.cc
-  DEPS drr gtest op_dialect_vjp pir dead_code_elimination_pass)
+  DEPS drr gtest op_dialect_vjp pir transform)
 
 cc_test(
   drr_fuse_linear_test
   SRCS drr_fuse_linear_test.cc
-  DEPS fusion_passes drr gtest op_dialect_vjp pir dead_code_elimination_pass)
+  DEPS transform drr gtest op_dialect_vjp pir)
 
 cc_test(
   drr_fuse_linear_param_grad_add_test
   SRCS drr_fuse_linear_param_grad_add_test.cc
-  DEPS fusion_passes drr gtest op_dialect_vjp pir dead_code_elimination_pass)
+  DEPS transform drr gtest op_dialect_vjp pir)
 
 cc_test(
   drr_attention_fuse_test
   SRCS drr_attention_fuse_test.cc
-  DEPS fusion_passes drr gtest op_dialect_vjp pir dead_code_elimination_pass)
+  DEPS transform drr gtest op_dialect_vjp pir)
 
 set_tests_properties(pattern_rewrite_test
                      PROPERTIES ENVIRONMENT "FLAGS_enable_pir_in_executor=true")
