From 56d751b5d2b7ca711b24b61af9918a6ed8cb6315 Mon Sep 17 00:00:00 2001 From: wilfChen Date: Sat, 23 May 2020 15:57:55 +0800 Subject: [PATCH] Cancel NoOp optimizer in GPU until memory reuse ready --- mindspore/ccsrc/pre_activate/common/helper.cc | 2 +- mindspore/ccsrc/session/gpu_session.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mindspore/ccsrc/pre_activate/common/helper.cc b/mindspore/ccsrc/pre_activate/common/helper.cc index e993e22929..5cc3374ea5 100644 --- a/mindspore/ccsrc/pre_activate/common/helper.cc +++ b/mindspore/ccsrc/pre_activate/common/helper.cc @@ -328,7 +328,7 @@ tensor::TensorPtr CreateTupleTensor(const ValueTuplePtr &value_tuple) { bool IsNopNode(const AnfNodePtr &node) { auto context_ptr = MsContext::GetInstance(); MS_EXCEPTION_IF_NULL(context_ptr); - if (context_ptr->device_target() != kAscendDevice && context_ptr->device_target() != kGPUDevice) { + if (context_ptr->device_target() != kAscendDevice) { return false; } static std::unordered_set nop_nodes = {prim::kPrimReshape->name(), kExpandDimsOpName, diff --git a/mindspore/ccsrc/session/gpu_session.cc b/mindspore/ccsrc/session/gpu_session.cc index 3de7588652..b0c5da4eb4 100644 --- a/mindspore/ccsrc/session/gpu_session.cc +++ b/mindspore/ccsrc/session/gpu_session.cc @@ -70,7 +70,7 @@ void GPUSession::AllocateMemory(KernelGraph *kernel_graph) const { MS_EXCEPTION_IF_NULL(kernel_graph); auto runtime_instance = device::KernelRuntimeManager::Instance().GetSingleKernelRuntime(kGPUDevice, device_id_); MS_EXCEPTION_IF_NULL(runtime_instance); - opt::RemoveNopNode(kernel_graph); + // opt::RemoveNopNode(kernel_graph); runtime_instance->AssignMemory(kernel_graph); } @@ -79,7 +79,7 @@ void GPUSession::RunOpAllocateMemory(const std::vector &input MS_EXCEPTION_IF_NULL(kernel_graph); auto runtime_instance = device::KernelRuntimeManager::Instance().GetSingleKernelRuntime(kGPUDevice, device_id_); MS_EXCEPTION_IF_NULL(runtime_instance); - opt::RemoveNopNode(kernel_graph); + // opt::RemoveNopNode(kernel_graph); runtime_instance->RunOpAssignMemory(input_tensors, kernel_graph); } @@ -106,7 +106,7 @@ GraphId GPUSession::CompileGraph(const AnfNodePtrList &lst, const AnfNodePtrList // Assign CUDA streams AssignStream(graph); // Remove NoOp from execution graph - opt::HideNopNode(graph.get()); + // opt::HideNopNode(graph.get()); // Build kernel if node is cnode BuildKernel(graph); // Set graph execution order before memory alloc, ensure that memory alloc is according to the reorder graph