From 37d18c3f7303f11ba37f67d024e1a95c8432f1fa Mon Sep 17 00:00:00 2001
From: jjfeing <jiangjianfei3@huawei.com>
Date: Tue, 11 Aug 2020 19:58:24 +0800
Subject: [PATCH] Repair incomplete operator selection log

---
 .../backend/kernel_compiler/kernel_query.cc      | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc

diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc
old mode 100755
new mode 100644
index 343fdd4896..2dfda849e9
--- a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc
+++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc
@@ -70,9 +70,8 @@ void KernelQueryAll(const CNodePtr &kernel_node,
                     std::vector<std::shared_ptr<kernel::KernelBuildInfo>> *kernel_info_list) {
   MS_EXCEPTION_IF_NULL(kernel_node);
   MS_EXCEPTION_IF_NULL(kernel_info_list);
-
+  std::string op_name = AnfAlgo::GetCNodeName(kernel_node);
   TbeMetadataInfo(kernel_node, kernel_info_list);
-
   if (kernel_info_list->empty()) {
     AicpuMetadataInfo(kernel_node, kernel_info_list);
     if (!kernel_info_list->empty()) {
@@ -81,16 +80,17 @@ void KernelQueryAll(const CNodePtr &kernel_node,
       AnfAlgo::SetNodeAttr(kAttrIsAICPUKernel, MakeValue(true), kernel_node);
     }
   }
-
   if (kernel_info_list->empty()) {
     GetRtKelInfo(kernel_node, kernel_info_list);
   }
-
   if (kernel_info_list->empty()) {
     HcclMetadataInfo(kernel_node, kernel_info_list);
   }
   if (kernel_info_list->empty()) {
-    MS_LOG(EXCEPTION) << "Op " << kernel_node->DebugString() << "kernel query fail!";
+    MS_EXCEPTION(NotExistsError)
+      << "Failed to obtain operator info, Please check whether the operator info is registered, Op full name:"
+      << kernel_node->fullname_with_scope() << "Node Type: " << op_name
+      << ", Node DebugString: " << kernel_node->DebugString();
   }
 }
 
@@ -99,8 +99,6 @@ void KernelQuery(const CNodePtr &kernel_node, std::vector<std::shared_ptr<kernel
   MS_EXCEPTION_IF_NULL(kernel_node);
   MS_EXCEPTION_IF_NULL(kernel_info_list);
 
-  std::string op_name = AnfAlgo::GetCNodeName(kernel_node);
-
   auto context_ptr = MsContext::GetInstance();
   MS_EXCEPTION_IF_NULL(context_ptr);
   if (context_ptr->enable_graph_kernel() && IsPrimitiveCNode(kernel_node, prim::kPrimBatchMatMul)) {
@@ -117,7 +115,9 @@ void KernelQuery(const CNodePtr &kernel_node, std::vector<std::shared_ptr<kernel
   }
 
   if (kernel_info_list->empty()) {
-    MS_EXCEPTION(NotExistsError) << "Op[" << kernel_node->DebugString() << "] kernel query fail!";
+    MS_EXCEPTION(NotExistsError)
+      << "Failed to obtain operator info. Please check whether the operator info is registered, Op full name:"
+      << kernel_node->fullname_with_scope() << ". Node DebugString: " << kernel_node->DebugString();
   }
   // check output
   FilterInvalidKernelInfo(kernel_node, kernel_info_list);