From 06d4aa4e7374a41fd8fd9b0c8616d596b8cc810d Mon Sep 17 00:00:00 2001
From: liym27 <33742067+liym27@users.noreply.github.com>
Date: Fri, 10 Apr 2020 11:52:13 +0800
Subject: [PATCH] API (BuildStrategy) error message enhancement.  (#23462)

---
 .../fluid/framework/details/build_strategy.cc | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/paddle/fluid/framework/details/build_strategy.cc b/paddle/fluid/framework/details/build_strategy.cc
index a7fc6a89558..97219602cd8 100644
--- a/paddle/fluid/framework/details/build_strategy.cc
+++ b/paddle/fluid/framework/details/build_strategy.cc
@@ -192,11 +192,24 @@ class ParallelExecutorPassBuilder : public ir::PassBuilder {
     CollectiveContext *context = CollectiveContext::GetInstance();
     context->endpoints_ = strategy_.trainers_endpoints_;
     context->trainer_id_ = strategy_.trainer_id_;
-    PADDLE_ENFORCE_GE(strategy_.trainer_id_, 0, "trainer_id_ >= 0");
+    PADDLE_ENFORCE_GE(
+        strategy_.trainer_id_, 0,
+        platform::errors::InvalidArgument(
+            "The trainer_id_ of strategy_ must be greater than or equal to 0, "
+            "but received strategy_.trainer_id_ = %d.",
+            strategy_.trainer_id_));
+
     if (strategy_.trainer_id_ > 0 && strategy_.trainers_endpoints_.size() > 0) {
-      PADDLE_ENFORCE_LT(static_cast<size_t>(strategy_.trainer_id_),
-                        strategy_.trainers_endpoints_.size(),
-                        "trainer_id_ < endpoints_ size");
+      PADDLE_ENFORCE_LT(
+          static_cast<size_t>(strategy_.trainer_id_),
+          strategy_.trainers_endpoints_.size(),
+          platform::errors::InvalidArgument(
+              "The trainer_id_ of strategy_ must be less than the "
+              "size of vector strategy_.trainers_endpoints_, "
+              "but received strategy_.trainer_id_ = %d, "
+              "the size of strategy_.trainers_endpoints_ is %d.",
+              static_cast<size_t>(strategy_.trainer_id_),
+              strategy_.trainers_endpoints_.size()));
     }
     VLOG(1) << "CollectiveContext:" << context->String();
   }
@@ -269,8 +282,11 @@ class ParallelExecutorPassBuilder : public ir::PassBuilder {
              "FLAGS_use_mkldnn=false.";
     }
 #else
-    PADDLE_ENFORCE(!FLAGS_use_mkldnn,
-                   "Please compile with MKLDNN first to use MKLDNN");
+    PADDLE_ENFORCE_NE(FLAGS_use_mkldnn, true,
+                      platform::errors::PreconditionNotMet(
+                          "FLAGS_use_mkldnn has been set to True, but "
+                          "PaddlePaddle is compiled without MKLDNN. "
+                          "Please compile PaddlePaddle with MKLDNN first."));
 #endif
   }
 
-- 
GitLab