p47068915
/
mindspore
forked from mindspore-Ecosystem/mindspore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!1095 Fix while broaden error 

Merge pull request !1095 from amongo/FixWhileBroadenedError
This commit is contained in:
mindspore-ci-bot 2020-05-13 15:20:02 +08:00 committed by Gitee
parent 86d4797399 01be8f8794
commit 905467be9d
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mindspore/ccsrc/pipeline/parse/parse.cc
View File

@ -605,9 +605,11 @@ AnfNodePtr Parser::ParseAttribute(const FunctionBlockPtr &block, const py::objec
std::string var_name = "self.";
std::string attr_name = node.attr("attr").cast<std::string>();
(void)var_name.append(attr_name);
auto obj = ast()->obj().attr(attr_name.c_str());
auto attr_obj = ast()->obj().attr(attr_name.c_str());
if (py::hasattr(ast()->obj(), attr_name.c_str()) &&
(data_converter::IsCellInstance(obj) || py::hasattr(obj, PYTHON_PRIMITIVE_FLAG))) {
(py::hasattr(attr_obj, PYTHON_PRIMITIVE_FLAG) || py::isinstance<py::int_>(attr_obj) ||
py::isinstance<py::float_>(attr_obj) || py::isinstance<py::bool_>(attr_obj) ||
py::isinstance<py::str>(attr_obj) || data_converter::IsCellInstance(attr_obj))) {
return block->MakeResolveSymbol(var_name);
} else {
return block->ReadVariable(var_name);
@ -949,9 +951,6 @@ FunctionBlockPtr Parser::ParseWhile(const FunctionBlockPtr &block, const py::obj
MS_LOG(INFO) << "Parse while statement";
TraceManager::DebugTrace(std::make_shared<TraceWhileHeader>(block->func_graph()->debug_info()));
FunctionBlockPtr header_block = MakeFunctionBlock(*this);
if (MsContext::GetInstance()->is_multi_graph_sink()) {
header_block->func_graph()->set_flags(FUNC_GRAPH_FLAG_IGNORE_VALUES, true);
}
TraceManager::EndTrace();
TraceManager::DebugTrace(std::make_shared<TraceWhileBody>(block->func_graph()->debug_info()));