Browse Source

fix compile

pull/1183/head
wangxiaotian22 4 years ago
parent
commit
368ed65491
4 changed files with 7 additions and 7 deletions
  1. +2
    -2
      ge/graph/load/model_manager/davinci_model.h
  2. +1
    -1
      ge/graph/manager/graph_manager.cc
  3. +3
    -3
      ge/graph/manager/graph_manager.h
  4. +1
    -1
      metadef

+ 2
- 2
ge/graph/load/model_manager/davinci_model.h View File

@@ -412,7 +412,7 @@ class DavinciModel {
///
uint64_t GetSessionId() const { return session_id_; }

struct ErrorManager::ErrorContext &GetErrorContext() const { return error_context_; }
struct ErrorMessage::Context &GetErrorContext() const { return error_context_; }

///
/// @ingroup ge
@@ -958,7 +958,7 @@ class DavinciModel {
vector<uintptr_t> output_mbuf_list_; // output mbuf created by dequeue task.

uint64_t session_id_;
struct ErrorManager::ErrorContext error_context_;
struct ErrorMessage::Context error_context_;

uint32_t device_id_;



+ 1
- 1
ge/graph/manager/graph_manager.cc View File

@@ -2511,7 +2511,7 @@ Status GraphManager::ProcessSubGraphWithMultiThreads(GraphManager *graph_manager
const SubGraphInfoPtr &sub_graph_info_ptr,
const std::string &root_graph_name,
uint64_t session_id,
const struct ErrorManager::ErrorContext &error_context,
const struct ErrorMessage::Context &error_context,
const GEThreadLocalContext &ge_context) {
if (sub_graph_info_ptr != nullptr && graph_manager != nullptr) {
ErrorManager::GetInstance().SetErrorContext(error_context);


+ 3
- 3
ge/graph/manager/graph_manager.h View File

@@ -196,7 +196,7 @@ class GraphManager {
GraphId graph_id;
std::vector<ge::InputTensorInfo> input_tensor;
uint64_t session_id;
struct ErrorManager::ErrorContext error_context;
struct ErrorMessage::Context error_context;
GEThreadLocalContext context;
RunAsyncCallback callback;
};
@@ -205,7 +205,7 @@ class GraphManager {
GraphNodePtr graph_node;
GraphId graph_id;
uint64_t session_id;
struct ErrorManager::ErrorContext error_context;
struct ErrorMessage::Context error_context;
std::vector<ge::InputTensorInfo> input_tensor;
GeRootModelPtr ge_root_model;
GEThreadLocalContext context;
@@ -223,7 +223,7 @@ class GraphManager {
const SubGraphInfoPtr &sub_graph_info_ptr,
const std::string &root_graph_name,
uint64_t session_id,
const struct ErrorManager::ErrorContext &error_context,
const struct ErrorMessage::Context &error_context,
const GEThreadLocalContext &ge_context);
Status ParseInputsDims(const std::vector<InputTensorInfo> &input_tensor);
void ParseInputsDimsForData(const std::vector<InputTensorInfo> &input_tensor);


+ 1
- 1
metadef

@@ -1 +1 @@
Subproject commit 9df9acb1d868309247e9abd04ef32810ec4d781c
Subproject commit e058adce607c16865dcb30a23978cf4987556349

Loading…
Cancel
Save