From efe4f8a8fba8df351925073c8f3b9f5ee47fac6b Mon Sep 17 00:00:00 2001 From: caifubi Date: Wed, 6 Jan 2021 15:14:09 +0800 Subject: [PATCH] Fix bug of RunOp context checker in GRAPH_MODE --- mindspore/ccsrc/pipeline/pynative/pynative_execute.cc | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc index 912300337e..302072cfed 100644 --- a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc @@ -525,10 +525,13 @@ PynativeExecutor::~PynativeExecutor() { } void CheckPyNativeContext() { - auto context = parallel::ParallelContext::GetInstance(); - MS_EXCEPTION_IF_NULL(context); - auto parallel_mode = context->parallel_mode(); - if (parallel_mode != parallel::STAND_ALONE && parallel_mode != parallel::DATA_PARALLEL) { + auto parallel_context = parallel::ParallelContext::GetInstance(); + MS_EXCEPTION_IF_NULL(parallel_context); + auto ms_context = MsContext::GetInstance(); + MS_EXCEPTION_IF_NULL(ms_context); + auto parallel_mode = parallel_context->parallel_mode(); + if (parallel_mode != parallel::STAND_ALONE && parallel_mode != parallel::DATA_PARALLEL && + ms_context->get_param(MS_CTX_EXECUTION_MODE) == kPynativeMode) { MS_LOG(EXCEPTION) << "PyNative Only support STAND_ALONE and DATA_PARALLEL, but got:" << parallel_mode; } }