Skip to content

Commit 19aa7cd

Browse files
committed
apply review comment
1 parent 14a64df commit 19aa7cd

1 file changed

Lines changed: 15 additions & 9 deletions

File tree

src/common/transformations/src/transformations/common_optimizations/strided_slice_reshape_concat_fusion.cpp

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "itt.hpp"
1111
#include "openvino/core/graph_util.hpp"
1212
#include "openvino/core/rt_info.hpp"
13+
#include "openvino/core/validation_util.hpp"
1314
#include "openvino/op/concat.hpp"
1415
#include "openvino/op/constant.hpp"
1516
#include "openvino/op/gather.hpp"
@@ -43,13 +44,6 @@ bool get_vector_i64(const Output<Node>& value, std::vector<int64_t>& out) {
4344
return !out.empty();
4445
}
4546

46-
bool normalize_axis(int64_t& axis, int64_t rank) {
47-
if (axis < 0) {
48-
axis += rank;
49-
}
50-
return axis >= 0 && axis < rank;
51-
}
52-
5347
bool get_mask(const std::vector<int64_t>& mask, size_t idx) {
5448
return idx < mask.size() ? mask[idx] != 0 : false;
5549
}
@@ -157,7 +151,13 @@ bool parse_slice_window(const std::shared_ptr<ov::Node>& node, int64_t& start, i
157151
return false;
158152
}
159153

160-
if (!normalize_axis(axis, data_rank.get_length()) || axis != 1 || step != 1 || stop <= start) {
154+
const auto rank = data_rank.get_length();
155+
if (!ov::util::is_axis_valid(axis, rank)) {
156+
return false;
157+
}
158+
axis = static_cast<int64_t>(ov::util::normalize_axis(axis, rank));
159+
160+
if (axis != 1 || step != 1 || stop <= start) {
161161
return false;
162162
}
163163

@@ -211,7 +211,13 @@ StridedSliceReshapeConcatFusion::StridedSliceReshapeConcatFusion() {
211211
}
212212

213213
int64_t concat_axis = concat->get_axis();
214-
if (!normalize_axis(concat_axis, output_rank.get_length()) || concat_axis != 1) {
214+
const auto rank = output_rank.get_length();
215+
if (!ov::util::is_axis_valid(concat_axis, rank)) {
216+
return false;
217+
}
218+
concat_axis = static_cast<int64_t>(ov::util::normalize_axis(concat_axis, rank));
219+
220+
if (concat_axis != 1) {
215221
return false;
216222
}
217223

0 commit comments

Comments
 (0)