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

Stop constantfold_subgraph on nonconstfoldable ShapeOf (#21171)

Browse Source 
* Stop constantfold_subgraph on nonconstfoldable ShapeOf

Ticket: CVS-124628

* pass tensor to Constant constructor

---------

Co-authored-by: Ivan Tikhonov <ivan.tikhonov@intel.com>
This commit is contained in:
Mateusz Tabaka 2023-11-27 12:30:54 +01:00 committed by GitHub
parent b02ddc5831
commit b027766b0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/src/validation_util.cpp
View File

@ -1188,6 +1188,15 @@ std::shared_ptr<ov::op::v0::Constant> ov::util::constantfold_subgraph(const Outp
if (num_inputs == 0)
return nullptr;
if (subgraph_sink.get_tensor().has_and_set_bound()) {
const auto& lower = subgraph_sink.get_tensor().get_lower_value();
return std::make_shared<ov::op::v0::Constant>(lower);
}
if (ov::is_type<op::util::ShapeOfBase>(node) && node->get_input_partial_shape(0).is_dynamic()) {
return nullptr;
}
OutputVector inputs;
inputs.reserve(num_inputs);
for (size_t i = 0; i < num_inputs; i++) {

16
src/core/tests/validation_utils.cpp
View File

@ -71,3 +71,19 @@ TEST(constantfold_subgraph, split) {
auto actual = ret->cast_vector<float>();
ASSERT_EQ(expected, actual);
}
TEST(constantfold_subgraph, shapeof) {
auto param = std::make_shared<ov::op::v0::Parameter>(ov::element::f32, ov::PartialShape{-1, 3, -1});
auto shapeof = std::make_shared<ov::op::v3::ShapeOf>(param);
auto zero = ov::op::v0::Constant::create(ov::element::i32, ov::Shape{1}, {0});
auto one = ov::op::v0::Constant::create(ov::element::i32, ov::Shape{1}, {1});
auto two = ov::op::v0::Constant::create(ov::element::i32, ov::Shape{1}, {2});
auto stop = std::make_shared<ov::op::v8::Slice>(shapeof, one /*start*/, two /*stop*/, one /*step*/, zero /*axis*/);
auto slice = std::make_shared<ov::op::v8::Slice>(param, one /*start*/, stop, one /*step*/, one /*axis*/);
auto ret = ov::util::constantfold_subgraph(stop);
ASSERT_NE(ret, nullptr);
auto actual = ret->cast_vector<int64_t>();
std::vector<int64_t> expected{3};
ASSERT_EQ(expected, actual);
}