mindspore-Ecosystem
/
mindspore
21
0
Fork 27
Code Issues Pull Requests 6 Projects Releases Wiki Activity

!14935 [ME]Bot clean of master 

From: @chenfei52
Reviewed-by: @ginfung,@zh_qh
Signed-off-by: @zh_qh
This commit is contained in:
mindspore-ci-bot 2021-04-16 14:27:19 +08:00 committed by Gitee
parent 44c3fce818 9012df94f2
commit 8fc47be15f
4 changed files with 68 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
mindspore/ccsrc/debug/debugger/proto_exporter.cc
View File

@ -33,7 +33,11 @@
namespace mindspore {
void CheckIfValidType(const TypePtr &type, debugger::TypeProto *type_proto) {
using TypeInfoToProtoTypeMap = std::vector<std::pair<const char *, debugger::DataType>>;
void SetOutputType(const TypePtr &node, const BaseShapePtr &shape, debugger::TypeProto *type_proto);
void CheckIfValidType(const TypePtr &type, debugger::TypeProto *const type_proto) {
if (!(type->isa<Number>() || type->isa<TensorType>() || type->isa<Tuple>() || type->isa<TypeType>() ||
type->isa<List>() || type->isa<TypeAnything>() || type->isa<RefKeyType>() || type->isa<RefType>() ||
type->isa<Function>() || type->isa<TypeNone>() || type->isa<String>() || type->isa<SymbolicKeyType>() ||
@ -45,8 +49,40 @@ void CheckIfValidType(const TypePtr &type, debugger::TypeProto *type_proto) {
}
}
void DebuggerProtoExporter::SetNodeOutputType(const TypePtr &type, const BaseShapePtr &shape,
debugger::TypeProto *type_proto) {
void SetTensorTypeProto(const TypePtr &type, const BaseShapePtr &shape, debugger::TypeProto *type_proto) {
TypePtr elem_type = dyn_cast<TensorType>(type)->element();
type_proto->mutable_tensor_type()->set_elem_type(GetDebuggerNumberDataType(elem_type));
if (shape != nullptr && shape->isa<abstract::Shape>()) {
abstract::ShapePtr shape_info = dyn_cast<abstract::Shape>(shape);
for (const auto &elem : shape_info->shape()) {
type_proto->mutable_tensor_type()->mutable_shape()->add_dim()->set_size(elem);
}
}
}
void SetTupleTypeProto(const TypePtr &type, debugger::TypeProto *type_proto) {
TuplePtr tuple_type = dyn_cast<Tuple>(type);
for (const auto &elem_type : tuple_type->elements()) {
SetOutputType(elem_type, nullptr, type_proto->mutable_sequence_type()->add_elem_types());
}
}
void SetListTypeProto(const TypePtr &type, debugger::TypeProto *type_proto) {
ListPtr list_type = dyn_cast<List>(type);
for (const auto &elem_type : list_type->elements()) {
SetOutputType(elem_type, nullptr, type_proto->mutable_sequence_type()->add_elem_types());
}
}
static TypeInfoToProtoTypeMap type_info_to_proto_type = {
{typeid(TensorType).name(), debugger::DT_TENSOR}, {typeid(Tuple).name(), debugger::DT_TUPLE},
{typeid(TypeType).name(), debugger::DT_TYPE}, {typeid(List).name(), debugger::DT_LIST},
{typeid(TypeAnything).name(), debugger::DT_ANYTHING}, {typeid(RefKeyType).name(), debugger::DT_REFKEY},
{typeid(RefType).name(), debugger::DT_REF}, {typeid(Function).name(), debugger::DT_GRAPH},
{typeid(TypeNone).name(), debugger::DT_NONE}, {typeid(String).name(), debugger::DT_STRING},
{typeid(UMonadType).name(), debugger::DT_UMONAD}, {typeid(IOMonadType).name(), debugger::DT_IOMONAD}};
void SetOutputType(const TypePtr &type, const BaseShapePtr &shape, debugger::TypeProto *type_proto) {
if (type_proto == nullptr) {
return;
}
@ -55,46 +91,22 @@ void DebuggerProtoExporter::SetNodeOutputType(const TypePtr &type, const BaseSha
return;
}
CheckIfValidType(type, type_proto);
for (auto &it : type_info_to_proto_type) {
if (type->IsFromTypeId(Base::GetTypeId(it.first))) {
type_proto->set_data_type(it.second);
break;
}
}
if (type->isa<TensorType>()) {
TypePtr elem_type = dyn_cast<TensorType>(type)->element();
type_proto->mutable_tensor_type()->set_elem_type(GetDebuggerNumberDataType(elem_type));
type_proto->set_data_type(debugger::DT_TENSOR);
if (shape != nullptr && shape->isa<abstract::Shape>()) {
abstract::ShapePtr shape_info = dyn_cast<abstract::Shape>(shape);
for (const auto &elem : shape_info->shape()) {
type_proto->mutable_tensor_type()->mutable_shape()->add_dim()->set_size(elem);
}
}
} else if (type->isa<Tuple>()) {
TuplePtr tuple_type = dyn_cast<Tuple>(type);
type_proto->set_data_type(debugger::DT_TUPLE);
for (const auto &elem_type : tuple_type->elements()) {
SetNodeOutputType(elem_type, nullptr, type_proto->mutable_sequence_type()->add_elem_types());
}
} else if (type->isa<TypeType>()) {
type_proto->set_data_type(debugger::DT_TYPE);
} else if (type->isa<List>()) {
ListPtr list_type = dyn_cast<List>(type);
type_proto->set_data_type(debugger::DT_LIST);
for (const auto &elem_type : list_type->elements()) {
SetNodeOutputType(elem_type, nullptr, type_proto->mutable_sequence_type()->add_elem_types());
}
} else if (type->isa<TypeAnything>()) {
type_proto->set_data_type(debugger::DT_ANYTHING);
} else if (type->isa<RefKeyType>()) {
type_proto->set_data_type(debugger::DT_REFKEY);
} else if (type->isa<RefType>()) {
type_proto->set_data_type(debugger::DT_REF);
} else if (type->isa<Function>()) {
type_proto->set_data_type(debugger::DT_GRAPH);
} else if (type->isa<TypeNone>()) {
type_proto->set_data_type(debugger::DT_NONE);
} else if (type->isa<String>()) {
type_proto->set_data_type(debugger::DT_STRING);
} else if (type->isa<UMonadType>()) {
type_proto->set_data_type(debugger::DT_UMONAD);
} else if (type->isa<IOMonadType>()) {
type_proto->set_data_type(debugger::DT_IOMONAD);
SetTensorTypeProto(type, shape, type_proto);
return;
}
if (type->isa<Tuple>()) {
SetTupleTypeProto(type, type_proto);
return;
}
if (type->isa<List>()) {
SetListTypeProto(type, type_proto);
}
}
@ -102,7 +114,7 @@ void DebuggerProtoExporter::SetNodeOutputType(const AnfNodePtr &node, debugger::
if (node == nullptr || type_proto == nullptr) {
return;
}
SetNodeOutputType(node->Type(), node->Shape(), type_proto);
SetOutputType(node->Type(), node->Shape(), type_proto);
}
void DebuggerProtoExporter::SetValueToProto(const ValuePtr &val, debugger::ValueProto *value_proto) {

1
mindspore/ccsrc/debug/debugger/proto_exporter.h
View File

@ -48,7 +48,6 @@ class DebuggerProtoExporter {
void SetSequenceToProto(const ValueSequeuePtr &val, debugger::ValueProto *value_proto);
void SetDictionaryToProto(const ValueDictionaryPtr &val, debugger::ValueProto *value_proto);
void SetNodeOutputType(const AnfNodePtr &node, debugger::TypeProto *type_proto);
void SetNodeOutputType(const TypePtr &node, const BaseShapePtr &shape, debugger::TypeProto *type_proto);
void ExportFuncGraph(const FuncGraphPtr &func_graph, debugger::GraphProto *graph_proto,
LocDebugDumpMode dump_location = kDebugOff);

22
mindspore/ccsrc/debug/draw.cc
View File

@ -386,10 +386,8 @@ static void DrawValueNode(Graphviz *const graph_obj, const ValueNodePtr &node) {
MS_EXCEPTION_IF_NULL(graph_obj);
graph_obj->buffer() << "label=<<table port='core' cellborder='0' cellspacing='2' bgcolor='" << graph_obj->Color(node)
<< "'>";
graph_obj->buffer() << "<tr><td bgcolor='white'>";
graph_obj->buffer() << ValueType(node);
graph_obj->buffer() << "</td></tr>";
graph_obj->buffer() << "<tr><td>";
graph_obj->buffer() << "<tr><td bgcolor='white'>" << ValueType(node) << "</td></tr>"
<< "<tr><td>";
if (IsValueNode<MetaFuncGraph>(node)) {
graph_obj->buffer() << node->value()->cast<MetaFuncGraphPtr>()->name();
} else if (IsValueNode<parse::NameSpace>(node)) {
@ -404,18 +402,16 @@ static void DrawValueNode(Graphviz *const graph_obj, const ValueNodePtr &node) {
ValuePtr value = node->value();
if (value->isa<Primitive>()) {
PrimitivePtr primitive = value->cast<PrimitivePtr>();
graph_obj->buffer() << "</td></tr>";
graph_obj->buffer() << "<tr><td align='left'>";
graph_obj->buffer() << "</td></tr>"
<< "<tr><td align='left'>";
if (!primitive->instance_name().empty()) {
graph_obj->buffer() << "instance name:"
<< " ";
graph_obj->buffer() << primitive->instance_name();
graph_obj->buffer() << "<br/>";
<< " " << primitive->instance_name() << "<br/>";
}
auto attrs = primitive->attrs();
if (attrs.size() > 0) {
graph_obj->buffer() << "</td></tr>";
graph_obj->buffer() << "<tr><td align='left'>";
graph_obj->buffer() << "</td></tr>"
<< "<tr><td align='left'>";
int i = 0;
for (const auto &attr : attrs) {
if (i != 0) {
@ -432,8 +428,8 @@ static void DrawValueNode(Graphviz *const graph_obj, const ValueNodePtr &node) {
}
}
}
graph_obj->buffer() << "</td></tr>";
graph_obj->buffer() << "</table>>,";
graph_obj->buffer() << "</td></tr>"
<< "</table>>,";
}
static void DrawParallelInfo(Graphviz *const graph_obj, const CNodePtr &node) {

6
mindspore/ccsrc/pipeline/jit/static_analysis/auto_monad.cc
View File

@ -32,7 +32,8 @@
#include "base/core_ops.h"
#include "abstract/abstract_value.h"
namespace mindspore::pipeline {
namespace mindspore {
namespace pipeline {
namespace { // namespace anonymous
using ClassTypePtr = std::shared_ptr<parse::ClassType>;
@ -1467,4 +1468,5 @@ bool ReAutoMonad(const FuncGraphPtr &func_graph) {
}
return changed;
}
} // namespace mindspore::pipeline
} // namespace pipeline
} // namespace mindspore