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

!14799 【unify runtime】remove HideNopNode after SetKernelInfo and code refine 

From: @zyli2020
Reviewed-by: @cristoval,@wilfchen,@limingqi107
Signed-off-by: @wilfchen,@limingqi107
This commit is contained in:
mindspore-ci-bot 2021-04-09 16:40:38 +08:00 committed by Gitee
parent 1ddd0a3db6 25541f803e
commit d1c6c15a42
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mindspore/ccsrc/runtime/hardware/gpu/gpu_device_context.cc
View File

@ -179,14 +179,6 @@ void GPUDeviceContext::OptimizeGraphWithoutDeviceInfo(const KernelGraphPtr &grap
// Update Graph Dynamic Shape Attr. // Update Graph Dynamic Shape Attr.
UpdateGraphDynamicShapeAttr(NOT_NULL(graph)); UpdateGraphDynamicShapeAttr(NOT_NULL(graph));
auto context_ptr = MsContext::GetInstance();
MS_EXCEPTION_IF_NULL(context_ptr);
const bool pynative_mode = context_ptr->get_param<int>(MS_CTX_EXECUTION_MODE) == kPynativeMode;
// Hide NopOp from execution graph in graph mode
if (!pynative_mode) {
opt::HideNopNode(graph.get());
}
} }
void GPUDeviceContext::OptimizeGraphWithDeviceInfo(const KernelGraphPtr &graph) const { void GPUDeviceContext::OptimizeGraphWithDeviceInfo(const KernelGraphPtr &graph) const {
@ -211,6 +203,9 @@ void GPUDeviceContext::OptimizeGraphWithDeviceInfo(const KernelGraphPtr &graph)
optimizer->AddPassManager(pm); optimizer->AddPassManager(pm);
(void)optimizer->Optimize(graph); (void)optimizer->Optimize(graph);
graph->SetExecOrderByDefault(); graph->SetExecOrderByDefault();
// Hide NopOp from execution order.
opt::HideNopNode(graph.get());
} }
void GPUDeviceContext::FuseOperators(const KernelGraphPtr &graph) const { void GPUDeviceContext::FuseOperators(const KernelGraphPtr &graph) const {
@ -235,11 +230,10 @@ void GPUDeviceContext::FuseOperators(const KernelGraphPtr &graph) const {
graph->SetExecOrderByDefault(); graph->SetExecOrderByDefault();
// Graph kernel fusion optimization // Graph kernel fusion optimization
if (!context::GraphKernelFlags::GetInstance().IsEnableGraphKernel()) { if (context::GraphKernelFlags::GetInstance().IsEnableGraphKernel()) {
return; opt::GraphKernelOptimize(graph);
graph->SetExecOrderByDefault();
} }
opt::GraphKernelOptimize(graph);
graph->SetExecOrderByDefault();
} }
void GPUDeviceContext::UpdateGraphDynamicShapeAttr(const NotNull<KernelGraphPtr> &graph) const { void GPUDeviceContext::UpdateGraphDynamicShapeAttr(const NotNull<KernelGraphPtr> &graph) const {