Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IE CLDNN] Don't force expected reorder layout & improve i64->i32 fallback #1088

Merged
merged 2 commits into from
Jul 2, 2020
Merged

[IE CLDNN] Don't force expected reorder layout & improve i64->i32 fallback #1088

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eca33f
[IE CLDNN] Do not force expected reorder layout
jhajducz Jun 23, 2020
35bbe7b
[IE CLDNN] Change output_data_type in i64->i32 fallback
jhajducz Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions inference-engine/thirdparty/clDNN/src/graph_optimizer/add_required_reorders.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,6 @@ void add_required_reorders::add_reorder(program_impl& p, program_node* node, pro
auto new_reorder = std::make_shared<reorder>(node->id() + "_reorder_" + usr->id(), node->id(), reorder_layout);
auto& new_reorder_node = p.get_or_create(new_reorder);

// make sure that new_reorder_node has correct layout
new_reorder_node.set_output_layout(reorder_layout, false);

// ToDo: add a method to program_impl class which adds an intermediate node given a node and its user
auto it = std::find(usr->get_dependencies().begin(), usr->get_dependencies().end(), node);
if (it == usr->get_dependencies().end()) {
Expand Down Expand Up @@ -98,17 +95,34 @@ void add_required_reorders::run(program_impl& p) {
usr->set_output_layout(current_layout, false);
if (usr->type()->does_possible_implementation_exist(p.get_engine(), *usr)) {
correct_layout_selected = true;
break;
} else {
current_layout = original_layout;
current_layout.data_type = data_types::i32;
current_layout.format = node->get_output_layout().format;
usr->set_output_layout(current_layout, false);
if (usr->type()->does_possible_implementation_exist(p.get_engine(), *usr)) {
correct_layout_selected = true;
break;
}
}

if (correct_layout_selected) {
// change output_data_type field in usr to i32
if ((static_cast<bool>(usr->get_primitive()->output_data_type) == true) &&
(*(usr->get_primitive()->output_data_type) == data_types::i64)) {
std::const_pointer_cast<primitive>(usr->get_primitive())->output_data_type = data_types::i32;
}
// add reorders between usr int32 output and inputs of its users
auto next_usr_itr = usr->get_users().begin();
while (next_usr_itr != usr->get_users().end()) {
auto next_usr = *next_usr_itr++;
if (!next_usr->is_type<reorder>()) {
if ((next_usr->get_output_layout() != usr->get_output_layout())) {
add_reorder(p, usr, next_usr);
}
}
}
break;
}
}
}

Expand Down Expand Up @@ -185,7 +199,13 @@ void add_required_reorders::run(program_impl& p) {
" kernel which satisfies output format dependecies.");
}

// add reorders between usr int32 outputs and inputs of its users
// change output_data_type field in usr to i32
if ((static_cast<bool>(usr->get_primitive()->output_data_type) == true) &&
(*(usr->get_primitive()->output_data_type) == data_types::i64)) {
std::const_pointer_cast<primitive>(usr->get_primitive())->output_data_type = data_types::i32;
}

// add reorders between usr int32 output and inputs of its users
auto next_usr_itr = usr->get_users().begin();
while (next_usr_itr != usr->get_users().end()) {
auto next_usr = *next_usr_itr++;
Expand Down