PaddlePaddle
diff --git a/‎paddle/fluid/imperative/all_reduce.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/imperative/all_reduce.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/imperative/amp_auto_cast.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions b/‎paddle/fluid/imperative/amp_auto_cast.cc
Copy file name to clipboard
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎paddle/fluid/imperative/basic_engine.cc
Copy file name to clipboard
+14-14Lines changed: 14 additions & 14 deletions b/‎paddle/fluid/imperative/basic_engine.cc
Copy file name to clipboard
+14-14Lines changed: 14 additions & 14 deletions
diff --git a/‎paddle/fluid/imperative/bkcl_context.cc
Copy file name to clipboard
+35-32Lines changed: 35 additions & 32 deletions b/‎paddle/fluid/imperative/bkcl_context.cc
Copy file name to clipboard
+35-32Lines changed: 35 additions & 32 deletions
diff --git a/‎paddle/fluid/imperative/data_loader.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions b/‎paddle/fluid/imperative/data_loader.cc
Copy file name to clipboard
+4-4Lines changed: 4 additions & 4 deletions
diff --git a/‎paddle/fluid/imperative/dygraph_grad_maker.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎paddle/fluid/imperative/dygraph_grad_maker.h
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
@@ -45,7 +45,7 @@ static const phi::Place &GetVarPlace(const framework::Variable &src) {
     return src.Get<phi::SelectedRows>().value().place();
 #endif
   } else {
-    PADDLE_THROW(phi::errors::InvalidArgument(
+    PADDLE_THROW(common::errors::InvalidArgument(
         "Cannot get unsupported variable type %s for imperative allreduce, "
         "only "
         "LoDTensor and SelectedRows are supported.",
@@ -61,7 +61,7 @@ static void AllReduce(const phi::DenseTensor &src,
   PADDLE_ENFORCE_EQ(
       phi::is_gpu_place(place),
       true,
-      phi::errors::Unimplemented(
+      common::errors::Unimplemented(
           "Imperative mode does not support multi-CPU training yet."));
 
   const void *src_ptr = src.data();
@@ -90,7 +90,7 @@ static void AllReduce(const phi::SelectedRows &src,
   PADDLE_ENFORCE_EQ(
       phi::is_gpu_place(place),
       true,
-      phi::errors::Unimplemented(
+      common::errors::Unimplemented(
           "Imperative mode does not support multi-CPU training yet."));
 
   auto dtype = framework::TransToProtoVarType(src_tensor.dtype());
@@ -259,7 +259,7 @@ void AllReduce(const framework::Variable &src,
     }
 #endif
   } else {
-    PADDLE_THROW(phi::errors::InvalidArgument(
+    PADDLE_THROW(common::errors::InvalidArgument(
         "Unsupported variable type %s for imperative allreduce, only "
         "LoDTensor and SelectedRows are supported.",
         platform::demangle(framework::ToTypeName(src.Type()))));
 
@@ -58,7 +58,7 @@ OpSupportedInfos(const std::string& place,
   };
   PADDLE_ENFORCE_NE(is_target_place.count(query_place),
                     0,
-                    phi::errors::InvalidArgument(
+                    common::errors::InvalidArgument(
                         "The argument `place` should be 'GPU', 'CPU', 'XPU' or "
                         "other Custom Device, but got '%s'.",
                         place));
@@ -180,7 +180,7 @@ AmpOperators::GetMutableUnsupportedOps(const phi::DataType& data_type) {
       data_type == phi::DataType::FLOAT16 ||
           data_type == phi::DataType::BFLOAT16,
       true,
-      phi::errors::InvalidArgument(
+      common::errors::InvalidArgument(
           "The data_type mismatch. It should be FLOAT16 or BFLOAT16."));
   if (data_type == phi::DataType::FLOAT16) {  // NOLINT
     return unsupported_fp16_ops_;
 
@@ -48,20 +48,20 @@ void BasicEngine::Init(
   PADDLE_ENFORCE_EQ(
       tensors.size(),
       grad_tensors.size(),
-      phi::errors::Unavailable(
+      common::errors::Unavailable(
           "The size of tensors do not equal the size of grad_tensors,"
           "the size of tensors is %s, but the size of grad_tensors is %s.",
           tensors.size(),
           grad_tensors.size()));
 
   PADDLE_ENFORCE_EQ(accumulators_.empty(),
                     true,
-                    phi::errors::AlreadyExists(
+                    common::errors::AlreadyExists(
                         "Accumulators are not empty before preparing it for "
                         "backward network execution."));
   PADDLE_ENFORCE_EQ(accumulators_with_grad_node_.empty(),
                     true,
-                    phi::errors::AlreadyExists(
+                    common::errors::AlreadyExists(
                         "Accumulators with grad_node as the key are not empty "
                         "before preparing it for backward network execution."));
 
@@ -74,7 +74,7 @@ void BasicEngine::Init(
     PADDLE_ENFORCE_EQ(
         var->GradVarBase()->GraphIsFreed(),
         false,
-        phi::errors::Unavailable(
+        common::errors::Unavailable(
             "%s trying to backward through the same graph a second "
             "time, but this graph have already been freed. Please "
             "specify Tensor.backward(retain_graph=True) when "
@@ -99,7 +99,7 @@ void BasicEngine::Init(
     PADDLE_ENFORCE_EQ(
         var->HasGradVar(),
         true,
-        phi::errors::NotFound("Tensor %s has no gradient", var->Name()));
+        common::errors::NotFound("Tensor %s has no gradient", var->Name()));
 
     auto& fwd_var = var->Var().Get<phi::DenseTensor>();
     auto* grad_var =
@@ -192,7 +192,7 @@ void BasicEngine::PrepareGradAccumulators(
         for (auto& grad_pending_node : grad_pending_nodes) {
           PADDLE_ENFORCE_NOT_NULL(
               grad_pending_node,
-              phi::errors::NotFound("Grad pending node is nullptr."));
+              common::errors::NotFound("Grad pending node is nullptr."));
           for (auto& grad_pending_op : *grad_pending_node) {
             VLOG(6) << "Determine whether var (" << var->Name()
                     << ") is the input var of grad_pending_op ("
@@ -279,8 +279,8 @@ void BasicEngine::PrepareDeps() {
   PADDLE_ENFORCE_EQ(
       node_deps_.empty(),
       true,
-      phi::errors::AlreadyExists("Op deps are not empty before preparing "
-                                 "it for backward network execution."));
+      common::errors::AlreadyExists("Op deps are not empty before preparing "
+                                    "it for backward network execution."));
 
   std::queue<GradOpNode*> q;
   std::unordered_set<GradOpNode*> visited;
@@ -304,7 +304,7 @@ void BasicEngine::PrepareDeps() {
     for (auto& grad_pending_node : grad_pending_nodes) {
       PADDLE_ENFORCE_NOT_NULL(
           grad_pending_node,
-          phi::errors::NotFound("Grad pending node is nullptr."));
+          common::errors::NotFound("Grad pending node is nullptr."));
       ++node_deps_[grad_pending_node.get()];
       if (visited.count(grad_pending_node.get()) == 0) {
         visited.insert(grad_pending_node.get());
@@ -489,8 +489,8 @@ void BasicEngine::Execute() {
             PADDLE_ENFORCE_EQ(
                 iter != accumulators_.end(),
                 true,
-                phi::errors::NotFound("Cannot find gradient of variable %s",
-                                      var->Name()));
+                common::errors::NotFound("Cannot find gradient of variable %s",
+                                         var->Name()));
           }
 
           // leaf_accumulators_ : hooks and accumulate-grad for leaf tensor,
@@ -549,7 +549,7 @@ void BasicEngine::Execute() {
           PADDLE_ENFORCE_EQ(
               tensor_version,
               wrapper_version_snapshot,
-              phi::errors::PermissionDenied(
+              common::errors::PermissionDenied(
                   "Tensor '%s' used in gradient computation in grad op '%s' "
                   "has been "
                   "modified by an inplace operation. "
@@ -607,7 +607,7 @@ void BasicEngine::Execute() {
           throw exception;
         } catch (std::exception& ex) {
           Clear();
-          PADDLE_THROW(phi::errors::External("%s", ex.what()));
+          PADDLE_THROW(common::errors::External("%s", ex.what()));
         }
       }
 
@@ -656,7 +656,7 @@ void BasicEngine::Execute() {
     for (auto& grad_pending_node : shared_cur_node->GradPendingNodes()) {
       PADDLE_ENFORCE_NOT_NULL(
           grad_pending_node,
-          phi::errors::NotFound("Grad pending node is nullptr."));
+          common::errors::NotFound("Grad pending node is nullptr."));
       auto iter = node_deps_.find(grad_pending_node.get());
       if (iter == node_deps_.end()) {
         continue;
 
@@ -41,7 +41,7 @@ static void AllReduce(const phi::DenseTensor &src,
   PADDLE_ENFORCE_EQ(
       phi::is_xpu_place(place),
       true,
-      phi::errors::Unimplemented(
+      common::errors::Unimplemented(
           "Dynamic graph mode does not support multi-CPU training yet."));
 
   const void *src_ptr = src.data();
@@ -50,15 +50,16 @@ static void AllReduce(const phi::DenseTensor &src,
   auto bkcl_dtype =
       platform::ToBKCLDataType(framework::TransToProtoVarType(src.dtype()));
 
-  PADDLE_ENFORCE_EQ(bkcl_all_reduce(comm->comm(),
-                                    src_ptr,
-                                    dst_ptr,
-                                    src.numel(),
-                                    bkcl_dtype,
-                                    BKCL_ADD,
-                                    stream),
-                    BKCL_SUCCESS,
-                    phi::errors::PreconditionNotMet("BKCL all reduce failed"));
+  PADDLE_ENFORCE_EQ(
+      bkcl_all_reduce(comm->comm(),
+                      src_ptr,
+                      dst_ptr,
+                      src.numel(),
+                      bkcl_dtype,
+                      BKCL_ADD,
+                      stream),
+      BKCL_SUCCESS,
+      common::errors::PreconditionNotMet("BKCL all reduce failed"));
 }
 /*
 Baidu Kunlun Communication Library(BKCL) is designed for multi Baidu Kunlun
@@ -92,7 +93,7 @@ void BKCLParallelContext::Init() {
       auto ret = bkcl_get_unique_id(&bkcl_ids[i]);
       PADDLE_ENFORCE_EQ(BKCL_SUCCESS,
                         ret,
-                        phi::errors::PreconditionNotMet(
+                        common::errors::PreconditionNotMet(
                             "BKCL get unique id failed [%d]", ret));
     }
   }
@@ -123,10 +124,10 @@ void BKCLParallelContext::InitWithRingID(int ring_id) {
   if (strategy_.local_rank_ == 0) {
     // generate the unique bkclid on the root worker
     auto ret = bkcl_get_unique_id(&bkcl_ids[0]);
-    PADDLE_ENFORCE_EQ(
-        BKCL_SUCCESS,
-        ret,
-        phi::errors::PreconditionNotMet("BKCL get unique id failed [%d]", ret));
+    PADDLE_ENFORCE_EQ(BKCL_SUCCESS,
+                      ret,
+                      common::errors::PreconditionNotMet(
+                          "BKCL get unique id failed [%d]", ret));
   }
   BcastBKCLId(bkcl_ids, 0);
 
@@ -151,7 +152,7 @@ void BKCLParallelContext::AllReduceByStream(const framework::Variable &src,
   PADDLE_ENFORCE_EQ(
       phi::is_xpu_place(place_),
       true,
-      phi::errors::Unimplemented(
+      common::errors::Unimplemented(
           "Dynamic graph mode does not support multi-CPU training yet."));
   auto place = place_;
 
@@ -171,7 +172,7 @@ void BKCLParallelContext::AllReduceByStream(const framework::Variable &src,
               stream,
               comm);
   } else {
-    PADDLE_THROW(phi::errors::InvalidArgument(
+    PADDLE_THROW(common::errors::InvalidArgument(
         "XPU unsupported variable type %s for imperative allreduce, only "
         "LoDTensor are supported.",
         platform::demangle(framework::ToTypeName(src.Type()))));
@@ -198,7 +199,7 @@ void BKCLParallelContext::Broadcast(framework::Variable *src, int ring_id) {
                                    0,
                                    stream),
                     BKCL_SUCCESS,
-                    phi::errors::Unavailable("bkcl_broadcast failed"));
+                    common::errors::Unavailable("bkcl_broadcast failed"));
 }
 
 phi::DeviceContext *BKCLParallelContext::GetDeviceContext(int ring_id) {
@@ -211,13 +212,14 @@ void BKCLParallelContext::WaitCompute(int ring_id) {
   PADDLE_ENFORCE_GE(
       ring_id,
       0,
-      phi::errors::OutOfRange("Ring id expected >= 0, but got %d", ring_id));
-  PADDLE_ENFORCE_LT(ring_id,
-                    strategy_.nrings_,
-                    phi::errors::OutOfRange("Ring id expected < nrings,"
-                                            "but got ring id = %d, nrings = %d",
-                                            ring_id,
-                                            strategy_.nrings_));
+      common::errors::OutOfRange("Ring id expected >= 0, but got %d", ring_id));
+  PADDLE_ENFORCE_LT(
+      ring_id,
+      strategy_.nrings_,
+      common::errors::OutOfRange("Ring id expected < nrings,"
+                                 "but got ring id = %d, nrings = %d",
+                                 ring_id,
+                                 strategy_.nrings_));
   auto compute_stream = static_cast<phi::XPUContext *>(
                             phi::DeviceContextPool::Instance().Get(place_))
                             ->stream();
@@ -236,13 +238,14 @@ void BKCLParallelContext::WaitComm(int ring_id) {
   PADDLE_ENFORCE_GE(
       ring_id,
       0,
-      phi::errors::OutOfRange("Ring id expected >= 0, but got %d", ring_id));
-  PADDLE_ENFORCE_LT(ring_id,
-                    strategy_.nrings_,
-                    phi::errors::OutOfRange("Ring id expected < nrings,"
-                                            "but got ring id = %d, nrings = %d",
-                                            ring_id,
-                                            strategy_.nrings_));
+      common::errors::OutOfRange("Ring id expected >= 0, but got %d", ring_id));
+  PADDLE_ENFORCE_LT(
+      ring_id,
+      strategy_.nrings_,
+      common::errors::OutOfRange("Ring id expected < nrings,"
+                                 "but got ring id = %d, nrings = %d",
+                                 ring_id,
+                                 strategy_.nrings_));
   auto comm_stream = platform::BKCLCommContext::Instance()
                          .Get(ring_id, place_)
                          ->dev_context()
 
@@ -113,7 +113,7 @@ static inline void setSignalHandler(int signal,
   sa.sa_flags = SA_RESTART | SA_SIGINFO | SA_NOCLDSTOP | SA_NODEFER;
   if (sigemptyset(&sa.sa_mask) != 0 ||
       sigaction(signal, &sa, old_sa_ptr) != 0) {
-    PADDLE_THROW(phi::errors::Fatal(
+    PADDLE_THROW(common::errors::Fatal(
         "An error occurred while setting handler for %s.", strsignal(signal)));
   }
 }
@@ -147,7 +147,7 @@ void ThrowErrorIfLoadProcessFailed() {
       if (infop.si_code == CLD_EXITED &&
           infop.si_status != EXIT_SUCCESS) {  // exit with error
         pids_set->clear();
-        PADDLE_THROW(phi::errors::Fatal(
+        PADDLE_THROW(common::errors::Fatal(
             "DataLoader process (pid %ld) exited unexpectedly with code %d. "
             "Error detailed are lost due to multiprocessing. Rerunning with:\n"
             "  1. If run DataLoader by DataLoader.from_generator(...), run "
@@ -163,7 +163,7 @@ void ThrowErrorIfLoadProcessFailed() {
                  infop.si_code == CLD_DUMPED) {  // killed by signal
         if (infop.si_status == SIGBUS) {
           pids_set->clear();
-          PADDLE_THROW(phi::errors::Fatal(
+          PADDLE_THROW(common::errors::Fatal(
               "DataLoader process (pid %ld) exited is killed by signal: %s.\n"
               "  It may be caused by insufficient shared storage space. This "
               "problem usually occurs when using docker as a development "
@@ -182,7 +182,7 @@ void ThrowErrorIfLoadProcessFailed() {
               process_pid,
               strsignal(infop.si_status)));
         } else {
-          PADDLE_THROW(phi::errors::Fatal(
+          PADDLE_THROW(common::errors::Fatal(
               "DataLoader process (pid %ld) exited is killed by signal: %s.",
               process_pid,
               strsignal(infop.si_status)));
 
@@ -130,7 +130,7 @@ class GradOpBaseMakerBase {
     PADDLE_ENFORCE_EQ(
         it != attrs_.end(),
         true,
-        phi::errors::NotFound(
+        common::errors::NotFound(
             "Cannot find attribute [%s] in operator [%s]", name, type_));
     return it->second;
   }
Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ class GradOpBaseMakerBase {`
`130`	`130`	`PADDLE_ENFORCE_EQ(`
`131`	`131`	`it != attrs_.end(),`
`132`	`132`	`true,`
`133`		`- phi::errors::NotFound(`
	`133`	`+ common::errors::NotFound(`
`134`	`134`	`"Cannot find attribute [%s] in operator [%s]", name, type_));`
`135`	`135`	`return it->second;`
`136`	`136`	`}`