clean custom_device_common_op_registry

paddle/fluid/eager/auto_code_generator/CMakeLists.txt

@@ -16,11 +16,6 @@ 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()
-
 get_property(os_dependency_modules GLOBAL PROPERTY OS_DEPENDENCY_MODULES)
 
 # Prepare file structure

paddle/fluid/operators/CMakeLists.txt

@@ -139,10 +139,6 @@ endif()
 
 copy_if_different(${pybind_file} ${pybind_file_final})
 
-if (WITH_CUSTOM_DEVICE)
-cc_library(custom_device_common_op_registry SRCS custom_device_common_op_registry.cc DEPS operator phi common type_info)
-endif()
-
 if(NOT "${OP_LIST}" STREQUAL "")
 prune_pybind_h()
 endif()

paddle/fluid/pybind/CMakeLists.txt

@@ -171,10 +171,6 @@ else()
   set(PYBIND_DEPS ${PYBIND_DEPS} pir)
 endif()
 
-if(WITH_CUSTOM_DEVICE)
-  set(PYBIND_DEPS ${PYBIND_DEPS} custom_device_common_op_registry)
-endif()
-
 if(WITH_PYTHON)
   set(PYBIND_DEPS ${PYBIND_DEPS} process_group eager_reducer)
   if(WITH_NCCL OR WITH_RCCL)
@@ -299,11 +295,6 @@ if(WITH_PYTHON)
     list(APPEND OP_FUNCTION_GENERATOR_DEPS ${PYTHON_LIBRARIES})
   endif()
 
-  if(WITH_CUSTOM_DEVICE)
-    set(OP_FUNCTION_GENERATOR_DEPS ${OP_FUNCTION_GENERATOR_DEPS}
-                                   custom_device_common_op_registry)
-  endif()
-
   set(GENERATOR_DEPS ${PYBIND_DEPS})
   list(REMOVE_DUPLICATES GENERATOR_DEPS)
   if(WIN32)
@@ -341,11 +332,6 @@ if(WITH_PYTHON)
     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)

paddle/fluid/pybind/eager_generator.cc

@@ -23,7 +23,6 @@
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/framework/program_desc.h"
 #include "paddle/fluid/framework/variable.h"
-#include "paddle/fluid/operators/custom_device_common_op_registry.h"
 #include "paddle/fluid/pybind/eager_generator.h"
 #include "paddle/fluid/pybind/pybind.h"
 #include "paddle/utils/string/string_helper.h"
@@ -3786,12 +3785,6 @@ std::set<std::string> special_no_need_buffer_op_set = {
 };
 
 int run_generator(int argc, char* argv[]) {
-#ifdef PADDLE_WITH_CUSTOM_DEVICE
-  // We need a fake device to trigger the registration of the common kernel and
-  // generate api
-  paddle::operators::RegisterCustomDeviceCommonKernel("fake_device");
-#endif
-
   std::string eager_root = argv[1];
   int split_count = atoi(argv[2]);
 

paddle/fluid/pybind/eager_legacy_op_function_generator.cc

@@ -26,7 +26,6 @@
 #include "paddle/fluid/framework/op_registry.h"
 #include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/framework/variable.h"
-#include "paddle/fluid/operators/custom_device_common_op_registry.h"
 #include "paddle/fluid/pybind/eager_generator.h"
 #include "paddle/fluid/pybind/eager_legacy_op_function_generator.h"
 #include "paddle/fluid/pybind/pybind.h"
@@ -474,12 +473,6 @@ GenerateOpFunctions() {
 }
 
 int run_legacy_generator(int argc, char* argv[]) {
-#ifdef PADDLE_WITH_CUSTOM_DEVICE
-  // We need a fake device to trigger the registration of the common kernel and
-  // generate api
-  paddle::operators::RegisterCustomDeviceCommonKernel("fake_device");
-#endif
-
   const std::string str = "\"paddle/fluid/eager/api/generated/fluid_generated/";
   std::vector<std::string> headers{
       "<Python.h>",

paddle/fluid/pybind/pybind.cc

@@ -176,7 +176,6 @@ limitations under the License. */
 #endif
 
 #ifdef PADDLE_WITH_CUSTOM_DEVICE
-#include "paddle/fluid/operators/custom_device_common_op_registry.h"
 #include "paddle/fluid/platform/profiler/custom_device/custom_tracer.h"
 #include "paddle/phi/capi/capi.h"
 #include "paddle/phi/core/platform/collective_helper.h"
@@ -2571,14 +2570,7 @@ All parameter, weight, gradient are variables in Paddle.
     egr::Controller::Instance().MergeOpMetaInfoMap(
         framework::LoadOpMetaInfoAndRegisterOp(dso_name));
   });
-  m.def("init_devices", []() {
-    framework::InitDevices();
-#ifdef PADDLE_WITH_CUSTOM_DEVICE
-    for (auto &dev_type : phi::DeviceManager::GetAllCustomDeviceTypes()) {
-      paddle::operators::RegisterCustomDeviceCommonKernel(dev_type);
-    }
-#endif
-  });
+  m.def("init_devices", []() { framework::InitDevices(); });
   m.def("init_default_kernel_signatures",
         []() { framework::InitDefaultKernelSignatureMap(); });
   m.def("init_tensor_operants", []() {