Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CPU] fix strided_slice with new axis #27103

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+4 −12
Open

[CPU] fix strided_slice with new axis #27103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5491bc1
quick fix
xczhai Oct 17, 2024
9a2bf91
remove untouched codes
xczhai Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions src/plugins/intel_cpu/src/shape_inference/custom/strided_slice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,10 @@ namespace node {
StridedSliceShapeInfer::StridedSliceShapeInfer(size_t output_size,
std::unordered_set<int64_t> begin_mask,
std::unordered_set<int64_t> end_mask,
std::unordered_set<int64_t> new_axis_mask,
std::unordered_set<int64_t> shrink_axis_mask)
: m_outputShape(output_size, 1),
m_begin_mask_set(std::move(begin_mask)),
m_end_mask_set(std::move(end_mask)),
m_new_axis_mask_set(std::move(new_axis_mask)),
m_shrink_axis_mask_set(std::move(shrink_axis_mask)) {}

Result StridedSliceShapeInfer::infer(
Expand All @@ -39,12 +37,7 @@ Result StridedSliceShapeInfer::infer(
auto stridePtr = data_dependency.at(STRIDE_ID)->getDataAs<int32_t>();

for (size_t i = 0, new_idx = 0; i < shapeIn.size(); ++i) {
if (m_new_axis_mask_set.count(i)) {
// deal with new_axis_mask
m_outputShape[new_idx] = 1;
m_outputShape[new_idx+1] = shapeIn[i];
new_idx+=2;
} else if (!m_shrink_axis_mask_set.count(i)) {
if (!m_shrink_axis_mask_set.count(i)) {
// deal with begin_mask and end_mask
if ((i >= shapeBegin[0]) || (shapeIn[i] == 0)) {
m_outputShape[new_idx] = shapeIn[i];
Expand Down Expand Up @@ -73,7 +66,9 @@ ShapeInferPtr StridedSliceShapeInferFactory::makeShapeInfer() const {
return std::make_shared<NgraphShapeInfer>(make_shape_inference(m_op), PortMask(2, 3, 4, 5));
} else if (const auto StridedSlice_op = ov::as_type_ptr<const ov::op::v1::StridedSlice>(m_op)) {
const auto& ellipsis_mask = StridedSlice_op->get_ellipsis_mask();
if (std::any_of(ellipsis_mask.begin(), ellipsis_mask.end(), [](int64_t x){ return x == 1; })) {
const auto& new_axis_mask = StridedSlice_op->get_new_axis_mask();
if (std::any_of(ellipsis_mask.begin(), ellipsis_mask.end(), [](int64_t x){ return x == 1; }) ||
std::any_of(new_axis_mask.begin(), new_axis_mask.end(), [](int64_t x){ return x == 1; })) {
return std::make_shared<NgraphShapeInfer>(make_shape_inference(m_op), port_mask);
} else {
auto vec_to_set = [](const std::vector<int64_t>& vec){
Expand All @@ -89,7 +84,6 @@ ShapeInferPtr StridedSliceShapeInferFactory::makeShapeInfer() const {
m_op->get_output_partial_shape(0).rank().get_length(),
vec_to_set(StridedSlice_op->get_begin_mask()),
vec_to_set(StridedSlice_op->get_end_mask()),
vec_to_set(StridedSlice_op->get_new_axis_mask()),
vec_to_set(StridedSlice_op->get_shrink_axis_mask()));
}
} else {
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/intel_cpu/src/shape_inference/custom/strided_slice.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ class StridedSliceShapeInfer : public ShapeInferEmptyPads {
StridedSliceShapeInfer(size_t output_size,
std::unordered_set<int64_t> begin_mask,
std::unordered_set<int64_t> end_mask,
std::unordered_set<int64_t> new_axis_mask,
std::unordered_set<int64_t> shrink_axis_mask);

Result infer(
Expand All @@ -33,7 +32,6 @@ class StridedSliceShapeInfer : public ShapeInferEmptyPads {
VectorDims m_outputShape;
const std::unordered_set<int64_t> m_begin_mask_set;
const std::unordered_set<int64_t> m_end_mask_set;
const std::unordered_set<int64_t> m_new_axis_mask_set;
const std::unordered_set<int64_t> m_shrink_axis_mask_set;
};

Expand Down
Loading