Merge branch 'develop' into fix235

.pre-commit-config.yaml

@@ -50,7 +50,7 @@ repos:
                 paddle/cinn/utils/registry.h
             )$
 -   repo: https://github.com/PFCCLab/typos-pre-commit-mirror.git
-    rev: v1.27.3
+    rev: v1.29.4
     hooks:
     -   id: typos
         args: [--force-exclude]
@@ -60,7 +60,7 @@ repos:
     hooks:
     -   id: black
 -   repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.3
+    rev: v0.9.2
     hooks:
     -   id: ruff
         args: [--fix, --exit-non-zero-on-fix, --no-cache]
@@ -151,7 +151,7 @@ repos:
         exclude: |
             (?x)^(
                 cmake/external/onnxruntime.cmake
-                )$
+            )$
 # Others
 -   repo: local
     hooks:

_typos.toml

@@ -41,59 +41,26 @@ feeded = 'feeded'
 grad = "grad"
 Halfs = 'Halfs'
 kinf = 'kinf'
+Optin = 'Optin'
+padd = 'padd'
 pash = 'pash'
+statis = 'statis'
+UNEXPECT = 'UNEXPECT'
+tood = 'tood'
 unpacket = "unpacket"
 vaccum = 'vaccum'
 
 # These words need to be fixed
-Indexs = 'Indexs'
 indexs = 'indexs'
 Infered = 'Infered'
 infered = 'infered'
 Operants = 'Operants'
 operants = 'operants'
-optin = 'optin'
-Optin = 'Optin'
-rder = 'rder'
-oreder = 'oreder'
-orignal = 'orignal'
-orginal = 'orginal'
-onces = 'onces'
-outter = 'outter'
-outpus = 'outpus'
 outout = 'outout'
 ouput = 'ouput'
 outpout = 'outpout'
 ouptut = 'ouptut'
 Ouput = 'Ouput'
-overriden = 'overriden'
-Overide = 'Overide'
-overide = 'overide'
-overrided = 'overrided'
-Packge = 'Packge'
-pacakage = 'pacakage'
-padd = 'padd'
-payed = 'payed'
-parellel = 'parellel'
-parm = 'parm'
-Parm = 'Parm'
-PARM = 'PARM'
-paramters = 'paramters'
-Paramters = 'Paramters'
-paramter = 'paramter'
-Paramater = 'Paramater'
-paramete = 'paramete'
-parmeter = 'parmeter'
-paremeter = 'paremeter'
-parrent = 'parrent'
-parital = 'parital'
-partitial = 'partitial'
-Partitial = 'Partitial'
-Partion = 'Partion'
-partion = 'partion'
-patition = 'patition'
-passs = 'passs'
-Passs = 'Passs'
 pathes = 'pathes'
 patten = 'patten'
 Patten = 'Patten'
@@ -138,17 +105,8 @@ Registe = 'Registe'
 registe = 'registe'
 REGIST = 'REGIST'
 Regiter = 'Regiter'
-reseted = 'reseted'
-resouce = 'resouce'
-retore = 'retore'
-rewriten = 'rewriten'
-rewrited = 'rewrited'
 Runing = 'Runing'
 runing = 'runing'
-sequnce = 'sequnce'
-seqence = 'seqence'
-sequece = 'sequece'
-sequnece = 'sequnece'
 setted = 'setted'
 shoule = 'shoule'
 shoud = 'shoud'
@@ -208,36 +166,6 @@ suppport = 'suppport'
 SWTICH = 'SWTICH'
 Swith = 'Swith'
 sysyem = 'sysyem'
-tenosr = 'tenosr'
-iterm = 'iterm'
-termiante = 'termiante'
-Theoritical = 'Theoritical'
-ther = 'ther'
-thge = 'thge'
-thouse = 'thouse'
-theads = 'theads'
-thrads = 'thrads'
-thre = 'thre'
-THREAHOLD = 'THREAHOLD'
-THORW = 'THORW'
-timout = 'timout'
-tiemout = 'tiemout'
-TOOD = 'TOOD'
-tood = 'tood'
-TDOD = 'TDOD'
-toghether = 'toghether'
-trainning = 'trainning'
-Traning = 'Traning'
-transforme = 'transforme'
-transfered = 'transfered'
-transfering = 'transfering'
-tranfers = 'tranfers'
-tranfer = 'tranfer'
-Tranfer = 'Tranfer'
-transfrom = 'transfrom'
-tranform = 'tranform'
-Tranpose = 'Tranpose'
-tranpose = 'tranpose'
 tigger = 'tigger'
 trimed = 'trimed'
 trival = 'trival'
@@ -249,12 +177,6 @@ TYPLE = 'TYPLE'
 trun = 'trun'
 tyep = 'tyep'
 tpye = 'tpye'
-unchangable = 'unchangable'
-Undefind = 'Undefind'
-unser = 'unser'
-UNEXPECT = 'UNEXPECT'
-Unifrom = 'Unifrom'
-uninitialzed = 'uninitialzed'
 Uniqe = 'Uniqe'
 unqiue = 'unqiue'
 uniqe = 'uniqe'
@@ -273,25 +195,3 @@ unsed = 'unsed'
 uesd = 'uesd'
 usefull = 'usefull'
 usless = 'usless'
-warpped = 'warpped'
-warpper = 'warpper'
-Warpper = 'Warpper'
-wheather = 'wheather'
-wether = 'wether'
-Wether = 'Wether'
-wieghts = 'wieghts'
-werid = 'werid'
-Wheter = 'Wheter'
-whther = 'whther'
-whill = 'whill'
-whos = 'whos'
-wiil = 'wiil'
-witk = 'witk'
-worke = 'worke'
-workround = 'workround'
-worksapce = 'worksapce'
-wrappered = 'wrappered'
-wraper = 'wraper'
-wraping = 'wraping'
-Writter = 'Writter'
-writed = 'writed'

cmake/cuda.cmake

@@ -12,21 +12,21 @@ if(WITH_NV_JETSON)
   set(paddle_known_gpu_archs11 "53 62 72 87")
   set(paddle_known_gpu_archs12 "53 62 72 87 90")
 elseif(NEW_RELEASE_ALL)
-  message("Using New Release Strategy - All Arches Packge")
+  message("Using New Release Strategy - All Arches Package")
   add_definitions(-DNEW_RELEASE_ALL)
   set(paddle_known_gpu_archs "50 52 60 61 70 75 80 86 90")
   set(paddle_known_gpu_archs10 "50 52 60 61 70 75")
   set(paddle_known_gpu_archs11 "50 60 61 70 75 80")
   set(paddle_known_gpu_archs12 "50 60 61 70 75 80 90")
 elseif(NEW_RELEASE_PYPI)
-  message("Using New Release Strategy - Cubin Packge")
+  message("Using New Release Strategy - Cubin Package")
   add_definitions(-DNEW_RELEASE_PYPI)
   set(paddle_known_gpu_archs "50 52 60 61 70 75 80 86 90")
   set(paddle_known_gpu_archs10 "")
   set(paddle_known_gpu_archs11 "61 70 75 80")
   set(paddle_known_gpu_archs12 "61 70 75 80 90")
 elseif(NEW_RELEASE_JIT)
-  message("Using New Release Strategy - JIT Packge")
+  message("Using New Release Strategy - JIT Package")
   add_definitions(-DNEW_RELEASE_JIT)
   set(paddle_known_gpu_archs "50 52 60 61 70 75 80 86 90")
   set(paddle_known_gpu_archs10 "50 60 70 75")

cmake/external/xpu.cmake

@@ -30,7 +30,7 @@ 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 "release/3.1.0")
+  set(XPU_XHPC_BASE_DATE "dev/20250114")
 endif()
 set(XPU_XCCL_BASE_VERSION "3.0.1.6") # For XRE5
 if(NOT DEFINED XPU_XFT_BASE_VERSION)

paddle/cinn/adt/print_utils/print_equations.cc

@@ -206,10 +206,10 @@ struct ToTxtStringStruct {
                          tOut<OpArgIndexes<std::optional<Index>>>,
                          tIn<OpArgIndexes<Index>>>& in_msg2out_msg) const {
     std::string ret;
-    const auto& [out_op, out_indexs, in_indexs] = in_msg2out_msg.tuple();
+    const auto& [out_op, out_indices, in_indices] = in_msg2out_msg.tuple();
     const FakeOpPlaceHolder& op = out_op.value();
-    const auto& out_index_tuple = out_indexs.value();
-    const auto& in_index_tuple = in_indexs.value();
+    const auto& out_index_tuple = out_indices.value();
+    const auto& in_index_tuple = in_indices.value();
     const auto& [out_msg_list_in, out_msg_list_out] = out_index_tuple.tuple();
     const auto& [in_msg_list_in, in_msg_list_out] = in_index_tuple.tuple();
     ret += ToTxtString(op) + ", ";

paddle/cinn/adt/write_broadcast_disabled_bidirection_equation_generator.cc

@@ -106,7 +106,7 @@ Equation EraseIndexes(
   return ret_equation;
 }
 
-std::vector<Index> GenerateWriteBroadcastTensorIndexs(
+std::vector<Index> GenerateWriteBroadcastTensorIndices(
     const std::shared_ptr<config::NaiveOpEquationContext>& ctx,
     const Equations& in_msg2out_msg_equations) {
   const auto& equation_graph_view =
@@ -137,10 +137,10 @@ WriteBroadcastDisabledBidirectionEquationGenerator::GetDirectionEquations()
           const std::shared_ptr<config::NaiveOpEquationContext>& ctx) {
         const auto& in_msg2out_msg_equations =
             naive_bidirection_equation_generator_.equations();
-        const auto& truncated_output_tensor_idxes =
-            GenerateWriteBroadcastTensorIndexs(ctx, in_msg2out_msg_equations);
+        const auto& truncated_output_tensor_indices =
+            GenerateWriteBroadcastTensorIndices(ctx, in_msg2out_msg_equations);
         ret->emplace_back(EraseIndexes(in_msg2out_msg_equations->at(idx),
-                                       truncated_output_tensor_idxes));
+                                       truncated_output_tensor_indices));
       });
   return ret;
 }