PaddlePaddle
diff --git a/‎.gitignore
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎.gitignore
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎cmake/operators.cmake
Copy file name to clipboard
+50Lines changed: 50 additions & 0 deletions b/‎cmake/operators.cmake
Copy file name to clipboard
+50Lines changed: 50 additions & 0 deletions
diff --git a/‎cmake/phi.cmake
Copy file name to clipboard
-49Lines changed: 0 additions & 49 deletions b/‎cmake/phi.cmake
Copy file name to clipboard
-49Lines changed: 0 additions & 49 deletions
diff --git a/‎paddle/fluid/framework/operator.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/operator.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/framework/phi_utils.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/framework/phi_utils.cc
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎paddle/fluid/operators/generator/CMakeLists.txt
Copy file name to clipboard
+10-7Lines changed: 10 additions & 7 deletions b/‎paddle/fluid/operators/generator/CMakeLists.txt
Copy file name to clipboard
+10-7Lines changed: 10 additions & 7 deletions
diff --git a/‎paddle/phi/ops/compat/activation_sig.cc renamed to ‎paddle/fluid/operators/ops_signature/activation_sig.cc
Copy file name to clipboard b/‎paddle/phi/ops/compat/activation_sig.cc renamed to ‎paddle/fluid/operators/ops_signature/activation_sig.cc
Copy file name to clipboard
diff --git a/‎paddle/phi/ops/compat/adadelta_sig.cc renamed to ‎paddle/fluid/operators/ops_signature/adadelta_sig.cc
Copy file name to clipboard b/‎paddle/phi/ops/compat/adadelta_sig.cc renamed to ‎paddle/fluid/operators/ops_signature/adadelta_sig.cc
Copy file name to clipboard
diff --git a/‎paddle/phi/ops/compat/adam_sig.cc renamed to ‎paddle/fluid/operators/ops_signature/adam_sig.cc
Copy file name to clipboard b/‎paddle/phi/ops/compat/adam_sig.cc renamed to ‎paddle/fluid/operators/ops_signature/adam_sig.cc
Copy file name to clipboard
diff --git a/‎paddle/phi/ops/compat/assign_pos_sig.cc renamed to ‎paddle/fluid/operators/ops_signature/assign_pos_sig.cc
Copy file name to clipboard b/‎paddle/phi/ops/compat/assign_pos_sig.cc renamed to ‎paddle/fluid/operators/ops_signature/assign_pos_sig.cc
Copy file name to clipboard
@@ -82,7 +82,7 @@ paddle/fluid/operators/generated_op*.cc
 paddle/fluid/operators/generated_sparse_op.cc
 paddle/fluid/operators/generated_static_op.cc
 paddle/fluid/operators/generated_fused_op.cc
-paddle/phi/ops/compat/generated_*.cc
+paddle/fluid/operators/ops_signature/generated_*.cc
 paddle/phi/api/yaml/parsed_apis/
 paddle/fluid/operators/generator/parsed_ops/
 paddle/fluid/pybind/tmp_eager_op_function_impl.h
@@ -95,9 +95,11 @@ paddle/fluid/framework/__init__.py
 paddle/phi/api/profiler/__init__.py
 python/paddle/incubate/fleet/parameter_server/pslib/ps_pb2.py
 paddle/phi/kernels/fusion/cutlass/conv2d/generated/*
+paddle/phi/kernels/fusion/cutlass/conv2d/generated_tmp/*
 python/paddle/base/incubate/fleet/parameter_server/pslib/ps_pb2.py
 paddle/fluid/ir_adaptor/translator/op_compat_info.cc
 paddle/phi/kernels/fusion/cutlass/cutlass_kernels/fpA_intB_gemm/autogen/*
+paddle/phi/kernels/fusion/cutlass/cutlass_kernels/fpA_intB_gemm/autogen_tmp/*
 paddle/fluid/pybind/static_op_function.*
 paddle/fluid/pybind/ops_api.cc
 paddle/fluid/pir/dialect/operator/ir/pd_api.*
 
@@ -734,3 +734,53 @@ function(prune_pybind_h)
     endif()
   endforeach()
 endfunction()
+
+function(append_op_util_declare TARGET)
+  file(READ ${TARGET} target_content)
+  string(REGEX MATCH "(PD_REGISTER_ARG_MAPPING_FN)\\([ \t\r\n]*[a-z0-9_]*"
+               util_registrar "${target_content}")
+  if(NOT ${util_registrar} EQUAL "")
+    string(REPLACE "PD_REGISTER_ARG_MAPPING_FN" "PD_DECLARE_ARG_MAPPING_FN"
+                   util_declare "${util_registrar}")
+    string(APPEND util_declare ");\n")
+    file(APPEND ${op_utils_header} "${util_declare}")
+  endif()
+endfunction()
+
+function(append_op_kernel_map_declare TARGET)
+  file(READ ${TARGET} target_content)
+  string(
+    REGEX
+      MATCH
+      "(PD_REGISTER_BASE_KERNEL_NAME)\\([ \t\r\n]*[a-z0-9_]*,[ \\\t\r\n]*[a-z0-9_]*"
+      kernel_mapping_registrar
+      "${target_content}")
+  if(NOT ${kernel_mapping_registrar} EQUAL "")
+    string(REPLACE "PD_REGISTER_BASE_KERNEL_NAME" "PD_DECLARE_BASE_KERNEL_NAME"
+                   kernel_mapping_declare "${kernel_mapping_registrar}")
+    string(APPEND kernel_mapping_declare ");\n")
+    file(APPEND ${op_utils_header} "${kernel_mapping_declare}")
+  endif()
+endfunction()
+
+function(register_op_utils TARGET_NAME)
+  set(utils_srcs)
+  set(options "")
+  set(oneValueArgs "")
+  set(multiValueArgs EXCLUDES DEPS)
+  cmake_parse_arguments(register_op_utils "${options}" "${oneValueArgs}"
+                        "${multiValueArgs}" ${ARGN})
+
+  file(GLOB SIGNATURES
+       "${PADDLE_SOURCE_DIR}/paddle/fluid/operators/ops_signature/*_sig.cc")
+  foreach(target ${SIGNATURES})
+    append_op_util_declare(${target})
+    append_op_kernel_map_declare(${target})
+    list(APPEND utils_srcs ${target})
+  endforeach()
+
+  cc_library(
+    ${TARGET_NAME}
+    SRCS ${utils_srcs}
+    DEPS ${register_op_utils_DEPS})
+endfunction()
@@ -172,55 +172,6 @@ function(kernel_declare TARGET_LIST)
   endforeach()
 endfunction()
 
-function(append_op_util_declare TARGET)
-  file(READ ${TARGET} target_content)
-  string(REGEX MATCH "(PD_REGISTER_ARG_MAPPING_FN)\\([ \t\r\n]*[a-z0-9_]*"
-               util_registrar "${target_content}")
-  if(NOT ${util_registrar} EQUAL "")
-    string(REPLACE "PD_REGISTER_ARG_MAPPING_FN" "PD_DECLARE_ARG_MAPPING_FN"
-                   util_declare "${util_registrar}")
-    string(APPEND util_declare ");\n")
-    file(APPEND ${op_utils_header} "${util_declare}")
-  endif()
-endfunction()
-
-function(append_op_kernel_map_declare TARGET)
-  file(READ ${TARGET} target_content)
-  string(
-    REGEX
-      MATCH
-      "(PD_REGISTER_BASE_KERNEL_NAME)\\([ \t\r\n]*[a-z0-9_]*,[ \\\t\r\n]*[a-z0-9_]*"
-      kernel_mapping_registrar
-      "${target_content}")
-  if(NOT ${kernel_mapping_registrar} EQUAL "")
-    string(REPLACE "PD_REGISTER_BASE_KERNEL_NAME" "PD_DECLARE_BASE_KERNEL_NAME"
-                   kernel_mapping_declare "${kernel_mapping_registrar}")
-    string(APPEND kernel_mapping_declare ");\n")
-    file(APPEND ${op_utils_header} "${kernel_mapping_declare}")
-  endif()
-endfunction()
-
-function(register_op_utils TARGET_NAME)
-  set(utils_srcs)
-  set(options "")
-  set(oneValueArgs "")
-  set(multiValueArgs EXCLUDES DEPS)
-  cmake_parse_arguments(register_op_utils "${options}" "${oneValueArgs}"
-                        "${multiValueArgs}" ${ARGN})
-
-  file(GLOB SIGNATURES "${PADDLE_SOURCE_DIR}/paddle/phi/ops/compat/*_sig.cc")
-  foreach(target ${SIGNATURES})
-    append_op_util_declare(${target})
-    append_op_kernel_map_declare(${target})
-    list(APPEND utils_srcs ${target})
-  endforeach()
-
-  cc_library(
-    ${TARGET_NAME}
-    SRCS ${utils_srcs}
-    DEPS ${register_op_utils_DEPS})
-endfunction()
-
 function(prune_declaration_h)
   set(kernel_list ${KERNEL_LIST})
   file(STRINGS ${kernel_declare_file} kernel_registry_list)
 
@@ -30,6 +30,7 @@ limitations under the License. */
 #include "paddle/fluid/framework/var_type.h"
 #include "paddle/fluid/operators/isfinite_op.h"
 #include "paddle/fluid/operators/ops_extra_info.h"
+#include "paddle/fluid/operators/ops_signature/signatures.h"
 #include "paddle/fluid/platform/device/device_wrapper.h"
 #include "paddle/fluid/platform/enforce.h"
 #include "paddle/fluid/platform/profiler.h"
@@ -41,7 +42,6 @@ limitations under the License. */
 #include "paddle/phi/core/flags.h"
 #include "paddle/phi/core/kernel_context.h"
 #include "paddle/phi/core/kernel_factory.h"
-#include "paddle/phi/ops/compat/signatures.h"
 #include "paddle/utils/flags.h"
 
 namespace phi {
 
@@ -157,7 +157,7 @@ KernelArgsNameMakerByOpProto::GetInputArgsNames() {
       continue;
     }
     // If contains dispensable input, we should override the
-    // OpArgumentMapping method self in phi/ops/compat dir
+    // OpArgumentMapping method self in fluid/operators/ops_signature dir
     if (in.has_dispensable() && in.dispensable()) {
       continue;
     }
 
@@ -1,5 +1,5 @@
 # phi auto cmake utils
-include(phi)
+include(operators)
 
 # set yaml file path
 set(op_yaml_file ${CMAKE_SOURCE_DIR}/paddle/phi/api/yaml/ops.yaml)
@@ -115,13 +115,16 @@ set(generated_fused_op_path
 set(generated_sparse_ops_path
     ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generated_sparse_op.cc)
 set(generated_argument_mapping_path
-    ${CMAKE_SOURCE_DIR}/paddle/phi/ops/compat/generated_sig.cc)
+    ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/ops_signature/generated_sig.cc)
 set(generated_fused_argument_mapping_path
-    ${CMAKE_SOURCE_DIR}/paddle/phi/ops/compat/generated_fused_sig.cc)
+    ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/ops_signature/generated_fused_sig.cc
+)
 set(generated_static_argument_mapping_path
-    ${CMAKE_SOURCE_DIR}/paddle/phi/ops/compat/generated_static_sig.cc)
+    ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/ops_signature/generated_static_sig.cc
+)
 set(generated_sparse_argument_mapping_path
-    ${CMAKE_SOURCE_DIR}/paddle/phi/ops/compat/generated_sparse_sig.cc)
+    ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/ops_signature/generated_sparse_sig.cc
+)
 execute_process(
   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/paddle/fluid/operators/generator
   COMMAND ${CMAKE_COMMAND} -E make_directory ${parsed_op_dir} RESULTS_VARIABLE
@@ -342,10 +345,10 @@ execute_process(
 message("generate ${ops_extra_info_file}")
 
 set(op_utils_header
-    ${PADDLE_BINARY_DIR}/paddle/phi/ops/compat/signatures.h.tmp
+    ${PADDLE_BINARY_DIR}/paddle/fluid/operators/ops_signature/signatures.h.tmp
     CACHE INTERNAL "op_args_fns.cc file")
 set(op_utils_header_final
-    ${PADDLE_BINARY_DIR}/paddle/phi/ops/compat/signatures.h)
+    ${PADDLE_BINARY_DIR}/paddle/fluid/operators/ops_signature/signatures.h)
 file(
   WRITE ${op_utils_header}
   "// Generated by the paddle/fluid/operators/generator/CMakeLists.txt.  DO NOT EDIT!\n\n"
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ KernelArgsNameMakerByOpProto::GetInputArgsNames() {`
`157`	`157`	`continue;`
`158`	`158`	`}`
`159`	`159`	`// If contains dispensable input, we should override the`
`160`		`- // OpArgumentMapping method self in phi/ops/compat dir`
	`160`	`+ // OpArgumentMapping method self in fluid/operators/ops_signature dir`
`161`	`161`	`if (in.has_dispensable() && in.dispensable()) {`
`162`	`162`	`continue;`
`163`	`163`	`}`