Merge branch 'macro3' of github.com:uanu2002/Paddle into macro3

Author: uanu2002

cmake/generic.cmake

@@ -1312,7 +1312,7 @@ function(math_library TARGET)
   set(cc_srcs)
   set(cu_srcs)
   set(hip_srcs)
-  set(math_common_deps device_context framework_proto enforce)
+  set(math_common_deps device_context framework_proto phi common)
   if(WITH_GPU)
     if(${CMAKE_CUDA_COMPILER_VERSION} LESS 11.0)
       list(APPEND math_common_deps cub)

cmake/third_party.cmake

@@ -55,8 +55,35 @@ if(NOT WITH_SETUP_INSTALL)
     WORKING_DIRECTORY ${PADDLE_SOURCE_DIR}
     RESULT_VARIABLE result_var)
   if(NOT result_var EQUAL 0)
-    message(
-      FATAL_ERROR "Failed to update submodule, please check your network !")
+    if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+      set(THIRD_PARTY_TAR_URL
+          https://xly-devops.bj.bcebos.com/PR/build_whl/0/third_party.tar.gz
+          CACHE STRING "third_party.tar.gz url")
+      execute_process(
+        COMMAND wget -q ${THIRD_PARTY_TAR_URL}
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        RESULT_VARIABLE wget_result)
+      if(NOT wget_result EQUAL 0)
+        message(
+          FATAL_ERROR
+            "Failed to download third_party.tar.gz, please check your network !"
+        )
+      else()
+        execute_process(
+          COMMAND tar -xzf third_party.tar.gz -C ${CMAKE_SOURCE_DIR}/
+          WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+          RESULT_VARIABLE tar_result)
+        if(NOT tar_result EQUAL 0)
+          message(
+            FATAL_ERROR
+              "Failed to extract third_party.tar.gz, please make sure tar.gz file is not corrupted !"
+          )
+        endif()
+      endif()
+    else()
+      message(
+        FATAL_ERROR "Failed to update submodule, please check your network !")
+    endif()
   endif()
 
 endif()

paddle/cinn/adt/adt.h

@@ -283,7 +283,7 @@ struct Ok final {
   bool operator!=(const Ok&) const { return false; }
 };
 
-#define ADT_TODO() PADDLE_THROW(phi::errors::Fatal("TODO"))
+#define ADT_TODO() PADDLE_THROW(::common::errors::Fatal("TODO"))
 
 inline std::size_t hash_combine(std::size_t lhs, std::size_t rhs) {
   return lhs ^= rhs + 0x9e3779b9 + (lhs << 6) + (lhs >> 2);

paddle/cinn/adt/anchor_sd_equation_context.cc

@@ -31,7 +31,7 @@ void GenerateScheduleMeshEquationsImpl(const List<ScheduleDim>& sched_dims,
   PADDLE_ENFORCE_EQ(
       input_iterators->size() == output_iterators->size(),
       true,
-      phi::errors::InvalidArgument(
+      ::common::errors::InvalidArgument(
           "The size of input iterators and output iterators should be equal, "
           "but got input iterators size = %d, output iterators size = %d.",
           input_iterators->size(),
@@ -53,7 +53,7 @@ void GenerateScheduleMeshEquationsImpl(
   PADDLE_ENFORCE_EQ(
       shape.value()->size() == output_iterators->size(),
       true,
-      phi::errors::InvalidArgument(
+      ::common::errors::InvalidArgument(
           "The size of shape and output iterators should be equal, but got "
           "shape size = %d, output iterators size = %d.",
           shape.value()->size(),
@@ -75,7 +75,7 @@ void GenerateScheduleMeshEquationsImpl(
   const auto& [sched_mesh, perm] = sched_transpose.tuple();
   PADDLE_ENFORCE_EQ(GetOutputRank(sched_mesh) == output_iterators->size(),
                     true,
-                    phi::errors::InvalidArgument(
+                    ::common::errors::InvalidArgument(
                         "The size of output iterators should be equal to the "
                         "rank of the schedule mesh, but got output iterators "
                         "size = %d, rank of the schedule mesh = %d.",
@@ -99,7 +99,7 @@ void GenerateScheduleMeshEquationsImpl(
   const auto& [sched_mesh, _] = sched_padding.tuple();
   PADDLE_ENFORCE_EQ(GetOutputRank(sched_mesh) == output_iterators->size(),
                     true,
-                    phi::errors::InvalidArgument(
+                    ::common::errors::InvalidArgument(
                         "The size of output iterators should be equal to the "
                         "rank of the schedule mesh, but got output iterators "
                         "size = %d, rank of the schedule mesh = %d.",

paddle/cinn/adt/equation_solver.cc

@@ -186,7 +186,7 @@ std::unordered_map<Variable, Value> InferValuesImpl(
   PADDLE_ENFORCE_EQ(
       out_msg_in_indexes.value()->size() == in_msg_in_indexes.value()->size(),
       true,
-      phi::errors::InvalidArgument(
+      ::common::errors::InvalidArgument(
           "The size of out_msg_in_indexes should be equal to the size of "
           "in_msg_in_indexes, but got out_msg_in_indexes size = %d, "
           "in_msg_in_indexes size = %d.",
@@ -195,7 +195,7 @@ std::unordered_map<Variable, Value> InferValuesImpl(
   PADDLE_ENFORCE_EQ(
       out_msg_out_indexes.value()->size() == in_msg_out_indexes.value()->size(),
       true,
-      phi::errors::InvalidArgument(
+      ::common::errors::InvalidArgument(
           "The size of out_msg_out_indexes should be equal to the size of "
           "in_msg_out_indexes, but got out_msg_out_indexes size = %d, "
           "in_msg_out_indexes size = %d.",
@@ -288,8 +288,8 @@ void CheckEquationsSolvable(
         [&](const auto& opt_old_value, const auto& simplified_value) {
           LOG(ERROR) << "old_value: " << ToTxtString(opt_old_value);
           LOG(ERROR) << "simplified_value: " << ToTxtString(simplified_value);
-          PADDLE_THROW(
-              phi::errors::InvalidArgument("CheckEquationsSolvable Failed"));
+          PADDLE_THROW(::common::errors::InvalidArgument(
+              "CheckEquationsSolvable Failed"));
           return tValueInferSuccess<bool>{false};
         });
   };

paddle/cinn/adt/generate_map_expr.cc

@@ -105,7 +105,7 @@ bool HasDynamicShape(const ::pir::Value& tensor) {
       PADDLE_ENFORCE_EQ(
           dim,
           -1UL,
-          phi::errors::InvalidArgument(
+          ::common::errors::InvalidArgument(
               "The dynamic shape dim should be -1, but got %d.", dim));
       return true;
     }
@@ -249,7 +249,7 @@ std::shared_ptr<KGroup> GenerateKGroups(
   PADDLE_ENFORCE_EQ(
       igroups.size(),
       1UL,
-      phi::errors::InvalidArgument(
+      ::common::errors::InvalidArgument(
           "The size of igroups should be 1, but got %d.", igroups.size()));
   return std::make_shared<KGroup>(group, igroups);
 }
@@ -326,7 +326,7 @@ LoopDescriptor4IterVarT MakeGetterLoopDescriptor4IterVar(
   PADDLE_ENFORCE_EQ(
       loop_iters->size(),
       sd->size(),
-      phi::errors::InvalidArgument(
+      ::common::errors::InvalidArgument(
           "The size of loop iterators and loop descriptors should be equal, "
           "but got loop iterators size = %d, loop descriptors size = %d.",
           loop_iters->size(),
@@ -363,8 +363,8 @@ MapStmt<Stmt> MakeMapStmt(const MapIrList& map_irs) {
   PADDLE_ENFORCE_EQ(
       stmts->size(),
       1UL,
-      phi::errors::InvalidArgument("The size of stmts should be 1, but got %d.",
-                                   stmts->size()));
+      ::common::errors::InvalidArgument(
+          "The size of stmts should be 1, but got %d.", stmts->size()));
   CHECK(stmts->at(0).Has<MapStmt<Stmt>>());
   return stmts->at(0).Get<MapStmt<Stmt>>();
 }

paddle/cinn/adt/get_sub_reshape_dim_ranges.cc

@@ -82,7 +82,7 @@ GetSubReshapeDimRanges(const List<DimExpr>& lhs_dims,
     } else if (LhsAcc() > RhsAcc()) {
       rhs_end++;
     } else {
-      PADDLE_THROW(phi::errors::Fatal("Dead code"));
+      PADDLE_THROW(::common::errors::Fatal("Dead code"));
     }
   }
   CHECK(lhs_end == lhs_dims->size() && rhs_end == rhs_dims->size());

paddle/cinn/adt/igroup.cc

@@ -102,10 +102,10 @@ List<Iterator> IGroup::GetIndexIterators(const Index& index) const {
     } else if (arg_pos.Has<Undefined>()) {
       // do nothing
     } else {
-      PADDLE_THROW(phi::errors::Fatal("Dead code"));
+      PADDLE_THROW(::common::errors::Fatal("Dead code"));
     }
   }
-  PADDLE_THROW(phi::errors::Fatal("Can not find anchor iterators"));
+  PADDLE_THROW(::common::errors::Fatal("Can not find anchor iterators"));
 }
 
 }  // namespace cinn::adt

paddle/cinn/adt/m_ir.cc

@@ -38,12 +38,12 @@ void CollectTensorIndexIterators(const TensorIndexExpr& tensor_index_expr,
 
 void CollectTensorIndexIteratorsImpl(const Undefined& tensor_index_expr,
                                      std::unordered_set<Iterator>* ret) {
-  PADDLE_THROW(phi::errors::Unimplemented("Not Implemented"));
+  PADDLE_THROW(::common::errors::Unimplemented("Not Implemented"));
 }
 
 void CollectTensorIndexIteratorsImpl(const Ok& ok,
                                      std::unordered_set<Iterator>* ret) {
-  PADDLE_THROW(phi::errors::Unimplemented("Not Implemented"));
+  PADDLE_THROW(::common::errors::Unimplemented("Not Implemented"));
 }
 
 void CollectTensorIndexIteratorsImpl(const Iterator& iterator,
@@ -134,7 +134,7 @@ LoopIterators GetAnchorTensorLoopIterators(
 namespace {
 
 Tensor GetTensorImpl(const OpStmt& op_stmt, const Undefined& undefined) {
-  PADDLE_THROW(phi::errors::Fatal("position not found"));
+  PADDLE_THROW(::common::errors::Fatal("position not found"));
 }
 
 Tensor GetTensorImpl(const OpStmt& op_stmt, const tIn<std::size_t>& pos) {

paddle/cinn/adt/naive_bidirection_equation_generator.cc

@@ -71,7 +71,7 @@ void VisitEachInMsgOutMsgPair(const List<Index>& in_msg_indexes,
   PADDLE_ENFORCE_EQ(
       in_msg_indexes->size(),
       out_msg_indexes->size(),
-      phi::errors::InvalidArgument(
+      ::common::errors::InvalidArgument(
           "The size of in_msg_indexes and out_msg_indexes should be equal, but "
           "got in_msg_indexes size = %d, out_msg_indexes size = %d.",
           in_msg_indexes->size(),