Browse Source

save and get err msg

pull/289/head
baker 4 years ago
parent
commit
7ecb4ea794
2 changed files with 9 additions and 4 deletions
  1. +7
    -3
      ge/graph/manager/graph_manager.cc
  2. +2
    -1
      ge/graph/manager/graph_manager.h

+ 7
- 3
ge/graph/manager/graph_manager.cc View File

@@ -29,6 +29,7 @@
#include "common/math/math_util.h"
#include "common/thread_pool.h"
#include "common/util.h"
#include "common/util/error_manager/error_manager.h"
#include "external/graph/types.h"
#include "framework/common/debug/ge_log.h"
#include "framework/common/ge_inner_error_codes.h"
@@ -411,7 +412,8 @@ Status GraphManager::OptimizeSubGraphWithMultiThreads(ComputeGraphPtr compute_gr
(void) AttrUtils::SetStr(subgraph->GetSubGraph(), ATTR_NAME_OP_COMPILE_STRATEGY, op_compile_strategy);
}
std::future<Status> f = executor.commit(GraphManager::ProcessSubGraphWithMultiThreads, this,
compute_graph->GetGraphID(), subgraph, session_id, GetThreadLocalContext());
compute_graph->GetGraphID(), subgraph, session_id,
GetThreadLocalContext(), GetInnerErrMsg());
if (!f.valid()) {
GELOGE(FAILED, "Future is invalid");
return FAILED;
@@ -427,7 +429,7 @@ Status GraphManager::OptimizeSubGraphWithMultiThreads(ComputeGraphPtr compute_gr
}
std::future<Status> f = executor.commit(GraphManager::ProcessSubGraphWithMultiThreads, this,
compute_graph->GetGraphID(), subgraph, session_id,
GetThreadLocalContext());
GetThreadLocalContext(), GetInnerErrMsg());
if (!f.valid()) {
GELOGE(FAILED, "Future is invalid");
return FAILED;
@@ -2344,10 +2346,12 @@ Status GraphManager::CheckAndReleaseMemory(const GeModelPtr &ge_model, const Gra

Status GraphManager::ProcessSubGraphWithMultiThreads(GraphManager *graph_manager, GraphId root_graph_id,
const SubGraphInfoPtr &sub_graph_info_ptr, uint64_t session_id,
const GEThreadLocalContext &ge_context) {
const GEThreadLocalContext &ge_context,
const std::map<std::string, std::vector<std::string>> &err_ma=sg_map) {
if (sub_graph_info_ptr != nullptr && graph_manager != nullptr) {
GetContext().SetSessionId(session_id);
GetThreadLocalContext() = ge_context;
GetInnerErrMsgMap() = err_msg_map;
graph_manager->UpdateLocalOmgContext(root_graph_id);

ComputeGraphPtr compute_graph_tmp = sub_graph_info_ptr->GetSubGraph();


+ 2
- 1
ge/graph/manager/graph_manager.h View File

@@ -204,7 +204,8 @@ class GraphManager {

static Status ProcessSubGraphWithMultiThreads(GraphManager *graph_manager, GraphId root_graph_id,
const SubGraphInfoPtr &sub_graph_info_ptr, uint64_t session_id,
const GEThreadLocalContext &ge_context);
const GEThreadLocalContext &ge_context,
const std::map<std::string, std::vector<std::string>> &err_msg_map);
Status PreRun(const GraphNodePtr &graph_node, const std::vector<GeTensor> &inputs, GeRootModelPtr &ge_root_model,
uint64_t session_id = INVALID_SESSION_ID);



Loading…
Cancel
Save