Merge branch 'PaddlePaddle:develop' into doctor

PaddlePaddle · Jul 22, 2024 · d200b01 · d200b01
2 parents fbbdf94 + b2a4d52
commit d200b01
Show file tree

Hide file tree

Showing 488 changed files with 10,041 additions and 6,750 deletions.
diff --git a/cmake/phi.cmake b/cmake/phi.cmake
@@ -64,11 +64,6 @@ function(generate_unify_header DIR_NAME)
       endif()
     endif()
   endforeach()
-  if(DEFINED REDUCE_INFERENCE_LIB_SIZE)
-    if(${kernel_name} MATCHES ".*_grad")
-      continue()
-    endif()
-  endif()
   # append header into extension.h
   string(REPLACE "${PADDLE_SOURCE_DIR}\/" "" header_file "${header_file}")
   file(APPEND ${phi_extension_header_file} "#include \"${header_file}\"\n")
@@ -167,6 +162,11 @@ function(kernel_declare TARGET_LIST)
     endwhile()
     # append kernel declare into declarations.h
     if(NOT kernel_declare_id STREQUAL "")
+      if(DEFINED REDUCE_INFERENCE_LIB_SIZE)
+        if(${kernel_declare_id} MATCHES ".*_grad,.*")
+          continue()
+        endif()
+      endif()
       file(APPEND ${kernel_declare_file} "${kernel_declare_id}\n")
     endif()
   endforeach()

diff --git a/paddle/cinn/hlir/dialect/operator/transforms/group_merge/group_with_group_merge_pass_utils.h b/paddle/cinn/hlir/dialect/operator/transforms/group_merge/group_with_group_merge_pass_utils.h