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

[CPU] Remove skip for the first inPlace base edge (#19185)

Browse Source
This commit is contained in:
Maksim Kutakov 2023-08-16 09:49:04 +02:00 committed by GitHub
parent 5b273aaba6
commit 74c237de2e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -497,7 +497,7 @@ EdgePtr Edge::getBaseEdge(int look) {
for (auto edge : edgesForSamePort) {
if (edge.get() != this) {
// Return once found the first inplace consumer
if (edge->inPlace() && edge != edgesForSamePort[0]) return edge;
if (edge->inPlace()) return edge;
}
}

67
src/plugins/intel_cpu/tests/functional/subgraph_tests/src/split_concat_add.cpp Normal file
View File

@ -0,0 +1,67 @@
// Copyright (C) 2018-2023 Intel Corporation
// SPDX-License-Identifier: Apache-2.0
//
#include "shared_test_classes/base/ov_subgraph.hpp"
#include "ngraph_functions/utils/ngraph_helpers.hpp"
#include "ngraph_functions/builders.hpp"
/*This test runs the following subgraph:
param
|
|
Split
/ | \
/ | \
Add Add Add
\ | /\
\ | / \
Concat Result
/ | \
/ | \
Add Add Result
| |
Add Add
/ |
Result Result
The main purpose of the test is to check the memory sharing between result and in_place edges.
*/
using namespace InferenceEngine;
using namespace ov::test;
namespace SubgraphTestsDefinitions {
class SplitConcatAddInPlace : virtual public ov::test::SubgraphBaseTest {
protected:
void SetUp() override {
targetDevice = ov::test::utils::DEVICE_CPU;
const auto precision = ov::element::f32;
ov::test::InputShape input_shape{{}, {{1, 3, 3, 3}}};
init_input_shapes({input_shape});
auto params = ngraph::builder::makeDynamicParams(precision, inputDynamicShapes);
auto split = ngraph::builder::makeSplit(params.front(), precision, 3, 1);
auto add_const = ngraph::builder::makeConstant(precision, {1}, std::vector<float>({1.0f}));
auto add_1 = ngraph::builder::makeEltwise(split->output(0), add_const, ngraph::helpers::EltwiseTypes::ADD);
auto result_add_1 = std::make_shared<ngraph::opset3::Result>(add_1);
auto add_2 = ngraph::builder::makeEltwise(split->output(1), add_const, ngraph::helpers::EltwiseTypes::ADD);
auto add_3 = ngraph::builder::makeEltwise(split->output(2), add_const, ngraph::helpers::EltwiseTypes::ADD);
auto concat = ngraph::builder::makeConcat({add_1, add_2, add_3}, 1);
auto result_concat = std::make_shared<ngraph::opset3::Result>(concat);
auto add_4 = ngraph::builder::makeEltwise(concat, add_const, ngraph::helpers::EltwiseTypes::ADD);
auto add_5 = ngraph::builder::makeEltwise(concat, add_const, ngraph::helpers::EltwiseTypes::ADD);
auto result_1 = std::make_shared<ngraph::opset3::Result>(add_4);
auto result_2 = std::make_shared<ngraph::opset3::Result>(add_5);
ngraph::ResultVector results = {result_1, result_2, result_add_1, result_concat};
function = std::make_shared<ov::Model>(results, params, "Subgraph");
}
};
TEST_F(SplitConcatAddInPlace, smoke_CompareWithRefs) {
run();
}
} // namespace SubgraphTestsDefinitions