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

!36328 [GraphKernel] clean code. 

Merge pull request !36328 from chenlei_autodiff/clean_code2
This commit is contained in:
i-robot 2022-06-25 01:42:36 +00:00 committed by Gitee
parent 7613fc9a9d 872e26f119
commit 5697b2e163
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mindspore/ccsrc/common/graph_kernel/split_model/area.cc
View File

@ -82,7 +82,7 @@ std::vector<AreaWithRelation> Area::users_with_relation() const {
int64_t Area::compute_size() const { int64_t Area::compute_size() const {
auto op = dom(); auto op = dom();
MS_EXCEPTION_IF_NULL(op); MS_EXCEPTION_IF_NULL(op);
return op->tensor_size(); return SizeToLong(op->tensor_size());
} }
std::string Area::ToString() const { std::string Area::ToString() const {

8
mindspore/ccsrc/common/graph_kernel/tensor_inplace.cc
View File

@ -157,7 +157,7 @@ bool TensorInplace::Run(const FuncGraphPtr &func_graph) {
auto mng = func_graph->manager(); auto mng = func_graph->manager();
MS_EXCEPTION_IF_NULL(mng); MS_EXCEPTION_IF_NULL(mng);
auto todos = TopoSort(func_graph->get_return()); auto todos = TopoSort(func_graph->get_return());
bool changed = false; bool tensor_inplace_changed = false;
for (auto &node : todos) { for (auto &node : todos) {
if (common::AnfAlgo::IsGraphKernel(node)) { if (common::AnfAlgo::IsGraphKernel(node)) {
auto sub_func_graph = common::AnfAlgo::GetCNodeFuncGraphPtr(node); auto sub_func_graph = common::AnfAlgo::GetCNodeFuncGraphPtr(node);
@ -176,7 +176,7 @@ bool TensorInplace::Run(const FuncGraphPtr &func_graph) {
return CheckShapeType(cnode->input(i), node.first); return CheckShapeType(cnode->input(i), node.first);
}); });
if (candidate != outs.end()) { if (candidate != outs.end()) {
changed = true; tensor_inplace_changed = true;
InplaceAssignerInfo new_op_info; // output info InplaceAssignerInfo new_op_info; // output info
new_op_info.op_node = candidate->first->cast<CNodePtr>(); new_op_info.op_node = candidate->first->cast<CNodePtr>();
new_op_info.real_output_num = common::AnfAlgo::GetOutputTensorNum(cnode); new_op_info.real_output_num = common::AnfAlgo::GetOutputTensorNum(cnode);
@ -192,10 +192,10 @@ bool TensorInplace::Run(const FuncGraphPtr &func_graph) {
} }
} }
} }
if (changed) { if (tensor_inplace_changed) {
mng->RemoveRoots(); mng->RemoveRoots();
mng->KeepRoots({func_graph}); mng->KeepRoots({func_graph});
} }
return changed; return tensor_inplace_changed;
} }
} // namespace mindspore::graphkernel } // namespace mindspore::graphkernel

18
mindspore/lite/tools/graph_kernel/converter/graph_kernel_pass_manager_lite.cc
View File

@ -202,7 +202,7 @@ void DumpOperateAttrs(const AnfNodePtr &op, const std::shared_ptr<SubGraphIRInfo
} }
if (IsValueNode<Primitive>(op)) { if (IsValueNode<Primitive>(op)) {
PrimitivePtr primitive = GetValueNode<PrimitivePtr>(op); auto primitive = GetValueNode<PrimitivePtr>(op);
if (!primitive->instance_name().empty()) { if (!primitive->instance_name().empty()) {
gsub->dumpbuf << " {"; gsub->dumpbuf << " {";
gsub->dumpbuf << "instance name" gsub->dumpbuf << "instance name"
@ -223,11 +223,11 @@ void DumpCNodeAttrs(const CNodePtr &op, const std::shared_ptr<SubGraphIRInfo> &g
if (op == nullptr || gsub == nullptr) { if (op == nullptr || gsub == nullptr) {
return; return;
} }
if (op->attrs().empty()) { auto &attrs = op->attrs();
if (attrs.empty()) {
return; return;
} }
auto attrs = op->attrs();
gsub->dumpbuf << " cnode_attrs: {"; gsub->dumpbuf << " cnode_attrs: {";
DumpAttrs(attrs, gsub); DumpAttrs(attrs, gsub);
gsub->dumpbuf << "}"; gsub->dumpbuf << "}";
@ -336,11 +336,11 @@ void DumpIRInSubgraph(const std::vector<AnfNodePtr> &nodes, OrderedMap<AnfNodePt
gsub->local_var = 0; gsub->local_var = 0;
(*sub_graphs)[sub_graph] = gsub; (*sub_graphs)[sub_graph] = gsub;
} }
std::vector<AnfNodePtr> parameters = sub_graph->parameters(); auto &param = sub_graph->parameters();
for (size_t idx = 0; idx < parameters.size(); idx++) { for (size_t idx = 0; idx < param.size(); idx++) {
MS_EXCEPTION_IF_NULL(parameters[idx]); MS_EXCEPTION_IF_NULL(param[idx]);
if ((*para_map).count(parameters[idx]) == 0) { if ((*para_map).count(param[idx]) == 0) {
(*para_map)[parameters[idx]] = total_para++; (*para_map)[param[idx]] = total_para++;
} }
} }
if (!nd->isa<Parameter>()) { if (!nd->isa<Parameter>()) {
@ -419,7 +419,7 @@ std::optional<std::string> CreatePrefixPath(const std::string &input_path) {
} else { } else {
auto pwd_path = FileUtils::GetRealPath("./"); auto pwd_path = FileUtils::GetRealPath("./");
if (!pwd_path.has_value()) { if (!pwd_path.has_value()) {
MS_LOG(ERROR) << "Cannot get pwd path"; MS_LOG(ERROR) << "Can not get pwd path";
return std::nullopt; return std::nullopt;
} }
prefix_path_str = pwd_path.value(); prefix_path_str = pwd_path.value();

3
scripts/build/parse_device.sh
View File

@ -74,6 +74,7 @@ parse_device()
if [[ "X$ENABLE_AKG" == "Xon" && "X$ENABLE_D" != "Xon" ]]; then if [[ "X$ENABLE_AKG" == "Xon" && "X$ENABLE_D" != "Xon" ]]; then
# check llvm version for akg # check llvm version for akg
export USE_LLVM=`bash ${BASEPATH}/scripts/build/akg_find_llvm.sh` HAS_LLVM=`bash ${BASEPATH}/scripts/build/akg_find_llvm.sh`
export USE_LLVM=$HAS_LLVM
fi fi
} }