m53297601
/
graphengine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

modified: ge/graph/preprocess/graph_preprocess.cc

Browse Source
pull/1097/head
zhaoxinxin 4 years ago
parent 965f637f7d
commit a2380c973c
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File

28
ge/graph/preprocess/graph_preprocess.cc
Unescape View File

@ -990,31 +990,27 @@ Status ParseDynamicInputShapeRange(const std::string &shape_range,
Status GetDynamicInputShapeRange(const std::vector<GeTensor> &user_input, const std::map<string, string> &graph_option, Status GetDynamicInputShapeRange(const std::vector<GeTensor> &user_input, const std::map<string, string> &graph_option,
vector<vector<std::pair<int64_t, int64_t>>> &range_vec) { vector<vector<std::pair<int64_t, int64_t>>> &range_vec) {
// check both mode and shape_range option are all enabled
bool enable_dynamic_execute_mode = true; bool enable_dynamic_execute_mode = true;
auto mode_iter = graph_option.find(OPTION_EXEC_DYNAMIC_EXECUTE_MODE); auto mode_iter = graph_option.find(OPTION_EXEC_DYNAMIC_EXECUTE_MODE);
if (mode_iter == graph_option.end()) { if ((mode_iter == graph_option.end()) || (mode_iter->second != "dynamic_execute")) {
GELOGD("Graph Option: Can not find %s option in graph options.", OPTION_EXEC_DYNAMIC_EXECUTE_MODE); GELOGD("Graph Option: Can not find %s option in graph options.", OPTION_EXEC_DYNAMIC_EXECUTE_MODE);
enable_dynamic_execute_mode = false; enable_dynamic_execute_mode = false;
} }
if (enable_dynamic_execute_mode) {
GELOGD("Graph Option: dynamic_input_mode value is %s.", mode_iter->second.c_str());
if (mode_iter->second != "dynamic_execute") {
enable_dynamic_execute_mode = false;
}
}
auto iter = graph_option.find(OPTION_EXEC_DATA_INPUTS_SHAPE_RANGE); auto iter = graph_option.find(OPTION_EXEC_DATA_INPUTS_SHAPE_RANGE);
if (iter == graph_option.end()) { bool enable_input_shape_range = (iter != graph_option.end());
GELOGE(PARAM_INVALID, "Graph option %s is required when %s is dynamic_execute", OPTION_EXEC_DATA_INPUTS_SHAPE_RANGE, if (enable_dynamic_execute_mode && enable_input_shape_range) {
OPTION_EXEC_DYNAMIC_EXECUTE_MODE); GELOGD("GraphOption: %s value is dynamic_execute, %s value is %s.", OPTION_EXEC_DYNAMIC_EXECUTE_MODE,
return PARAM_INVALID; OPTION_EXEC_DATA_INPUTS_SHAPE_RANGE, iter->second.c_str());
} } else if (!enable_dynamic_execute_mode && !enable_input_shape_range) {
if (!enable_dynamic_execute_mode) { return SUCCESS;
GELOGE(PARAM_INVALID, "Graph option %s is required when %s is enabled", OPTION_EXEC_DYNAMIC_EXECUTE_MODE, } else {
OPTION_EXEC_DATA_INPUTS_SHAPE_RANGE); GELOGE(PARAM_INVALID, "Graph option: %s and %s should be enabled at the same time.",
OPTION_EXEC_DYNAMIC_EXECUTE_MODE, OPTION_EXEC_DATA_INPUTS_SHAPE_RANGE);
return PARAM_INVALID; return PARAM_INVALID;
} }
GELOGD("GraphOption: dynamic_inputs_shape_range value is %s.", iter->second.c_str());
auto ret = ParseDynamicInputShapeRange(iter->second, range_vec); auto ret = ParseDynamicInputShapeRange(iter->second, range_vec);
GE_CHK_STATUS_RET(ret, "Parse dynamic input shape range failed."); GE_CHK_STATUS_RET(ret, "Parse dynamic input shape range failed.");
if (range_vec.size() != user_input.size()) { if (range_vec.size() != user_input.size()) {

Write Preview
Loading…
Cancel
Save