@@ -17,6 +17,7 @@ | |||||
#include "subgraph_context.h" | #include "subgraph_context.h" | ||||
#include "common/debug/log.h" | #include "common/debug/log.h" | ||||
#include "hybrid/executor/hybrid_model_executor.h" | |||||
namespace ge { | namespace ge { | ||||
namespace hybrid { | namespace hybrid { | ||||
@@ -20,7 +20,7 @@ | |||||
#include <vector> | #include <vector> | ||||
#include "hybrid/common/tensor_value.h" | #include "hybrid/common/tensor_value.h" | ||||
#include "hybrid/executor/hybrid_model_executor.h" | |||||
#include "hybrid/executor/hybrid_execution_context.h" | |||||
#include "hybrid/executor/node_state.h" | #include "hybrid/executor/node_state.h" | ||||
#include "hybrid/executor/node_done_manager.h" | #include "hybrid/executor/node_done_manager.h" | ||||
#include "hybrid/model/graph_item.h" | #include "hybrid/model/graph_item.h" | ||||
@@ -49,8 +49,8 @@ class SubgraphContext { | |||||
private: | private: | ||||
friend class TaskContext; | friend class TaskContext; | ||||
const GraphExecutionContext *execution_context_; | |||||
const GraphItem *graph_item_; | const GraphItem *graph_item_; | ||||
const GraphExecutionContext *execution_context_; | |||||
std::mutex mu_; | std::mutex mu_; | ||||
std::vector<TensorValue> all_inputs_; | std::vector<TensorValue> all_inputs_; | ||||
std::vector<TensorValue> all_outputs_; | std::vector<TensorValue> all_outputs_; | ||||
@@ -40,7 +40,7 @@ SubgraphExecutor::~SubgraphExecutor() { | |||||
Status SubgraphExecutor::Init(const std::vector<TensorValue> &inputs, | Status SubgraphExecutor::Init(const std::vector<TensorValue> &inputs, | ||||
const std::vector<ConstGeTensorDescPtr> &input_desc) { | const std::vector<ConstGeTensorDescPtr> &input_desc) { | ||||
subgraph_context_.reset(new(std::nothrow)SubgraphContext(graph_item_)); | |||||
subgraph_context_.reset(new(std::nothrow)SubgraphContext(graph_item_, context_)); | |||||
GE_CHECK_NOTNULL(subgraph_context_); | GE_CHECK_NOTNULL(subgraph_context_); | ||||
GE_CHK_STATUS_RET(subgraph_context_->Init(), "[%s] Failed to init subgraph context.", graph_item_->GetName().c_str()); | GE_CHK_STATUS_RET(subgraph_context_->Init(), "[%s] Failed to init subgraph context.", graph_item_->GetName().c_str()); | ||||