Browse Source

!4300 fix operator select log imcomplete

Merge pull request !4300 from jjfeing/master
tags/v0.7.0-beta
mindspore-ci-bot Gitee 5 years ago
parent
commit
0ac47b578d
1 changed files with 8 additions and 8 deletions
  1. +8
    -8
      mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc

+ 8
- 8
mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc View File

@@ -70,9 +70,8 @@ void KernelQueryAll(const CNodePtr &kernel_node,
std::vector<std::shared_ptr<kernel::KernelBuildInfo>> *kernel_info_list) { std::vector<std::shared_ptr<kernel::KernelBuildInfo>> *kernel_info_list) {
MS_EXCEPTION_IF_NULL(kernel_node); MS_EXCEPTION_IF_NULL(kernel_node);
MS_EXCEPTION_IF_NULL(kernel_info_list); MS_EXCEPTION_IF_NULL(kernel_info_list);
std::string op_name = AnfAlgo::GetCNodeName(kernel_node);
TbeMetadataInfo(kernel_node, kernel_info_list); TbeMetadataInfo(kernel_node, kernel_info_list);

if (kernel_info_list->empty()) { if (kernel_info_list->empty()) {
AicpuMetadataInfo(kernel_node, kernel_info_list); AicpuMetadataInfo(kernel_node, kernel_info_list);
if (!kernel_info_list->empty()) { if (!kernel_info_list->empty()) {
@@ -81,16 +80,17 @@ void KernelQueryAll(const CNodePtr &kernel_node,
AnfAlgo::SetNodeAttr(kAttrIsAICPUKernel, MakeValue(true), kernel_node); AnfAlgo::SetNodeAttr(kAttrIsAICPUKernel, MakeValue(true), kernel_node);
} }
} }

if (kernel_info_list->empty()) { if (kernel_info_list->empty()) {
GetRtKelInfo(kernel_node, kernel_info_list); GetRtKelInfo(kernel_node, kernel_info_list);
} }

if (kernel_info_list->empty()) { if (kernel_info_list->empty()) {
HcclMetadataInfo(kernel_node, kernel_info_list); HcclMetadataInfo(kernel_node, kernel_info_list);
} }
if (kernel_info_list->empty()) { 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_node);
MS_EXCEPTION_IF_NULL(kernel_info_list); MS_EXCEPTION_IF_NULL(kernel_info_list);


std::string op_name = AnfAlgo::GetCNodeName(kernel_node);

auto context_ptr = MsContext::GetInstance(); auto context_ptr = MsContext::GetInstance();
MS_EXCEPTION_IF_NULL(context_ptr); MS_EXCEPTION_IF_NULL(context_ptr);
if (context_ptr->enable_graph_kernel() && IsPrimitiveCNode(kernel_node, prim::kPrimBatchMatMul)) { 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()) { 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 // check output
FilterInvalidKernelInfo(kernel_node, kernel_info_list); FilterInvalidKernelInfo(kernel_node, kernel_info_list);


Loading…
Cancel
Save