From a1fce7c8fa2709e245670ce249d40e02edb48c8a Mon Sep 17 00:00:00 2001 From: zhaoxinxin Date: Tue, 16 Mar 2021 14:27:50 +0800 Subject: [PATCH 1/4] modified: ge/hybrid/executor/hybrid_model_async_executor.cc modified: ge/hybrid/executor/subgraph_executor.cc modified: ge/hybrid/node_executor/aicore/aicore_op_task.cc --- ge/hybrid/executor/hybrid_model_async_executor.cc | 2 ++ ge/hybrid/executor/subgraph_executor.cc | 4 ++-- ge/hybrid/node_executor/aicore/aicore_op_task.cc | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ge/hybrid/executor/hybrid_model_async_executor.cc b/ge/hybrid/executor/hybrid_model_async_executor.cc index 9f37e7d5..0194a492 100644 --- a/ge/hybrid/executor/hybrid_model_async_executor.cc +++ b/ge/hybrid/executor/hybrid_model_async_executor.cc @@ -67,6 +67,7 @@ Status HybridModelAsyncExecutor::Start(const std::shared_ptr &lis future_ = std::async(std::launch::async, [&]() -> Status { GetThreadLocalContext() = *executor_->GetContext()->ge_context; GetContext().SetSessionId(executor_->GetContext()->session_id); + GetContext().SetContextId(executor_->GetContext()->context_id); return RunInternal(); }); @@ -166,6 +167,7 @@ Status HybridModelAsyncExecutor::RunInternal() { } else { GELOGI("HybridModel will execute in singleline mode"); ge::GetContext().SetSessionId(executor_->GetContext()->session_id); + ge::GetContext().SetContextId(executor_->GetContext()->context_id); ret = executor_->Execute(args); } ret = HandleResult(ret, current_data.index, args, data_wrapper->GetOutput()); diff --git a/ge/hybrid/executor/subgraph_executor.cc b/ge/hybrid/executor/subgraph_executor.cc index 45db9936..57e4052d 100644 --- a/ge/hybrid/executor/subgraph_executor.cc +++ b/ge/hybrid/executor/subgraph_executor.cc @@ -227,6 +227,7 @@ Status SubgraphExecutor::PrepareNodes(int group) { if (node_item.is_dynamic) { auto prepare_future = pre_run_pool_.commit([this, p_node_state]() -> Status { GetContext().SetSessionId(context_->session_id); + GetContext().SetContextId(context_->context_id); GE_CHK_STATUS_RET_NOLOG(InferShape(shape_inference_engine_.get(), *p_node_state)); return PrepareForExecution(context_, *p_node_state); }); @@ -273,10 +274,8 @@ Status SubgraphExecutor::PrepareNodes(int group) { } Status SubgraphExecutor::InferShape(ShapeInferenceEngine *shape_inference_engine, NodeState &node_state) const { - GetContext().SetSessionId(context_->context_id); HYBRID_CHK_STATUS_RET(shape_inference_engine->InferShape(node_state), "[%s] Failed to InferShape.", node_state.GetName().c_str()); - GetContext().SetSessionId(context_->session_id); HYBRID_CHK_STATUS_RET(shape_inference_engine->PropagateOutputShapes(node_state), "[%s] Failed to PropagateOutputShapes.", node_state.GetName().c_str()); return SUCCESS; @@ -345,6 +344,7 @@ Status SubgraphExecutor::ScheduleTasks(int group) { GELOGD("[%s] Start to schedule prepare workers.", graph_item_->GetName().c_str()); auto prepare_future = std::async(std::launch::async, [&]() -> Status { GetContext().SetSessionId(context_->session_id); + GetContext().SetContextId(context_->context_id); auto ret = PrepareNodes(group); ready_queue_.Push(nullptr); return ret; diff --git a/ge/hybrid/node_executor/aicore/aicore_op_task.cc b/ge/hybrid/node_executor/aicore/aicore_op_task.cc index 07c2ddb5..6af2fd4a 100644 --- a/ge/hybrid/node_executor/aicore/aicore_op_task.cc +++ b/ge/hybrid/node_executor/aicore/aicore_op_task.cc @@ -307,11 +307,9 @@ Status AiCoreOpTask::UpdateTilingInfo(TaskContext &context) { auto execution_context = context.GetExecutionContext(); - GetContext().SetSessionId(execution_context->context_id); RECORD_EXECUTION_EVENT(execution_context, context.GetNodeName(), "[CalcTilingInfo] Start"); GE_CHK_STATUS_RET(CalcTilingInfo(node, tiling_info)); RECORD_EXECUTION_EVENT(execution_context, context.GetNodeName(), "[CalcTilingInfo] End"); - GetContext().SetSessionId(execution_context->session_id); // update op args by tiling info block_dim_ = static_cast(tiling_info.block_dim); From 238b90a99188c538443b673a79726462b390bcf9 Mon Sep 17 00:00:00 2001 From: zhaoxinxin Date: Tue, 16 Mar 2021 16:17:26 +0800 Subject: [PATCH 2/4] modified: metadef --- metadef | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadef b/metadef index eef990b3..3a4c3b74 160000 --- a/metadef +++ b/metadef @@ -1 +1 @@ -Subproject commit eef990b3d8669065a969dfa6b1097eac09d601d4 +Subproject commit 3a4c3b746cffcb2e1e5cc1c8a7559a07da3dd84e From 67282b45307f503173ce95a4cd47a40bc7198bec Mon Sep 17 00:00:00 2001 From: zhaoxinxin Date: Tue, 16 Mar 2021 20:26:48 +0800 Subject: [PATCH 3/4] modified: tests/ut/common/graph/CMakeLists.txt modified: tests/ut/ge/CMakeLists.txt --- tests/ut/common/graph/CMakeLists.txt | 3 ++- tests/ut/ge/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/ut/common/graph/CMakeLists.txt b/tests/ut/common/graph/CMakeLists.txt index 44a2a97c..4aac5995 100644 --- a/tests/ut/common/graph/CMakeLists.txt +++ b/tests/ut/common/graph/CMakeLists.txt @@ -96,11 +96,12 @@ set(SRC_FILES "${GE_CODE_DIR}/metadef/graph/utils/tensor_utils.cc" "${GE_CODE_DIR}/metadef/ops/op_imp.cpp" "${GE_CODE_DIR}/metadef/graph/opsproto/opsproto_manager.cc" - "${GE_CODE_DIR}/metadef/graph/utils/transformer_utils.cc" "${GE_CODE_DIR}/metadef/graph/runtime_inference_context.cc" "${GE_CODE_DIR}/metadef/graph/ref_relation.cc" "${GE_CODE_DIR}/metadef/third_party/transformer/src/transfer_shape_according_to_format.cc" "${GE_CODE_DIR}/metadef/third_party/transformer/src/axis_util.cc" + "${GE_CODE_DIR}/metadef/third_party/transformer/src/expand_dimension.cc" + "${GE_CODE_DIR}/metadef/graph/utils/transformer_utils.cc" ) #add_executable(ut_libgraph ${UT_FILES} ${SRC_FILES} ${PROTO_SRCS} ${PROTO_HDRS}) diff --git a/tests/ut/ge/CMakeLists.txt b/tests/ut/ge/CMakeLists.txt index 80636a20..aeedfedc 100755 --- a/tests/ut/ge/CMakeLists.txt +++ b/tests/ut/ge/CMakeLists.txt @@ -90,6 +90,7 @@ set(GRAPH_SRC_FILES "${GE_CODE_DIR}/metadef/graph/op_desc.cc" "${GE_CODE_DIR}/metadef/third_party/transformer/src/transfer_shape_according_to_format.cc" "${GE_CODE_DIR}/metadef/third_party/transformer/src/axis_util.cc" + "${GE_CODE_DIR}/metadef/third_party/transformer/src/expand_dimension.cc" "${GE_CODE_DIR}/metadef/graph/operator.cc" "${GE_CODE_DIR}/metadef/graph/operator_factory.cc" "${GE_CODE_DIR}/metadef/graph/operator_factory_impl.cc" From 723dcaf33f0753bc4750ced1f63a769b3302827e Mon Sep 17 00:00:00 2001 From: zhaoxinxin Date: Wed, 17 Mar 2021 17:36:19 +0800 Subject: [PATCH 4/4] modified: ge/host_kernels/gather_v2_kernel.cc --- ge/host_kernels/gather_v2_kernel.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ge/host_kernels/gather_v2_kernel.cc b/ge/host_kernels/gather_v2_kernel.cc index 326bfbd1..5702954c 100644 --- a/ge/host_kernels/gather_v2_kernel.cc +++ b/ge/host_kernels/gather_v2_kernel.cc @@ -373,7 +373,7 @@ void GatherV2Kernel::DebugPrint(int64_t axis, const GeShape &x_shape, const GeSh Status GatherV2Kernel::Compute(const OpDescPtr op_desc_ptr, const vector &input, vector &v_output) { - GELOGI("Enter GatherV2Kernel Process"); + GELOGI("Enter GatherV2Kernel Process."); Status ret = Check(op_desc_ptr, input, v_output); if (ret != SUCCESS) { GELOGW("param check failed"); @@ -407,7 +407,8 @@ Status GatherV2Kernel::Compute(const OpDescPtr op_desc_ptr, const vectorGetTensorDesc().GetDataType(); if (supported_type.find(x_data_type) == supported_type.end()) { - GELOGI("GatherV2Kernel does not support this Data type:%s.", TypeUtils::DataTypeToSerialString(x_data_type).c_str()); + GELOGI("GatherV2Kernel does not support this Data type:%s.", + TypeUtils::DataTypeToSerialString(x_data_type).c_str()); return NOT_CHANGED; } // calc output shape