IntenseWebs/openvino
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change nGraph serializer behavior for dynamic dimensions (#8526)

Browse Source 
* Change dynamic_to_static to dinamic_to_undefined function to use -1 values instead of upperbounds in serialized IRs

* Resolve conflict after src files transition

* Remove resolve_dynamic_shapes function

* Fix typo

* Fix codestyle
This commit is contained in:
Anton Chetverikov 2022-01-17 14:43:09 +03:00 committed by GitHub
parent 56581dbe2e
commit 394e5c5515
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/core/src/pass/serialize.cpp
View File

@ -712,74 +712,6 @@ bool has_dynamic_output(const std::shared_ptr<Node>& n) {
return false;
}
bool resolve_dynamic_shapes(const ngraph::Function& f) {
const auto& f_ops = f.get_ordered_ops();
if (std::all_of(f_ops.begin(), f_ops.end(), [](const std::shared_ptr<Node>& results) {
return !results->is_dynamic() && !has_dynamic_output(results);
})) {
return false;
}
auto f_clone = ngraph::clone_function(f);
const auto& f_clone_ops = f_clone->get_ordered_ops();
NGRAPH_CHECK(f_ops.size() == f_clone_ops.size(), "Unexpected get_ordered_ops method behaviour");
for (size_t id = 0; id < f_ops.size(); ++id) {
auto& op = f_ops[id];
auto& clone_op = f_clone_ops[id];
ov::pass::enable_constant_folding(clone_op); // to be able to fold ShapeOfs
if (auto op_subgraph = std::dynamic_pointer_cast<ngraph::op::util::SubGraphOp>(op)) {
resolve_dynamic_shapes(*op_subgraph->get_function());
}
op->validate_and_infer_types();
clone_op->validate_and_infer_types();
// dynamic_to_static function converts dynamic dimensions to static using
// upperbound (get_max_length) dimension value.
auto dynamic_to_static = [&op](const PartialShape& shape) -> PartialShape {
if (shape.is_static() || shape.rank().is_dynamic()) {
return shape;
}
std::vector<Dimension> out_shape;
std::transform(std::begin(shape),
std::end(shape),
std::back_inserter(out_shape),
[](const Dimension& d) -> Dimension {
return d.get_max_length();
});
return out_shape;
};
OutputVector replacements(clone_op->get_output_size());
if (!clone_op->constant_fold(replacements, clone_op->input_values())) {
for (size_t output_id = 0; output_id < clone_op->get_output_size(); ++output_id) {
clone_op->set_output_type(output_id,
clone_op->output(output_id).get_element_type(),
dynamic_to_static(clone_op->output(output_id).get_partial_shape()));
op->set_output_type(output_id,
clone_op->output(output_id).get_element_type(),
clone_op->output(output_id).get_partial_shape());
}
} else {
for (size_t output_id = 0; output_id < clone_op->get_output_size(); ++output_id) {
op->set_output_type(output_id,
replacements[output_id].get_element_type(),
replacements[output_id].get_partial_shape());
}
for (size_t i = 0; i < replacements.size(); ++i) {
auto node_output = clone_op->output(i);
auto replacement = replacements.at(i);
if (replacement.get_node_shared_ptr() && (node_output != replacement)) {
node_output.replace(replacement);
}
}
}
}
return true;
}
void auto_pad_resolving(ov::Node* node) {
const std::set<ov::op::PadType> pad_agnostic_types = {
ov::op::PadType::SAME_LOWER,
@ -846,9 +778,6 @@ void ngfunction_2_ir(pugi::xml_node& netXml,
const std::unordered_map<ngraph::Node*, int> layer_ids = create_layer_ids(f);
std::unordered_set<std::string> unique_names;
// TODO remove resolve_dynamic_shapes function completely when support for -1 will be implemented in the MO
bool has_dynamic_shapes = resolve_dynamic_shapes(f);
const bool exec_graph = is_exec_graph(f);
auto sorted_ops = f.get_ordered_ops();
@ -1021,10 +950,6 @@ void ngfunction_2_ir(pugi::xml_node& netXml,
edge.append_attribute("to-layer").set_value(e.to_layer);
edge.append_attribute("to-port").set_value(e.to_port);
}
// move back dynamic shapes
if (has_dynamic_shapes) {
f.validate_nodes_and_infer_types();
}
}
std::string valid_xml_path(const std::string& path) {