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

[CPU] Fusing in non-0 output port exception (#10837)

Browse Source
This commit is contained in:
Luo Cheng 2022-03-16 19:08:28 +08:00 committed by GitHub
parent 8a813d0da9
commit 4d8adabcaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/intel_cpu/src/graph_optimizer.cpp
View File

@ -1579,7 +1579,7 @@ void MKLDNNGraphOptimizer::FuseEltwiseAndSimple(MKLDNNGraph &graph) {
graphEdges.push_back(newEdge);
parent->addEdge(newEdge);
parentNode->inputShapes.push_back(parent->outputShapes[0]);
parentNode->inputShapes.push_back(parent->getOutputShapeAtPort(inNum));
}
}

66
src/tests/functional/plugin/cpu/subgraph_tests/src/fuse_non0_output_port.cpp Normal file
View File

@ -0,0 +1,66 @@
// Copyright (C) 2018-2022 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#include "shared_test_classes/base/layer_test_utils.hpp"
#include "shared_test_classes/base/ov_subgraph.hpp"
#include "ngraph_functions/utils/ngraph_helpers.hpp"
#include "ngraph_functions/builders.hpp"
#include "ngraph/runtime/aligned_buffer.hpp"
#include "functional_test_utils/ov_tensor_utils.hpp"
using namespace ov::test;
namespace SubgraphTestsDefinitions {
class FuseNon0OuputPort : public SubgraphBaseTest {
void SetUp() override {
const ov::Shape x_shape = {1, 10};
const ov::Shape y_shape = {1};
const ov::Shape z_shape = {1};
ngraph::ParameterVector params(3);
targetStaticShapes = {{x_shape, y_shape, z_shape}};
targetDevice = CommonTestUtils::DEVICE_CPU;
params[0] = ngraph::builder::makeParams(ov::element::f32, {x_shape})[0];
params[1] = ngraph::builder::makeParams(ov::element::i32, {y_shape})[0];
params[2] = ngraph::builder::makeParams(ov::element::i32, {z_shape})[0];
// make a sub function
const auto cond = ov::opset8::Constant::create(ov::element::boolean, {1}, {true});
ngraph::ParameterVector sub_params(3);
sub_params[0] = ngraph::builder::makeParams(ov::element::f32, {x_shape})[0];
sub_params[1] = ngraph::builder::makeParams(ov::element::i32, {y_shape})[0];
sub_params[2] = ngraph::builder::makeParams(ov::element::boolean, {y_shape})[0];
ngraph::ResultVector sub_results(3);
sub_results[0] = std::make_shared<ngraph::opset1::Result>(sub_params[0]);
sub_results[1] = std::make_shared<ngraph::opset1::Result>(sub_params[1]);
sub_results[2] = std::make_shared<ngraph::opset1::Result>(sub_params[2]);
const auto sub_model = std::make_shared<ov::Model>(sub_results, sub_params);
// loop ops
const auto trip = ov::opset8::Constant::create(ov::element::i64, {1}, {2});
const auto loop = std::make_shared<ov::opset8::Loop>(trip, cond);
loop->set_function(sub_model);
loop->set_invariant_input(sub_params[0], params[0]);
loop->set_invariant_input(sub_params[1], params[1]);
loop->set_invariant_input(sub_params[2], cond);
loop->set_special_body_ports({-1, 2});
const auto out0 = loop->get_iter_value(sub_results[0]->output(0), -1);
const auto out1 = loop->get_iter_value(sub_results[1]->output(0), -1);
const auto out2 = loop->get_iter_value(sub_results[2]->output(0), -1);
// main function
const auto c = ov::opset8::Constant::create(ov::element::i32, {1}, {1});
const auto z1 = std::make_shared<ov::opset8::Add>(params[2], c);
const auto d = std::make_shared<ov::opset8::Add>(out1, z1);
function = std::make_shared<ov::Model>(ov::OutputVector{d->output(0), out0, out2}, params, "FuseNon0OuputPort");
}
};
TEST_F(FuseNon0OuputPort, smoke_FuseNon0OuputPort) {
SKIP_IF_CURRENT_TEST_IS_DISABLED()
run();
}
} // namespace SubgraphTestsDefinitions