Browse Source

fix format

tags/v1.3.0
wjm 3 years ago
parent
commit
b9336eae34
2 changed files with 4 additions and 7 deletions
  1. +1
    -1
      ge/hybrid/node_executor/hccl/hccl_node_executor.cc
  2. +3
    -6
      ge/ir_build/ge_ir_build.cc

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

@@ -178,7 +178,7 @@ Status RdmaNodeTask::Init(TaskContext &context) {

Status RdmaNodeTask::SetAddrInfo(TaskContext &context, RuntimeInferenceContext *ctx, uint64_t *data, int64_t row_num,
vector<HcomRemoteAccessAddrInfo> &addr_infos) {
TensorValue *tv;
TensorValue *tv = nullptr;
if (kRdmaReadTypes.count(context.GetNodeItem().NodeType()) > 0) {
tv = context.MutableOutput(local_index_);
} else {


+ 3
- 6
ge/ir_build/ge_ir_build.cc View File

@@ -272,8 +272,7 @@ class Impl {
graphStatus Init(const Graph &graph, const std::map<std::string, std::string> &options);
graphStatus BuildModel(const Graph &graph, const std::map<std::string, std::string> &options,
ModelBufferData &ge_models);
graphStatus InitDomiOmgContext(const string &input_shape, const string &input_format, const string &net_format,
bool is_dynamic_input);
graphStatus InitDomiOmgContext(const string &input_shape, const string &input_format, bool is_dynamic_input);
graphStatus GetInputShapeRange(const string &input_shape_range,
std::map<string, std::vector<std::pair<int64_t, int64_t>>> &name_shape_range_map,
std::vector<std::vector<std::pair<int64_t, int64_t>>> &index_shape_range_map);
@@ -540,7 +539,6 @@ graphStatus Impl::Init(const Graph &graph, const std::map<std::string, std::stri

string input_shape = GetParam(ge::ir_option::INPUT_SHAPE);
string input_format = GetParam(ge::ir_option::INPUT_FORMAT);
string net_format = GetParam("net_format");

string dynamic_batch_size = GetParam(ge::ir_option::DYNAMIC_BATCH_SIZE);
string dynamic_image_size = GetParam(ge::ir_option::DYNAMIC_IMAGE_SIZE);
@@ -588,7 +586,7 @@ graphStatus Impl::Init(const Graph &graph, const std::map<std::string, std::stri
return ret;
}
// 4.parse and init Context with input shape format and net format info
return this->InitDomiOmgContext(input_shape, input_format, net_format, is_dynamic_input_);
return this->InitDomiOmgContext(input_shape, input_format, is_dynamic_input_);
}

void Impl::SetRtSocVersion() {
@@ -687,8 +685,7 @@ graphStatus Impl::BuildModel(const Graph &graph, const std::map<std::string, std

return GRAPH_SUCCESS;
}
graphStatus Impl::InitDomiOmgContext(const string &input_shape, const string &input_format, const string &net_format,
bool is_dynamic_input) {
graphStatus Impl::InitDomiOmgContext(const string &input_shape, const string &input_format, bool is_dynamic_input) {
// Clear omgcontext data first
omg_context_.input_dims.clear();
omg_context_.user_input_dims.clear();


Loading…
Cancel
Save