Skip to content

Commit 05e0333

Browse files
committed
Merge remote-tracking branch 'upstream/master' into common-onednn
2 parents d99771c + 090bf92 commit 05e0333

File tree

49 files changed

+42
-190
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+42
-190
lines changed

src/common/offline_transformations/src/compress_quantize_weigths.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
#include "openvino/op/fake_convert.hpp"
1212
#include "openvino/op/fake_quantize.hpp"
1313
#include "openvino/op/multiply.hpp"
14-
#include "openvino/op/negative.hpp"
15-
#include "openvino/op/power.hpp"
1614
#include "openvino/op/subtract.hpp"
1715
#include "openvino/pass/constant_folding.hpp"
1816
#include "openvino/pass/pattern/op/or.hpp"

src/common/transformations/include/transformations/utils/utils.hpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
#include "openvino/core/descriptor_tensor.hpp"
1515
#include "openvino/core/rt_info.hpp"
16-
#include "openvino/op/constant.hpp"
17-
#include "openvino/op/convert.hpp"
16+
#include "openvino/opsets/opset4.hpp"
17+
#include "openvino/opsets/opset8.hpp"
1818
#include "openvino/pass/graph_rewrite.hpp"
1919
#include "transformations/rt_info/attributes.hpp"
2020
#include "transformations_visibility.hpp"
@@ -65,7 +65,7 @@ bool has_op_with_type(const std::shared_ptr<const ov::Model>& function) {
6565

6666
inline bool has_decompression_converts(const std::shared_ptr<const ov::Model>& function) {
6767
for (const auto& op : function->get_ops()) {
68-
if (std::dynamic_pointer_cast<ov::op::v0::Convert>(op)) {
68+
if (std::dynamic_pointer_cast<opset8::Convert>(op)) {
6969
if (ov::is_decompression(op))
7070
return true;
7171
}
@@ -133,7 +133,7 @@ bool has_constant_value(const std::shared_ptr<Node>& node,
133133
return false;
134134
}
135135

136-
auto constant = std::dynamic_pointer_cast<ov::op::v0::Constant>(node);
136+
auto constant = std::dynamic_pointer_cast<opset4::Constant>(node);
137137
if (!constant) {
138138
return false;
139139
}
@@ -167,7 +167,7 @@ bool has_constant_value(const std::shared_ptr<Node>& node,
167167
return false;
168168
}
169169

170-
auto constant = std::dynamic_pointer_cast<ov::op::v0::Constant>(node);
170+
auto constant = std::dynamic_pointer_cast<opset4::Constant>(node);
171171
if (!constant) {
172172
return false;
173173
}
@@ -184,18 +184,18 @@ bool has_constant_value(const std::shared_ptr<Node>& node,
184184
return const_values == values;
185185
}
186186

187-
TRANSFORMATIONS_API bool get_single_value(const std::shared_ptr<ov::op::v0::Constant>& const_node,
187+
TRANSFORMATIONS_API bool get_single_value(const std::shared_ptr<opset4::Constant>& const_node,
188188
float& value,
189189
bool check_value_range = true);
190190

191-
TRANSFORMATIONS_API std::shared_ptr<Node> normalize_constant(const std::shared_ptr<ov::op::v0::Constant>& constant,
191+
TRANSFORMATIONS_API std::shared_ptr<Node> normalize_constant(const std::shared_ptr<opset4::Constant>& constant,
192192
const PartialShape& shape);
193193

194194
TRANSFORMATIONS_API std::shared_ptr<Node> broadcastTo(const Output<Node>& input, const Shape& shape);
195195

196196
TRANSFORMATIONS_API std::shared_ptr<Node> reshapeTo(const Output<Node>& input, const Shape& shape);
197197

198-
TRANSFORMATIONS_API bool constantIsEqualTo(const std::shared_ptr<ov::op::v0::Constant>& const_node,
198+
TRANSFORMATIONS_API bool constantIsEqualTo(const std::shared_ptr<opset4::Constant>& const_node,
199199
float value,
200200
float eps = 1e-5);
201201

src/common/transformations/src/transformations/common_optimizations/eliminate_unsqueeze_gather.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
#include "openvino/op/constant.hpp"
1010
#include "openvino/op/reshape.hpp"
1111
#include "openvino/op/unsqueeze.hpp"
12-
#include "openvino/op/util/binary_elementwise_arithmetic.hpp"
13-
#include "openvino/op/util/binary_elementwise_comparison.hpp"
14-
#include "openvino/op/util/binary_elementwise_logical.hpp"
15-
#include "openvino/op/util/gather_base.hpp"
1612
#include "openvino/pass/pattern/op/or.hpp"
1713
#include "openvino/pass/pattern/op/wrap_type.hpp"
1814
#include "transformations/utils/utils.hpp"

src/common/transformations/src/transformations/common_optimizations/fold_subgraph_empty_inputs.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "itt.hpp"
1212
#include "openvino/core/rt_info.hpp"
1313
#include "openvino/op/constant.hpp"
14-
#include "openvino/op/util/multi_subgraph_base.hpp"
1514
#include "openvino/pass/pattern/op/wrap_type.hpp"
1615
#include "transformations/utils/utils.hpp"
1716

src/common/transformations/src/transformations/common_optimizations/gelu_fusion.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "openvino/op/constant.hpp"
1818
#include "openvino/op/divide.hpp"
1919
#include "openvino/op/erf.hpp"
20-
#include "openvino/op/gelu.hpp"
2120
#include "openvino/op/multiply.hpp"
2221
#include "openvino/op/parameter.hpp"
2322
#include "openvino/op/power.hpp"

src/common/transformations/src/transformations/common_optimizations/mark_precision_sensitive_shapeof_subgraphs.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
#include "itt.hpp"
1111
#include "openvino/op/constant.hpp"
1212
#include "openvino/op/divide.hpp"
13-
#include "openvino/op/util/multi_subgraph_base.hpp"
1413
#include "openvino/op/util/precision_sensitive_attribute.hpp"
1514
#include "openvino/pass/pattern/op/wrap_type.hpp"
1615
#include "transformations/rt_info/disable_fp16_compression.hpp"

src/common/transformations/src/transformations/common_optimizations/nop_elimination.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,11 @@
1212
#include "itt.hpp"
1313
#include "openvino/core/validation_util.hpp"
1414
#include "openvino/op/add.hpp"
15-
#include "openvino/op/broadcast.hpp"
1615
#include "openvino/op/concat.hpp"
1716
#include "openvino/op/constant.hpp"
1817
#include "openvino/op/convert.hpp"
1918
#include "openvino/op/divide.hpp"
2019
#include "openvino/op/gather.hpp"
21-
#include "openvino/op/gather_elements.hpp"
2220
#include "openvino/op/gru_sequence.hpp"
2321
#include "openvino/op/lstm_sequence.hpp"
2422
#include "openvino/op/multiply.hpp"
@@ -28,17 +26,11 @@
2826
#include "openvino/op/scatter_elements_update.hpp"
2927
#include "openvino/op/scatter_nd_update.hpp"
3028
#include "openvino/op/scatter_update.hpp"
31-
#include "openvino/op/slice.hpp"
3229
#include "openvino/op/split.hpp"
3330
#include "openvino/op/squeeze.hpp"
34-
#include "openvino/op/strided_slice.hpp"
3531
#include "openvino/op/subtract.hpp"
36-
#include "openvino/op/tile.hpp"
3732
#include "openvino/op/transpose.hpp"
3833
#include "openvino/op/unsqueeze.hpp"
39-
#include "openvino/op/util/binary_elementwise_comparison.hpp"
40-
#include "openvino/op/util/binary_elementwise_logical.hpp"
41-
#include "openvino/op/util/op_types.hpp"
4234
#include "openvino/op/util/pad_base.hpp"
4335
#include "openvino/op/variadic_split.hpp"
4436
#include "openvino/pass/pattern/op/optional.hpp"

src/common/transformations/src/transformations/common_optimizations/pull_through_reduce.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
#include "openvino/op/constant.hpp"
1313
#include "openvino/op/reshape.hpp"
1414
#include "openvino/op/unsqueeze.hpp"
15-
#include "openvino/op/util/arithmetic_reductions_keep_dims.hpp"
16-
#include "openvino/op/util/logical_reduction_keep_dims.hpp"
1715
#include "openvino/op/util/reduction_base.hpp"
1816
#include "openvino/pass/pattern/op/or.hpp"
1917
#include "openvino/pass/pattern/op/wrap_type.hpp"

src/common/transformations/src/transformations/common_optimizations/reduce_reshape_fusion.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
#include "itt.hpp"
1111
#include "openvino/op/constant.hpp"
1212
#include "openvino/op/reshape.hpp"
13-
#include "openvino/op/util/arithmetic_reductions_keep_dims.hpp"
14-
#include "openvino/op/util/logical_reduction_keep_dims.hpp"
1513
#include "openvino/op/util/reduction_base.hpp"
1614
#include "openvino/pass/pattern/op/or.hpp"
1715
#include "openvino/pass/pattern/op/wrap_type.hpp"

src/common/transformations/src/transformations/common_optimizations/skip_gather_before_transpose_and_reshape.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include "openvino/op/constant.hpp"
1313
#include "openvino/op/reshape.hpp"
1414
#include "openvino/op/transpose.hpp"
15-
#include "openvino/op/util/gather_base.hpp"
1615
#include "openvino/pass/pattern/op/wrap_type.hpp"
1716
#include "transformations/utils/utils.hpp"
1817

0 commit comments

Comments
 (0)