Browse Source

!549 Feature: Get default from ge ir graph while no user input shape

From: @lixiwen1
Reviewed-by: 
Signed-off-by:
tags/v1.2.0
mindspore-ci-bot Gitee 3 years ago
parent
commit
cd877c58e0
1 changed files with 53 additions and 5 deletions
  1. +53
    -5
      ge/ir_build/ge_ir_build.cc

+ 53
- 5
ge/ir_build/ge_ir_build.cc View File

@@ -36,6 +36,7 @@
#include "model/ge_model.h"
#include "graph/shape_refiner.h"
#include "graph/opsproto_manager.h"
#include "graph/utils/type_utils.h"

using std::string;
using namespace std;
@@ -225,7 +226,8 @@ class Impl {
~Impl() { (void)generator_.Finalize(); };
graphStatus CheckOptions(const std::map<std::string, std::string> &options);
graphStatus CreateInputsForIRBuild(const ge::Graph &graph, vector<ge::GeTensor> &inputs);
graphStatus Init(const std::map<std::string, std::string> &options);
graphStatus GetDefaultInputShapeAndFormat(const Graph &graph, string &default_shape, string &input_format);
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,
@@ -278,7 +280,46 @@ graphStatus Impl::CheckOptions(const std::map<std::string, std::string> &options
return GRAPH_SUCCESS;
}

graphStatus Impl::Init(const std::map<std::string, std::string> &options) {
graphStatus Impl::GetDefaultInputShapeAndFormat(const Graph &graph, string &default_shape, string &input_format) {
auto compute_graph = ge::GraphUtils::GetComputeGraph(graph);
GE_CHECK_NOTNULL(compute_graph);
for (ge::NodePtr &input_node : compute_graph->GetDirectNode()) {
GE_CHECK_NOTNULL(input_node);
ge::OpDescPtr op = input_node->GetOpDesc();
GE_CHECK_NOTNULL(op);
if (op->GetType() == DATA) {
string data_op_name = op->GetName();
GELOGD("Data op name: %s, data op inputDesc size: %zu", data_op_name.c_str(), op->GetAllInputsDesc().size());
ge::GeTensorDesc tensor = op->GetInputDesc(0);
ge::GeShape data_shape = tensor.GetShape();
GELOGD("Data op get shape from InputDesc in ge ir graph.");

string tmp_shape_str;
const std::vector<int64_t> &tmp_shape = data_shape.GetDims();
if (tmp_shape.empty()) {
GELOGW("Data op: %s has zero shape dims!", data_op_name.c_str());
} else {
tmp_shape_str += data_op_name + ":";
for (auto tmp_dim : tmp_shape) {
tmp_shape_str += to_string((long)tmp_dim) + ",";
}
tmp_shape_str = tmp_shape_str.substr(0, tmp_shape_str.size() - 1);
tmp_shape_str += ";";
default_shape += tmp_shape_str;
}

ge::Format data_format = tensor.GetFormat();
input_format.assign(ge::TypeUtils::FormatToSerialString(data_format));
GELOGD("Data op name: %s, data shape: %s, data format: %s.", data_op_name.c_str(), tmp_shape_str.c_str(),
input_format.c_str());
}
}
default_shape = (default_shape.empty() ? default_shape : default_shape.substr(0, default_shape.size() - 1));
GELOGI("Get default data op shape: %s, format: %s from ge ir graph.", default_shape.c_str(), input_format.c_str());
return GRAPH_SUCCESS;
}

graphStatus Impl::Init(const Graph &graph, const std::map<std::string, std::string> &options) {
// 1. check options
graphStatus ret = CheckOptions(options);
if (ret != GRAPH_SUCCESS) {
@@ -296,8 +337,15 @@ graphStatus Impl::Init(const std::map<std::string, std::string> &options) {
GE_CHK_BOOL_RET_STATUS_NOLOG(ge::CheckLogParamValidAndSetLogLevel(log) == 0, GRAPH_PARAM_INVALID);
options_[ge::ir_option::LOG_LEVEL] = log;

string input_shape = options_.find("input_shape") == options_.end() ? "" : options_["input_shape"];
string input_format = options_.find("input_format") == options_.end() ? "" : options_["input_format"];
string input_shape;
string tmp_input_format;
if (options_.find("input_shape") == options_.end()) {
GE_CHK_BOOL_EXEC(GetDefaultInputShapeAndFormat(graph, input_shape, tmp_input_format) == ge::SUCCESS,
return ge::GRAPH_PARAM_INVALID, "Get default data op shape from graph failed!");
} else {
input_shape = options_["input_shape"];
}
string input_format = options_.find("input_format") == options_.end() ? tmp_input_format : options_["input_format"];
string net_format = options_.find("net_format") == options_.end() ? "" : options_["net_format"];
string dynamic_batch_size = options_.find(ge::ir_option::DYNAMIC_BATCH_SIZE) == options_.end()
? ""
@@ -416,7 +464,7 @@ graphStatus Impl::CreateInputsForIRBuild(const ge::Graph &graph, vector<ge::GeTe
graphStatus Impl::BuildModel(const Graph &graph, const std::map<std::string, std::string> &options,
ModelBufferData &model) {
// 1. init GeGenerator with user optios
graphStatus ret = Init(options);
graphStatus ret = Init(graph, options);
if (ret != GRAPH_SUCCESS) {
GELOGE(ret, "Build ir model Init failed!");
return ret;


Loading…
Cancel
Save