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

Unroll Tensor Iterator using ngraph pass #7205

Merged
merged 4 commits into from
Aug 31, 2021
Merged

Unroll Tensor Iterator using ngraph pass #7205

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9428d62
use ngraph-based unroll-ti as default
evkotov Aug 19, 2021
026d583
use isNgraphPassesUsed for legacy code
evkotov Aug 23, 2021
f32fab6
code review fixes
evkotov Aug 26, 2021
19c5a8d
code review fixes
evkotov Aug 26, 2021
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
12 changes: 5 additions & 7 deletions inference-engine/src/gna_plugin/gna_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,11 +721,6 @@ void GNAPlugin::LoadNetwork(CNNNetwork & _network) {
manager.register_pass<ngraph::pass::UnrollTensorIterator>();

const auto& pass_config = manager.get_pass_config();
pass_config->set_callback<ngraph::pass::UnrollTensorIterator>(
[](const std::shared_ptr<const ngraph::Node> &node) -> bool {
// UnrollTI transformation is disabled by default, is turned on by LowLatency transformation
return node->get_rt_info().count("UNROLL_TI") == 0;
});
pass_config->disable<ngraph::pass::FakeQuantizeMulFusion>();
pass_config->disable<ngraph::pass::FakeQuantizeReshapeFusion>();
pass_config->disable<ngraph::pass::PullTransposeThroughFQUp>();
Expand Down Expand Up @@ -766,8 +761,11 @@ void GNAPlugin::LoadNetwork(CNNNetwork & _network) {
auto run_passes = [&] (const CNNNetwork& network, bool runBeforeCopy, bool lowPrecision) {
auto passes = make_shared<PassManager>(PassManagerSettings{runBeforeCopy, lowPrecision}, network);
passes->registerPass<RemoveConstPass>();
passes->registerPass<UnrollTIPass>();
passes->registerPass<RemoveConstPass>();
if (!isNgraphPassesUsed) {
passes->registerPass<UnrollTIPass>();
passes->registerPass<RemoveConstPass>();
}

if (!isNgraphPassesUsed)
passes->registerPass<UnrollLSTMCellPass>();
passes->registerPass<RemoveSingleInputConcatPass>();
Expand Down
3 changes: 2 additions & 1 deletion inference-engine/tests/functional/shared_test_classes/src/subgraph/memory_LSTMCell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ namespace SubgraphTestsDefinitions {
// TI construction
auto tensor_iterator = std::make_shared<TensorIterator>();
tensor_iterator->set_body(body);
tensor_iterator->set_invariant_input(X, permute_in);
tensor_iterator->set_sliced_input(X, permute_in, 0, 1, 1, -1, 0);
tensor_iterator->set_merged_input(H_t, hidden_memory_read, H_o);
tensor_iterator->set_merged_input(C_t, cell_memory_read, C_o);

Expand All @@ -130,6 +130,7 @@ namespace SubgraphTestsDefinitions {
SinkVector{cell_memory_write, hidden_memory_write},
input_parameter,
"TI_with_memory");
tensor_iterator->validate_and_infer_types();
}

void MemoryLSTMCellTest::switchToNgraphFriendlyModel() {
Expand Down
6 changes: 4 additions & 2 deletions inference-engine/tests/functional/shared_test_classes/src/subgraph/multiple_LSTMCell.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,10 @@ void MultipleLSTMCellTest::SetUp() {
// TI construction
auto tensor_iterator = std::make_shared<TensorIterator>();
tensor_iterator->set_body(body);
tensor_iterator->set_invariant_input(X, permute_in);
tensor_iterator->set_sliced_input(X, permute_in, 0, 1, 1, -1, 0);
elilobanova marked this conversation as resolved.
Show resolved Hide resolved
tensor_iterator->set_merged_input(H_t, hidden_memory_read, H_o);
tensor_iterator->set_merged_input(C_t, cell_memory_read, C_o);
tensor_iterator->validate_and_infer_types();

auto out_unsqueeze = tensor_iterator->get_iter_value(unsqueeze_o, -1);
auto out_hidden = tensor_iterator->get_iter_value(H_o, -1);
Expand Down Expand Up @@ -165,9 +166,10 @@ void MultipleLSTMCellTest::SetUp() {
// TI construction
auto tensor_iterator_2 = std::make_shared<TensorIterator>();
tensor_iterator_2->set_body(body_2);
tensor_iterator_2->set_invariant_input(X_2, inbetween_squeeze);
tensor_iterator_2->set_sliced_input(X_2, inbetween_squeeze, 0, 1, 1, -1, 0);
tensor_iterator_2->set_merged_input(H_t_2, hidden_memory_2_read, H_o_2);
tensor_iterator_2->set_merged_input(C_t_2, cell_memory_2_read, C_o_2);
tensor_iterator_2->validate_and_infer_types();

auto out_unsqueeze_2 = tensor_iterator_2->get_iter_value(unsqueeze_o_2, -1);
auto out_hidden_2 = tensor_iterator_2->get_iter_value(H_o_2, -1);
Expand Down