PaddlePaddle
diff --git a/‎paddle/fluid/eager/auto_code_generator/CMakeLists.txt
Copy file name to clipboard
-118Lines changed: 0 additions & 118 deletions b/‎paddle/fluid/eager/auto_code_generator/CMakeLists.txt
Copy file name to clipboard
-118Lines changed: 0 additions & 118 deletions
diff --git a/‎paddle/fluid/pybind/CMakeLists.txt
Copy file name to clipboard
+150-14Lines changed: 150 additions & 14 deletions b/‎paddle/fluid/pybind/CMakeLists.txt
Copy file name to clipboard
+150-14Lines changed: 150 additions & 14 deletions
@@ -21,19 +21,7 @@ if(WITH_CUSTOM_DEVICE)
                            custom_device_common_op_registry)
 endif()
 
-add_executable(eager_generator eager_generator.cc)
-target_link_libraries(eager_generator ${EAGER_GENERATOR_DEPS})
-
 get_property(os_dependency_modules GLOBAL PROPERTY OS_DEPENDENCY_MODULES)
-target_link_libraries(eager_generator ${os_dependency_modules})
-
-if(WITH_ROCM)
-  target_link_libraries(eager_generator ${ROCM_HIPRTC_LIB})
-endif()
-
-if(WITH_CINN)
-  target_link_libraries(eager_generator ${PYTHON_LIBRARIES})
-endif()
 
 # Prepare file structure
 message(
@@ -47,109 +35,3 @@ execute_process(
     "${PYTHON_EXECUTABLE}"
     "${PADDLE_SOURCE_DIR}/paddle/fluid/eager/auto_code_generator/generate_file_structures.py"
     "${PADDLE_SOURCE_DIR}/paddle/fluid/eager/" "${CODE_GEN_SPLIT_FILE_COUNT}")
-
-if(WIN32)
-  set(EAGER_CODEGEN_DEPS eager_generator)
-  if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
-    set(eager_generator_path "${CMAKE_CURRENT_BINARY_DIR}")
-  else()
-    set(eager_generator_path "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
-  endif()
-
-  if(WITH_SHARED_PHI)
-    message("Copied phi.dll for Eager AutoCodeGen")
-    add_custom_command(
-      OUTPUT ${eager_generator_path}/phi.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PHI_LIB} ${eager_generator_path}
-      DEPENDS phi)
-    add_custom_command(
-      OUTPUT ${eager_generator_path}/phi_core.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PHI_CORE_LIB} ${eager_generator_path}
-      DEPENDS phi)
-    if(WITH_GPU OR WITH_ROCM)
-      add_custom_command(
-        OUTPUT ${eager_generator_path}/phi_gpu.dll
-        COMMAND ${CMAKE_COMMAND} -E copy ${PHI_GPU_LIB} ${eager_generator_path}
-        DEPENDS phi)
-    endif()
-    list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/phi.dll)
-  endif()
-
-  add_custom_command(
-    OUTPUT ${eager_generator_path}/common.dll
-    COMMAND ${CMAKE_COMMAND} -E copy ${COMMON_LIB} ${eager_generator_path}
-    DEPENDS common)
-  list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/common.dll)
-
-  if(WITH_SHARED_IR)
-    add_custom_command(
-      OUTPUT ${eager_generator_path}/ir.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${IR_LIB} ${eager_generator_path}
-      DEPENDS pir)
-    list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/ir.dll)
-  endif()
-
-  if(${CBLAS_PROVIDER} STREQUAL MKLML)
-    message("Copied libiomp5md.dll for Eager AutoCodeGen")
-    add_custom_command(
-      OUTPUT ${eager_generator_path}/libiomp5md.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${MKLML_SHARED_IOMP_LIB}
-              ${eager_generator_path}
-      DEPENDS mklml)
-    list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/libiomp5md.dll)
-  else()
-    message("Copied openblas.dll for Eager AutoCodeGen")
-    add_custom_command(
-      OUTPUT ${eager_generator_path}/openblas.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${OPENBLAS_SHARED_LIB}
-              ${eager_generator_path}
-      DEPENDS extern_openblas)
-    list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/openblas.dll)
-  endif()
-
-  if(WITH_ONEDNN)
-    message("Copied mkldnn.dll for Eager AutoCodeGen")
-    add_custom_command(
-      OUTPUT ${eager_generator_path}/mkldnn.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${ONEDNN_SHARED_LIB}
-              ${eager_generator_path}
-      DEPENDS onednn)
-    list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/mkldnn.dll)
-  endif()
-
-  if(WITH_ONNXRUNTIME)
-    message("Copied onnxruntime for Eager AutoCodeGen")
-    add_custom_command(
-      OUTPUT ${eager_generator_path}/onnxruntime.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${ONNXRUNTIME_SHARED_LIB}
-              ${eager_generator_path}
-      DEPENDS onnxruntime)
-    list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/onnxruntime.dll)
-    add_custom_command(
-      OUTPUT ${eager_generator_path}/paddle2onnx.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PADDLE2ONNX_LIB}
-              ${eager_generator_path}
-      DEPENDS paddle2onnx)
-    list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/paddle2onnx.dll)
-  endif()
-
-  add_custom_target(
-    legacy_eager_codegen
-    COMMAND
-      "${eager_generator_path}/eager_generator.exe"
-      "${PADDLE_SOURCE_DIR}/paddle/fluid/eager/api/generated/fluid_generated"
-      "${CODE_GEN_SPLIT_FILE_COUNT}"
-    DEPENDS ${EAGER_CODEGEN_DEPS}
-    VERBATIM)
-else()
-  add_custom_target(
-    legacy_eager_codegen
-    COMMAND
-      ${CMAKE_COMMAND} -E env
-      "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_CURRENT_BINARY_DIR}/../../pybind:${PADDLE_BINARY_DIR}/third_party/install/mklml/lib"
-      "${CMAKE_CURRENT_BINARY_DIR}/eager_generator"
-      "${PADDLE_SOURCE_DIR}/paddle/fluid/eager/api/generated/fluid_generated"
-      "${CODE_GEN_SPLIT_FILE_COUNT}"
-    DEPENDS eager_generator
-    VERBATIM)
-endif()
@@ -301,21 +301,13 @@ if(WITH_PYTHON)
                                    custom_device_common_op_registry)
   endif()
 
-  add_executable(eager_legacy_op_function_generator
-                 eager_legacy_op_function_generator.cc)
   set(GENERATOR_DEPS ${PYBIND_DEPS})
   list(REMOVE_DUPLICATES GENERATOR_DEPS)
   if(WIN32)
     list(REMOVE_ITEM GENERATOR_DEPS python)
   endif()
-  target_link_libraries(eager_legacy_op_function_generator ${GENERATOR_DEPS})
 
   get_property(os_dependency_modules GLOBAL PROPERTY OS_DEPENDENCY_MODULES)
-  target_link_libraries(eager_legacy_op_function_generator
-                        ${os_dependency_modules})
-  if(WITH_ROCM)
-    target_link_libraries(eager_legacy_op_function_generator ${ROCM_HIPRTC_LIB})
-  endif()
 
   set(op_function_output_path ${CMAKE_SOURCE_DIR}/paddle/fluid/pybind/)
   set(CODE_GEN_SPLIT_FILE_COUNT "8")
@@ -330,8 +322,153 @@ if(WITH_PYTHON)
       "${PADDLE_SOURCE_DIR}/paddle/fluid/pybind/"
       "${CODE_GEN_SPLIT_FILE_COUNT}")
 
-  set(EAGER_OP_IMPL_DEPS eager_legacy_op_function_generator
-                         eager_python_c_codegen)
+  set(EAGER_GENERATOR_DEPS
+      ${GLOB_OP_LIB}
+      ${GLOB_OPERATOR_DEPS}
+      pybind
+      proto_desc
+      executor
+      layer
+      tracer
+      engine
+      imperative_profiler
+      imperative_flag)
+
+  if(WITH_CINN)
+    list(REMOVE_ITEM EAGER_GENERATOR_DEPS imperative_flag)
+  endif()
+
+  if(WITH_CUSTOM_DEVICE)
+    set(EAGER_GENERATOR_DEPS ${EAGER_GENERATOR_DEPS}
+                             custom_device_common_op_registry)
+  endif()
+
+  add_executable(
+    eager_generator generator.cc eager_legacy_op_function_generator.cc
+                    eager_generator.cc)
+  target_link_libraries(eager_generator ${EAGER_GENERATOR_DEPS})
+  target_link_libraries(eager_generator ${GENERATOR_DEPS})
+
+  get_property(os_dependency_modules GLOBAL PROPERTY OS_DEPENDENCY_MODULES)
+  target_link_libraries(eager_generator ${os_dependency_modules})
+
+  set(EAGER_OP_IMPL_DEPS eager_generator eager_python_c_codegen)
+
+  if(WITH_ROCM)
+    target_link_libraries(eager_generator ${ROCM_HIPRTC_LIB})
+  endif()
+
+  if(WITH_CINN)
+    target_link_libraries(eager_generator ${PYTHON_LIBRARIES})
+  endif()
+
+  if(WIN32)
+    set(EAGER_CODEGEN_DEPS eager_generator)
+    if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
+      set(eager_generator_path "${CMAKE_CURRENT_BINARY_DIR}")
+    else()
+      set(eager_generator_path
+          "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}")
+    endif()
+
+    if(WITH_SHARED_PHI)
+      message("Copied phi.dll for Eager AutoCodeGen")
+      add_custom_command(
+        OUTPUT ${eager_generator_path}/phi.dll
+        COMMAND ${CMAKE_COMMAND} -E copy ${PHI_LIB} ${eager_generator_path}
+        DEPENDS phi)
+      add_custom_command(
+        OUTPUT ${eager_generator_path}/phi_core.dll
+        COMMAND ${CMAKE_COMMAND} -E copy ${PHI_CORE_LIB} ${eager_generator_path}
+        DEPENDS phi)
+      if(WITH_GPU OR WITH_ROCM)
+        add_custom_command(
+          OUTPUT ${eager_generator_path}/phi_gpu.dll
+          COMMAND ${CMAKE_COMMAND} -E copy ${PHI_GPU_LIB}
+                  ${eager_generator_path}
+          DEPENDS phi)
+      endif()
+      list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/phi.dll)
+    endif()
+
+    add_custom_command(
+      OUTPUT ${eager_generator_path}/common.dll
+      COMMAND ${CMAKE_COMMAND} -E copy ${COMMON_LIB} ${eager_generator_path}
+      DEPENDS common)
+    list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/common.dll)
+
+    if(WITH_SHARED_IR)
+      add_custom_command(
+        OUTPUT ${eager_generator_path}/ir.dll
+        COMMAND ${CMAKE_COMMAND} -E copy ${IR_LIB} ${eager_generator_path}
+        DEPENDS pir)
+      list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/ir.dll)
+    endif()
+
+    if(${CBLAS_PROVIDER} STREQUAL MKLML)
+      message("Copied libiomp5md.dll for Eager AutoCodeGen")
+      add_custom_command(
+        OUTPUT ${eager_generator_path}/libiomp5md.dll
+        COMMAND ${CMAKE_COMMAND} -E copy ${MKLML_SHARED_IOMP_LIB}
+                ${eager_generator_path}
+        DEPENDS mklml)
+      list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/libiomp5md.dll)
+    else()
+      message("Copied openblas.dll for Eager AutoCodeGen")
+      add_custom_command(
+        OUTPUT ${eager_generator_path}/openblas.dll
+        COMMAND ${CMAKE_COMMAND} -E copy ${OPENBLAS_SHARED_LIB}
+                ${eager_generator_path}
+        DEPENDS extern_openblas)
+      list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/openblas.dll)
+    endif()
+
+    if(WITH_ONEDNN)
+      message("Copied mkldnn.dll for Eager AutoCodeGen")
+      add_custom_command(
+        OUTPUT ${eager_generator_path}/mkldnn.dll
+        COMMAND ${CMAKE_COMMAND} -E copy ${ONEDNN_SHARED_LIB}
+                ${eager_generator_path}
+        DEPENDS onednn)
+      list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/mkldnn.dll)
+    endif()
+
+    if(WITH_ONNXRUNTIME)
+      message("Copied onnxruntime for Eager AutoCodeGen")
+      add_custom_command(
+        OUTPUT ${eager_generator_path}/onnxruntime.dll
+        COMMAND ${CMAKE_COMMAND} -E copy ${ONNXRUNTIME_SHARED_LIB}
+                ${eager_generator_path}
+        DEPENDS onnxruntime)
+      list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/onnxruntime.dll)
+      add_custom_command(
+        OUTPUT ${eager_generator_path}/paddle2onnx.dll
+        COMMAND ${CMAKE_COMMAND} -E copy ${PADDLE2ONNX_LIB}
+                ${eager_generator_path}
+        DEPENDS paddle2onnx)
+      list(APPEND EAGER_CODEGEN_DEPS ${eager_generator_path}/paddle2onnx.dll)
+    endif()
+
+    add_custom_target(
+      legacy_eager_codegen
+      COMMAND
+        "${eager_generator_path}/eager_generator.exe"
+        "${PADDLE_SOURCE_DIR}/paddle/fluid/eager/api/generated/fluid_generated"
+        "${CODE_GEN_SPLIT_FILE_COUNT}"
+      DEPENDS ${EAGER_CODEGEN_DEPS}
+      VERBATIM)
+  else()
+    add_custom_target(
+      legacy_eager_codegen
+      COMMAND
+        ${CMAKE_COMMAND} -E env
+        "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:${CMAKE_CURRENT_BINARY_DIR}/../../pybind:${PADDLE_BINARY_DIR}/third_party/install/mklml/lib"
+        "${CMAKE_CURRENT_BINARY_DIR}/eager_generator"
+        "${PADDLE_SOURCE_DIR}/paddle/fluid/eager/api/generated/fluid_generated"
+        "${CODE_GEN_SPLIT_FILE_COUNT}"
+      DEPENDS eager_generator
+      VERBATIM)
+  endif()
 
   if(WIN32)
     if("${CMAKE_GENERATOR}" STREQUAL "Ninja")
@@ -347,8 +484,8 @@ if(WITH_PYTHON)
       "set build_times=1\n"
       ":retry\n"
       "ECHO eager_legacy_op_function_generator run %build_times% time\n"
-      "taskkill /f /im eager_legacy_op_function_generator.exe 2>NUL\n"
-      "${op_impl_path}/eager_legacy_op_function_generator.exe ${tmp_eager_impl_file}\n"
+      "taskkill /f /im eager_generator.exe 2>NUL\n"
+      "${op_impl_path}/eager_generator.exe ${tmp_eager_impl_file}\n"
       "if %ERRORLEVEL% NEQ 0 (\n"
       "    set /a build_times=%build_times%+1\n"
       "    if %build_times% GEQ 10 (\n"
@@ -496,8 +633,7 @@ if(WITH_PYTHON)
         OUTPUT ${eager_impl_file}
         COMMAND
           ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH}:."
-          "${CMAKE_CURRENT_BINARY_DIR}/eager_legacy_op_function_generator"
-          "${tmp_eager_impl_file}"
+          "${CMAKE_CURRENT_BINARY_DIR}/eager_generator" "${tmp_eager_impl_file}"
         COMMAND ${CMAKE_COMMAND} -E copy_if_different ${tmp_eager_impl_file}
                 ${eager_impl_file}
         COMMENT "copy_if_different ${tmp_eager_impl_file} to ${eager_impl_file}"