diff --git a/mindspore/ccsrc/include/common/utils/utils.h b/mindspore/ccsrc/include/common/utils/utils.h index f7ed939fbe3..af4e4138816 100644 --- a/mindspore/ccsrc/include/common/utils/utils.h +++ b/mindspore/ccsrc/include/common/utils/utils.h @@ -553,6 +553,7 @@ constexpr auto kAttrInterProcessEdgeName = "inter_process_edge_name"; constexpr auto kAttrForwardOpOutputId = "forward_op_output_id"; constexpr auto kAttrGroupRankIds = "group_rank_ids"; constexpr auto kAttrReuseCommunication = "reuse_communication_node"; +constexpr auto kAttrPrecisionFlag = "precision_flag"; // TODO(dsj): for ms_function running in graph_mode. should be delete later constexpr auto kAttrMSFunction = "ms_function_graph"; diff --git a/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.cc index d20627aa0e4..a2bc312b7d6 100644 --- a/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.cc @@ -803,6 +803,14 @@ void PrintNotMatchMessage(const std::vector> kernel_info_list; std::vector> aicpu_kernel_info_list; @@ -851,6 +859,7 @@ KernelSelectStatus SelectKernelInfo(const CNodePtr &kernel_node, KernelType kern GatherInputAndOutputInferType(aicpu_in_out_info, kernel_node); PrintNotMatchMessage(kernel_info_list, aicpu_kernel_info_list, aicore_in_out_info, aicpu_in_out_info, kernel_node); } + SetRaiseOrReduceFlag(kernel_node, select_status); return select_status; } diff --git a/mindspore/ccsrc/runtime/device/ms_device_shape_transfer.h b/mindspore/ccsrc/runtime/device/ms_device_shape_transfer.h index b3a39d45bf2..843fb71f229 100644 --- a/mindspore/ccsrc/runtime/device/ms_device_shape_transfer.h +++ b/mindspore/ccsrc/runtime/device/ms_device_shape_transfer.h @@ -336,10 +336,6 @@ std::vector PaddingShapeTo5dDefault(const std::vector &shape, const AnfNod if (shape.size() >= kDim5) { return shape; } - if (node != nullptr) { - MS_LOG(INFO) << "Start padding shape to 5d by default reshape type, node [" << node->fullname_with_scope() - << "], detail info: " << node->DebugString(); - } std::vector shape_5d(kNcdhw, 1); switch (shape.size()) { case N_ncdhw: @@ -363,7 +359,8 @@ std::vector PaddingShapeTo5dDefault(const std::vector &shape, const AnfNod shape_5d[W_ncdhw] = shape[H_ncdhw]; break; default: - MS_LOG(EXCEPTION) << "Unexpected shape :" << shape; + auto node_info = (node != nullptr) ? ". Node: " + node->fullname_with_scope() : " ."; + MS_LOG(EXCEPTION) << "Unexpected shape :" << shape << node_info; } return shape_5d; } @@ -373,10 +370,6 @@ std::vector PaddingShapeTo5dDefault(const std::vector &shape, const AnfNod * */ template std::vector PaddingShapeTo4dDefault(const std::vector &shape, const AnfNodePtr &node = nullptr) { - if (node != nullptr) { - MS_LOG(INFO) << "Start padding shape to 4d by default reshape type, node [" << node->fullname_with_scope() - << "], detail info: " << node->DebugString(); - } std::vector shape_4d(kNchwDims, 1); switch (shape.size()) { case kN: @@ -397,7 +390,8 @@ std::vector PaddingShapeTo4dDefault(const std::vector &shape, const AnfNod (void)std::copy(shape.begin(), shape.end(), shape_4d.begin()); break; default: - MS_LOG(EXCEPTION) << "Unexpected shape : " << shape; + auto node_info = (node != nullptr) ? ". Node: " + node->fullname_with_scope() : " ."; + MS_LOG(EXCEPTION) << "Unexpected shape : " << shape << node_info; } return shape_4d; } @@ -443,8 +437,8 @@ template std::vector PaddingShape(const std::vector &shape, const std::string &format, const std::string &pad_index = {""}, const AnfNodePtr &node = nullptr) { if (node != nullptr) { - MS_LOG(INFO) << "Start padding shape for node: [" << node->fullname_with_scope() << "], format: " << format - << ", detail info: " << node->DebugString(); + MS_LOG(DEBUG) << "Start padding shape for node: [" << node->fullname_with_scope() << "], format: " << format + << ", detail info: " << node->DebugString(); } std::vector host_shape; if (k3DFormatSet.find(format) != k3DFormatSet.end()) {