Clean paddle/fluid/operators/common_infer_shape_functions.h (#65408)

* Fix

* Fix

* ci

Author: co63oc

cmake/operators.cmake

@@ -61,7 +61,7 @@ function(register_cu_kernel TARGET)
                         "${multiValueArgs}" ${ARGN})
 
   set(cu_srcs)
-  set(op_common_deps operator op_registry layer common_infer_shape_functions)
+  set(op_common_deps operator op_registry layer)
   foreach(cu_src ${register_cu_kernel_SRCS})
     if(${cu_src} MATCHES ".*\\.cu$")
       list(APPEND cu_srcs ${cu_src})
@@ -112,8 +112,7 @@ function(register_onednn_kernel TARGET)
                         "${multiValueArgs}" ${ARGN})
 
   set(onednn_cc_srcs)
-  set(op_common_deps operator op_registry phi layer
-                     common_infer_shape_functions)
+  set(op_common_deps operator op_registry phi layer)
   foreach(onednn_src ${register_onednn_kernel_SRCS})
     if(${onednn_src} MATCHES ".*_onednn_op.cc$")
       list(APPEND onednn_cc_srcs onednn/${onednn_src})
@@ -163,8 +162,7 @@ function(op_library TARGET)
   set(MIOPEN_FILE)
   set(onednn_cc_srcs)
   set(ONEDNN_FILE)
-  set(op_common_deps operator op_registry phi layer
-                     common_infer_shape_functions)
+  set(op_common_deps operator op_registry phi layer)
 
   # Option `UNITY` is used to specify that operator `TARGET` will compiles with Unity Build.
   set(options UNITY)

paddle/fluid/operators/CMakeLists.txt

@@ -110,15 +110,13 @@ if (WITH_DGC)
     set(COMMON_OP_DEPS ${COMMON_OP_DEPS} dgc)
 endif()
 
-cc_library(common_infer_shape_functions SRCS common_infer_shape_functions.cc DEPS operator)
 cc_library(ops_extra_info SRCS ops_extra_info.cc DEPS attribute phi common)
 
 set(COMMON_OP_DEPS ${COMMON_OP_DEPS} phi common)
 set(COMMON_OP_DEPS ${COMMON_OP_DEPS} selected_rows_utils
 lod_tensor lod_rank_table executor static_prim_api)
 set(COMMON_OP_DEPS ${COMMON_OP_DEPS} dynload_warpctc static_prim_api static_utils static_global_utils prim_utils)
 set(COMMON_OP_DEPS ${COMMON_OP_DEPS} box_wrapper ps_gpu_wrapper)
-set(COMMON_OP_DEPS ${COMMON_OP_DEPS} common_infer_shape_functions)
 set(COMMON_OP_DEPS ${COMMON_OP_DEPS} processgroup_comm_utils)
 if(WITH_NCCL OR WITH_RCCL)
   set(COMMON_OP_DEPS ${COMMON_OP_DEPS} process_group_nccl)

paddle/fluid/operators/activation_op.cc

@@ -22,7 +22,6 @@ limitations under the License. */
 
 #include "paddle/fluid/framework/infershape_utils.h"
 #include "paddle/fluid/framework/op_version_registry.h"
-#include "paddle/fluid/operators/common_infer_shape_functions.h"
 #include "paddle/fluid/prim/api/composite_backward/composite_backward_api.h"
 #include "paddle/fluid/prim/utils/static/composite_grad_desc_maker.h"
 #include "paddle/fluid/prim/utils/static/desc_tensor.h"

paddle/fluid/operators/common_infer_shape_functions.cc

@@ -16,16 +16,21 @@
 #include <string>
 #include <vector>
 #include "paddle/common/ddim.h"
+#include "paddle/fluid/framework/details/op_registry.h"
 #include "paddle/fluid/framework/op_proto_maker.h"
-#include "paddle/fluid/operators/common_infer_shape_functions.h"
+#include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/prim/api/generated_prim/prim_generated_api.h"
+#include "paddle/phi/api/include/tensor.h"
 #include "paddle/phi/common/data_type.h"
 #include "paddle/phi/common/int_array.h"
 #include "paddle/phi/common/place.h"
 #include "paddle/phi/kernels/funcs/blas/blas.h"
+#include "paddle/phi/kernels/funcs/common_infer_shape_functions.h"
 
 namespace paddle {
+class Tensor;
 namespace prim {
+
 // We put some api like utils here
 template <typename T>
 Tensor empty(const paddle::experimental::IntArray& shape,
@@ -91,7 +96,7 @@ static phi::DDim get_reduce_dims(const phi::DDim& x_dims,
   * ==> reduce_dims_from_z_to_x = [1, 3]
   * ==> reduce_dims_from_z_to_y = [0, 2, 4]
   */
-  auto out_dims = paddle::operators::details::BroadcastTwoDims(x_dims, y_dims);
+  auto out_dims = phi::funcs::BroadcastTwoDims(x_dims, y_dims);
   return get_reduce_dims_from_out(out_dims, x_dims);
 }
 

paddle/fluid/operators/common_infer_shape_functions.h

@@ -2,9 +2,9 @@ if(WITH_PYTHON OR NOT ON_INFER)
   cc_library(
     primitive_eager_utils_experimental
     SRCS eager_utils.cc
-    DEPS phi common common_infer_shape_functions)
+    DEPS phi common)
 endif()
 cc_library(
   primitive_static_utils_experimental
   SRCS static_utils.cc
-  DEPS phi common common_infer_shape_functions op_dialect)
+  DEPS phi common op_dialect)

paddle/fluid/prim/api/manual_prim/utils/utils.h

@@ -16,13 +16,15 @@
 #include <vector>
 
 #include "paddle/common/ddim.h"
-#include "paddle/fluid/operators/common_infer_shape_functions.h"
+#include "paddle/fluid/framework/details/op_registry.h"
+#include "paddle/fluid/framework/operator.h"
 #include "paddle/fluid/primitive/type/lazy_tensor.h"
 #include "paddle/phi/api/include/tensor.h"
+#include "paddle/phi/kernels/funcs/common_infer_shape_functions.h"
 
 namespace paddle {
+class Tensor;
 namespace primitive {
-
 template <typename T>
 void set_output(const Tensor& x_tmp, Tensor* x);
 
@@ -161,7 +163,7 @@ static phi::DDim get_reduce_dims_from_out(const phi::DDim& dout_dims,
 
 static phi::DDim get_reduce_dims(const phi::DDim& x_dims,
                                  const phi::DDim& y_dims) {
-  auto out_dims = paddle::operators::details::BroadcastTwoDims(x_dims, y_dims);
+  auto out_dims = phi::funcs::BroadcastTwoDims(x_dims, y_dims);
   return get_reduce_dims_from_out(out_dims, x_dims);
 }
 

paddle/fluid/primitive/utils/CMakeLists.txt

@@ -73,7 +73,6 @@
 #endif
 #include "paddle/fluid/memory/allocation/mmap_allocator.h"
 #include "paddle/fluid/operators/activation_op.h"
-#include "paddle/fluid/operators/common_infer_shape_functions.h"
 #include "paddle/fluid/platform/cpu_helper.h"
 #include "paddle/fluid/platform/device/device_wrapper.h"
 #include "paddle/fluid/platform/device_context.h"

paddle/fluid/primitive/utils/utils.h

@@ -72,7 +72,6 @@ limitations under the License. */
 #endif
 #include "paddle/fluid/memory/allocation/mmap_allocator.h"
 #include "paddle/fluid/operators/activation_op.h"
-#include "paddle/fluid/operators/common_infer_shape_functions.h"
 #include "paddle/fluid/platform/cpu_helper.h"
 #include "paddle/fluid/platform/device/device_wrapper.h"
 #include "paddle/fluid/platform/device_context.h"