PaddlePaddle · risemeup1 · Dec 19, 2023 · Dec 19, 2023 · Dec 19, 2023
diff --git a/cmake/cinn/external/llvm.cmake b/cmake/cinn/external/llvm.cmake
@@ -88,7 +88,6 @@ llvm_map_components_to_libnames(
 message(STATUS "LLVM libs: ${llvm_libs}")
 
 get_property(mlir_libs GLOBAL PROPERTY MLIR_ALL_LIBS)
-message(STATUS "MLIR libs: ${mlir_libs}")
 add_definitions(${LLVM_DEFINITIONS})
 
 # The minimum needed libraries for MLIR IR parse and transform.

diff --git a/cmake/cinn/llvm.cmake b/cmake/cinn/llvm.cmake
@@ -54,7 +54,6 @@ llvm_map_components_to_libnames(
 message(STATUS "LLVM libs: ${llvm_libs}")
 
 get_property(mlir_libs GLOBAL PROPERTY MLIR_ALL_LIBS)
-message(STATUS "MLIR libs: ${mlir_libs}")
 add_definitions(${LLVM_DEFINITIONS})
 
 # The minimum needed libraries for MLIR IR parse and transform.

diff --git a/paddle/cinn/api/CMakeLists.txt b/paddle/cinn/api/CMakeLists.txt
@@ -1,5 +1,3 @@
 core_gather_headers()
 
 gather_srcs(cinnapi_src SRCS op_node.cc tensor_node.cc)
-
-message(STATUS "srcs: ${cinnapi_src}")
diff --git a/paddle/cinn/common/CMakeLists.txt b/paddle/cinn/common/CMakeLists.txt
@@ -23,8 +23,6 @@ gather_srcs(
   nvgpu_dev_info.cc
   integer_set.cc)
 
-message(STATUS "srcs: ${cinnapi_src}")
-
 cinn_cc_test(test_equation_graph_topo_walker SRCS
              equation_graph_topo_walker_test.cc DEPS gtest glog)
 cinn_cc_test(test_dfs_walker SRCS dfs_walker_test.cc DEPS gtest glog)

diff --git a/paddle/fluid/framework/new_executor/CMakeLists.txt b/paddle/fluid/framework/new_executor/CMakeLists.txt
@@ -17,8 +17,7 @@ set(STANDALONE_EXECUTOR_DEPS
     pir_adaptor
     program_translator
     instruction_base
-    pir
-    plan)
+    pir)
 
 cc_library(
   standalone_executor

diff --git a/paddle/fluid/framework/new_executor/instruction/CMakeLists.txt b/paddle/fluid/framework/new_executor/instruction/CMakeLists.txt
@@ -11,11 +11,13 @@ cc_library(
        tuple_pop_instruction.cc
        builtin_combine_instruction.cc
        instruction_util.cc
-  DEPS pir_adaptor phi common framework_proto)
-
+  DEPS framework_proto)
+if(WITH_MKLDNN)
+  add_dependencies(instruction_base mkldnn)
+endif()
 if(WITH_CINN AND NOT CINN_ONLY)
   cc_library(
     cinn_jit_instruction NOT_FOR_INFER
     SRCS cinn_jit_instruction.cc
-    DEPS phi common cinnapi cinn_op_dialect cinn_runtime_dialect)
+    DEPS cinnapi cinn_op_dialect cinn_runtime_dialect)
 endif()
diff --git a/paddle/fluid/framework/new_executor/interpreter/CMakeLists.txt b/paddle/fluid/framework/new_executor/interpreter/CMakeLists.txt
@@ -1,39 +1,14 @@
-set(INTERPRETER_SRCS data_transfer.cc dependency_builder.cc execution_config.cc
-                     interpreter_util.cc static_build.cc stream_analyzer.cc)
+set(INTERPRETER_SRCS
+    data_transfer.cc
+    dependency_builder.cc
+    execution_config.cc
+    interpreter_util.cc
+    static_build.cc
+    stream_analyzer.cc
+    plan.cc)
 
-set(INTERPRETER_DEPS
-    buffered_reader
-    device_context
-    global_utils
-    op_registry
-    scope
-    framework_proto
-    data_feed_proto
-    ops_extra_info
-    heter_service_proto
-    trainer_desc_proto
-    glog
-    lod_rank_table
-    framework_io
-    string_helper
-    fleet_wrapper
-    heter_wrapper
-    ps_gpu_wrapper
-    box_wrapper
-    lodtensor_printer
-    feed_fetch_method
-    graph_to_program_pass
-    variable_helper
-    timer
-    monitor
-    nan_inf_utils
-    enforce
-    scope
-    glog
-    phi
-    common
-    ${DEVICE_EVENT_LIBS}
-    glog)
+set(INTERPRETER_DEPS buffered_reader device_context global_utils op_registry
+                     ${DEVICE_EVENT_LIBS})
 
 if(WITH_CINN AND NOT CINN_ONLY)
   set(INTERPRETER_DEPS ${INTERPRETER_DEPS} cinn_jit_instruction)
@@ -43,8 +18,3 @@ cc_library(
   interpreter
   SRCS ${INTERPRETER_SRCS}
   DEPS standalone_executor ${INTERPRETER_DEPS})
-
-cc_library(
-  plan
-  SRCS plan.cc
-  DEPS proto_desc framework_proto)
diff --git a/paddle/fluid/framework/new_executor/pir_adaptor/CMakeLists.txt b/paddle/fluid/framework/new_executor/pir_adaptor/CMakeLists.txt
@@ -4,4 +4,4 @@ file(GLOB PIR_ADAPTOR_SRCS "*.cc")
 cc_library(
   pir_adaptor
   SRCS ${PIR_ADAPTOR_SRCS}
-  DEPS program_translator op_dialect)
+  DEPS program_translator)
diff --git a/paddle/fluid/framework/new_executor/workqueue/CMakeLists.txt b/paddle/fluid/framework/new_executor/workqueue/CMakeLists.txt
@@ -1,8 +1 @@
-cc_library(
-  workqueue_utils
-  SRCS workqueue_utils.cc events_waiter.cc
-  DEPS enforce glog common)
-cc_library(
-  workqueue
-  SRCS workqueue.cc
-  DEPS workqueue_utils enforce glog phi common)
+cc_library(workqueue SRCS workqueue.cc workqueue_utils.cc events_waiter.cc)
diff --git a/paddle/fluid/platform/profiler/CMakeLists.txt b/paddle/fluid/platform/profiler/CMakeLists.txt
@@ -5,7 +5,7 @@ cc_library(
 cc_library(
   cuda_tracer
   SRCS cuda_tracer.cc cupti_data_process.cc
-  DEPS enforce glog common workqueue_utils)
+  DEPS workqueue enforce glog common)
 cc_library(
   xpu_tracer
   SRCS xpu_tracer.cc

diff --git a/paddle/fluid/platform/profiler/custom_device/CMakeLists.txt b/paddle/fluid/platform/profiler/custom_device/CMakeLists.txt
@@ -1,4 +1,4 @@
 cc_library(
   custom_tracer
   SRCS custom_tracer.cc
-  DEPS enforce glog workqueue_utils common)
+  DEPS enforce glog common)
diff --git a/paddle/fluid/pybind/CMakeLists.txt b/paddle/fluid/pybind/CMakeLists.txt
@@ -36,7 +36,6 @@ set(PYBIND_DEPS
     cuda_graph_with_memory_pool
     fleet_executor
     global_utils
-    plan
     phi_utils
     phi
     op_dialect_vjp