Browse Source

!1949 fix coverity

Merge pull request !1949 from wangjiming/local
tags/v1.5.1
i-robot Gitee 3 years ago
parent
commit
1d7c7f96df
6 changed files with 9 additions and 9 deletions
  1. +1
    -0
      ge/ge_opt_info/ge_opt_info.h
  2. +1
    -1
      ge/graph/load/model_manager/task_info/memcpy_async_task_info.h
  3. +2
    -2
      ge/graph/preprocess/graph_preprocess.cc
  4. +1
    -0
      ge/hybrid/executor/hybrid_model_pipeline_executor.cc
  5. +3
    -5
      ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc
  6. +1
    -1
      ge/hybrid/node_executor/hccl/hccl_node_executor.h

+ 1
- 0
ge/ge_opt_info/ge_opt_info.h View File

@@ -24,6 +24,7 @@ namespace ge {
class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY GeOptInfo { class FMK_FUNC_HOST_VISIBILITY FMK_FUNC_DEV_VISIBILITY GeOptInfo {
public: public:
GeOptInfo() = default; GeOptInfo() = default;
~GeOptInfo() = default;
static Status SetOptInfo(); static Status SetOptInfo();
}; };
} // namespace ge } // namespace ge


+ 1
- 1
ge/graph/load/model_manager/task_info/memcpy_async_task_info.h View File

@@ -47,7 +47,7 @@ class MemcpyAsyncTaskInfo : public TaskInfo {
uint64_t count_; uint64_t count_;
uint32_t kind_; uint32_t kind_;
vector<void *> io_addrs_; vector<void *> io_addrs_;
int64_t fixed_addr_offset_;
int64_t fixed_addr_offset_ = 0;
DavinciModel *davinci_model_ = nullptr; DavinciModel *davinci_model_ = nullptr;
uint32_t args_offset_ = 0; uint32_t args_offset_ = 0;
}; };


+ 2
- 2
ge/graph/preprocess/graph_preprocess.cc View File

@@ -1756,8 +1756,8 @@ Status GraphPrepare::CtrlFlowPreProcess() {
PassManager graph_pass; PassManager graph_pass;


// After InferShape Mark v1 control flow for unknown shape. // After InferShape Mark v1 control flow for unknown shape.
auto mark_force_unknown_pass = new (std::nothrow) MarkForceUnknownForCondPass;
GE_CHK_STATUS_RET(graph_pass.AddPass("PreRun::MarkForceUnknownForCondPass", mark_force_unknown_pass));
GE_CHK_STATUS_RET(graph_pass.AddPass("PreRun::MarkForceUnknownForCondPass",
new (std::nothrow) MarkForceUnknownForCondPass));


GE_CHK_STATUS_RET(graph_pass.Run(compute_graph_)); GE_CHK_STATUS_RET(graph_pass.Run(compute_graph_));
return SUCCESS; return SUCCESS;


+ 1
- 0
ge/hybrid/executor/hybrid_model_pipeline_executor.cc View File

@@ -188,6 +188,7 @@ HybridModelPipelineExecutor::HybridModelPipelineExecutor(HybridModel *model, uin
config_.num_executors = kNumExecutors; config_.num_executors = kNumExecutors;
config_.num_stages = model_->GetRootGraphItem()->NumGroups(); config_.num_stages = model_->GetRootGraphItem()->NumGroups();
config_.device_id = device_id_; config_.device_id = device_id_;
config_.iteration_end = 0;
} }


Status StageExecutor::InitExecutionContext() { Status StageExecutor::InitExecutionContext() {


+ 3
- 5
ge/hybrid/node_executor/compiledsubgraph/known_node_executor.cc View File

@@ -136,8 +136,7 @@ Status KnownNodeTask::Init(TaskContext &context) {
Status KnownNodeTask::InitDavinciModel(const HybridModel &model, TensorBuffer *weight_buffer) { Status KnownNodeTask::InitDavinciModel(const HybridModel &model, TensorBuffer *weight_buffer) {
GELOGD("[Init][DavinciModel] start"); GELOGD("[Init][DavinciModel] start");
davinci_model_->InitRuntimeParams(); davinci_model_->InitRuntimeParams();
GE_CHK_STATUS_RET(davinci_model_->InitVariableMem(),
"[Init][VariableMem] failed");
GE_CHK_STATUS_RET(davinci_model_->InitVariableMem(), "[Init][VariableMem] failed");
int32_t device_id = 0; int32_t device_id = 0;
GE_CHK_RT_RET(rtGetDevice(&device_id)); GE_CHK_RT_RET(rtGetDevice(&device_id));
davinci_model_->SetDeviceId(static_cast<uint32_t>(device_id)); davinci_model_->SetDeviceId(static_cast<uint32_t>(device_id));
@@ -181,7 +180,7 @@ Status KnownNodeExecutor::PrepareTask(NodeTask &task, TaskContext &context) cons
} }


Status KnownNodeExecutor::SetDaviciModel(const HybridModel &model, const NodePtr &node, Status KnownNodeExecutor::SetDaviciModel(const HybridModel &model, const NodePtr &node,
std::shared_ptr<DavinciModel> &davinci_model) const {
std::shared_ptr<DavinciModel> &davinci_model) const {
// set known node flag as true // set known node flag as true
davinci_model->SetKnownNode(true); davinci_model->SetKnownNode(true);
davinci_model->SetId(model.GetModelId()); davinci_model->SetId(model.GetModelId());
@@ -248,8 +247,7 @@ Status KnownNodeExecutor::ParseAttrForAllocatingOutputs(NodeItem &node_item, Com
GE_CHECK_NOTNULL(net_output_desc); GE_CHECK_NOTNULL(net_output_desc);
std::map<std::string, int> connected_inputs; std::map<std::string, int> connected_inputs;
std::map<NodePtr, int> data_indices; std::map<NodePtr, int> data_indices;
GE_CHK_STATUS_RET(GetDataNodes(graph, data_indices),
"[%s] Failed to get data node indices",
GE_CHK_STATUS_RET(GetDataNodes(graph, data_indices), "[%s] Failed to get data node indices",
node_item.NodeName().c_str()); node_item.NodeName().c_str());
for (const auto &in_data_anchor : net_output_node->GetAllInDataAnchors()) { for (const auto &in_data_anchor : net_output_node->GetAllInDataAnchors()) {
auto out_data_anchor = in_data_anchor->GetPeerOutAnchor(); auto out_data_anchor = in_data_anchor->GetPeerOutAnchor();


+ 1
- 1
ge/hybrid/node_executor/hccl/hccl_node_executor.h View File

@@ -62,7 +62,7 @@ class RdmaNodeTask : public NodeTask {
int32_t local_index_ = 0; int32_t local_index_ = 0;
std::mutex hccl_mutex_; std::mutex hccl_mutex_;
std::condition_variable cond_; std::condition_variable cond_;
bool skip_flag_;
bool skip_flag_ = false;
}; };






Loading…
Cancel
Save