!3359 fix cpu nonop net

Merge pull request !3359 from kisnwang/r0.6-cpu-support-nonop-net
This commit is contained in:
mindspore-ci-bot 2020-07-23 16:01:37 +08:00 committed by Gitee
commit 5cdfbf0e82
2 changed files with 6 additions and 2 deletions

View File

@ -186,11 +186,15 @@ BaseRef CPUKernelRuntime::CreatTensorForOutput(const session::KernelWithIndex &k
return ret; return ret;
} }
return CreatTensorForOutput(node, index, bound_addresses, need_sync_outputs); return CreatTensorForOutput(node, index, bound_addresses, need_sync_outputs);
} else if (input_node->isa<Parameter>() || input_node->isa<ValueNode>()) { } else if (input_node->isa<Parameter>()) {
auto iter = input_map.find(input_node.get()); auto iter = input_map.find(input_node.get());
if (iter != input_map.end()) { if (iter != input_map.end()) {
return iter->second; return iter->second;
} }
} else if (input_node->isa<ValueNode>()) {
auto value_node = input_node->cast<ValueNodePtr>();
MS_EXCEPTION_IF_NULL(value_node);
return value_node->value();
} }
return BaseRef(); return BaseRef();
} }

View File

@ -21,7 +21,7 @@ namespace device {
namespace cpu { namespace cpu {
void CPUSimpleMemPlan::MemPlan(const session::KernelGraph *graph) { void CPUSimpleMemPlan::MemPlan(const session::KernelGraph *graph) {
MS_EXCEPTION_IF_NULL(graph); MS_EXCEPTION_IF_NULL(graph);
size_t total_mem_size = 0; size_t total_mem_size = 32;
auto kernels = graph->execution_order(); auto kernels = graph->execution_order();
for (const auto &kernel : kernels) { for (const auto &kernel : kernels) {
MS_EXCEPTION_IF_NULL(kernel); MS_EXCEPTION_IF_NULL(kernel);