Merge branch 'develop' of https://github.com/PaddlePaddle/Paddle into support_cf_tuple

Author: gongshaotian

CMakeLists.txt

@@ -283,7 +283,7 @@ option(WITH_MULTINODE_TESTING "Test multinode apis and ops" OFF)
 option(WITH_MKL "Compile PaddlePaddle with MKL support." ${AVX_FOUND})
 option(WITH_SYSTEM_BLAS "Use system blas library" OFF)
 option(WITH_DISTRIBUTE "Compile with distributed support" OFF)
-option(WITH_BRPC_RDMA "Use brpc rdma as the rpc protocal" OFF)
+option(WITH_BRPC_RDMA "Use brpc rdma as the rpc protocol" OFF)
 option(ON_INFER "Turn on inference optimization and inference-lib generation"
        ON)
 option(WITH_CPP_DIST "Install PaddlePaddle C++ distribution" OFF)
@@ -334,7 +334,7 @@ option(WITH_POCKETFFT "Compile with pocketfft support" ON)
 option(WITH_RECORD_BUILDTIME
        "Compile PaddlePaddle with record all targets build time" OFF)
 option(WITH_CUSTOM_DEVICE "Compile with custom device support" OFF)
-option(WITH_ARM_BRPC "Supprot Brpc in Arm" OFF)
+option(WITH_ARM_BRPC "Support Brpc in Arm" OFF)
 option(WITH_FLPS "FL PS mode" OFF)
 option(WITH_RPC "Compile with rpc support" ${WITH_DISTRIBUTE})
 option(WITH_CUDNN_FRONTEND

_typos.toml

@@ -35,94 +35,19 @@ clen = 'clen'
 datas = 'datas'
 dota = 'dota'
 dout = "dout"
-eles = 'eles'
 entrys = 'entrys'
 feeded = 'feeded'
 grad = "grad"
 Halfs = 'Halfs'
 kinf = 'kinf'
+operants = 'operants'
 Optin = 'Optin'
 padd = 'padd'
 pash = 'pash'
+splited = 'splited'
+splitted = 'splitted'
 statis = 'statis'
 UNEXPECT = 'UNEXPECT'
 tood = 'tood'
 unpacket = "unpacket"
 vaccum = 'vaccum'
-
-# These words need to be fixed
-Operants = 'Operants'
-operants = 'operants'
-outout = 'outout'
-ouput = 'ouput'
-outpout = 'outpout'
-ouptut = 'ouptut'
-Ouput = 'Ouput'
-producted = 'producted'
-progam = 'progam'
-progrss = 'progrss'
-propogated = 'propogated'
-Propogation = 'Propogation'
-protocal = 'protocal'
-PROTOCAL = 'PROTOCAL'
-pyrhon = 'pyrhon'
-pthon = 'pthon'
-regist = 'regist'
-Regist = 'Regist'
-Registe = 'Registe'
-registe = 'registe'
-REGIST = 'REGIST'
-Regiter = 'Regiter'
-setted = 'setted'
-Skiped = 'Skiped'
-skiped = 'skiped'
-smll = 'smll'
-samll = 'samll'
-somme = 'somme'
-patial = 'patial'
-Patial = 'Patial'
-specificed = 'specificed'
-splite = 'splite'
-spliter = 'spliter'
-spliting = 'spliting'
-Spliting = 'Spliting'
-splited = 'splited'
-splitted = 'splitted'
-Splited = 'Splited'
-sqaure = 'sqaure'
-sequeze = 'sequeze'
-starup = 'starup'
-statment = 'statment'
-staticly = 'staticly'
-staticaly = 'staticaly'
-Stati = 'Stati'
-STOPED = 'STOPED'
-Stoped = 'Stoped'
-stoped = 'stoped'
-storeage = 'storeage'
-sotring = 'sotring'
-stragety = 'stragety'
-strem = 'strem'
-structed = 'structed'
-sturcture = 'sturcture'
-subsituted = 'subsituted'
-subsitute = 'subsitute'
-substitude = 'substitude'
-substitue = 'substitue'
-Subsitute = 'Subsitute'
-Substitude = 'Substitude'
-substract = 'substract'
-Substract = 'Substract'
-successed = 'successed'
-sucessfully = 'sucessfully'
-Succeess = 'Succeess'
-Suger = 'Suger'
-supportted = 'supportted'
-supoort = 'supoort'
-Supprot = 'Supprot'
-suport = 'suport'
-suppport = 'suppport'
-SWTICH = 'SWTICH'
-Swith = 'Swith'
-sysyem = 'sysyem'
-UNSUPPORT = 'UNSUPPORT'

cmake/cinn.cmake

@@ -169,7 +169,6 @@ cinn_cc_library(
   glog
   ${llvm_libs}
   param_proto
-  auto_schedule_proto
   schedule_desc_proto
   tile_config_proto
   absl
@@ -227,7 +226,6 @@ function(gen_cinncore LINKTYPE)
     glog
     ${llvm_libs}
     param_proto
-    auto_schedule_proto
     schedule_desc_proto
     tile_config_proto
     absl
@@ -320,10 +318,6 @@ if(PUBLISH_LIBS)
     COMMAND
       cmake -E copy ${CMAKE_BINARY_DIR}/paddle/cinn/hlir/pe/libparam_proto.a
       ${CMAKE_BINARY_DIR}/dist/cinn/lib/libparam_proto.a
-    COMMAND
-      cmake -E copy
-      ${CMAKE_BINARY_DIR}/paddle/cinn/auto_schedule/libauto_schedule_proto.a
-      ${CMAKE_BINARY_DIR}/dist/cinn/lib/libauto_schedule_proto.a
     COMMAND
       cmake -E copy
       ${CMAKE_BINARY_DIR}/paddle/cinn/ir/schedule/libschedule_desc_proto.a

cmake/external/xpu.cmake

@@ -30,16 +30,16 @@ set(XPU_XFA_LIB_NAME "libxpu_flash_attention.so")
 set(XPU_XPUDNN_LIB_NAME "libxpu_dnn.so")
 
 if(NOT DEFINED XPU_XHPC_BASE_DATE)
-  set(XPU_XHPC_BASE_DATE "dev/20250114")
+  set(XPU_XHPC_BASE_DATE "dev/20250204")
 endif()
-set(XPU_XCCL_BASE_VERSION "3.0.1.6") # For XRE5
+set(XPU_XCCL_BASE_VERSION "3.0.2.1") # For XRE5
 if(NOT DEFINED XPU_XFT_BASE_VERSION)
   set(XPU_XFT_BASE_VERSION "20230602")
 endif()
 
 if(NOT DEFINED XPU_XRE_BASE_VERSION)
   if(WITH_XPU_XRE5)
-    set(XPU_XRE_BASE_VERSION "5.0.21.14")
+    set(XPU_XRE_BASE_VERSION "5.0.21.15")
   else()
     set(XPU_XRE_BASE_VERSION "4.32.0.1")
   endif()

cmake/generic.cmake

@@ -562,7 +562,7 @@ function(cc_test_old TARGET_NAME)
     cmake_parse_arguments(cc_test "${options}" "${oneValueArgs}"
                           "${multiValueArgs}" ${ARGN})
     cc_test_build(${TARGET_NAME} SRCS ${cc_test_SRCS} DEPS ${cc_test_DEPS})
-    # we donot test hcom op, because it need complex configuration
+    # we do not test hcom op, because it need complex configuration
     # with more than one machine
     cc_test_run(${TARGET_NAME} COMMAND ${TARGET_NAME} ARGS ${cc_test_ARGS})
   elseif(WITH_TESTING AND NOT TEST ${TARGET_NAME})

paddle/cinn/CMakeLists.txt

@@ -4,7 +4,6 @@ endif()
 
 add_subdirectory(adt)
 add_subdirectory(ast_gen_ius)
-add_subdirectory(auto_schedule)
 add_subdirectory(common)
 add_subdirectory(utils)
 add_subdirectory(poly)