Browse Source

fix

tags/v1.5.1
wjm 3 years ago
parent
commit
bdbfe5eea4
5 changed files with 6 additions and 4 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. +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 {
public:
GeOptInfo() = default;
~GeOptInfo() = default;
static Status SetOptInfo();
};
} // 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_;
uint32_t kind_;
vector<void *> io_addrs_;
int64_t fixed_addr_offset_;
int64_t fixed_addr_offset_ = 0;
DavinciModel *davinci_model_ = nullptr;
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;

// 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_));
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_stages = model_->GetRootGraphItem()->NumGroups();
config_.device_id = device_id_;
config_.iteration_end = 0;
}

Status StageExecutor::InitExecutionContext() {


+ 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;
std::mutex hccl_mutex_;
std::condition_variable cond_;
bool skip_flag_;
bool skip_flag_ = false;
};




Loading…
Cancel
Save