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

Squeeze dyn dim allow compatible #3035

Merged
merged 4 commits into from
May 10, 2024
Merged

Squeeze dyn dim allow compatible #3035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
10914b9
initial
CharlieL7 May 3, 2024
d74e9f1
formatting
CharlieL7 May 3, 2024
8b31714
Add test
CharlieL7 May 9, 2024
f327b0a
Merge branch 'develop' into squeeze_dyn_dim_allow_compatible
CharlieL7 May 9, 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
10 changes: 8 additions & 2 deletions src/include/migraphx/op/squeeze.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,18 @@ struct squeeze
auto input_shape = inputs[0];
if(input_shape.dynamic())
{
// Allow for any dynamic_dimension that intersects with {1, 1}.
// Assuming that the shape at run-time will be compatible.
if(std::any_of(axes.begin(), axes.end(), [&](auto axis) {
return input_shape.dyn_dims()[axis] != 1;
return not input_shape.dyn_dims()
.at(axis)
.intersection(shape::dynamic_dimension{1, 1})
.has_value();
;
}))
{
MIGRAPHX_THROW(
"SQUEEZE: dynamic axis dimension should be equal to {1, 1, 0} or {1, 1, 1}");
"SQUEEZE: dynamic axis dimension should have an intersection with {1, 1}");
}
std::vector<shape::dynamic_dimension> dyn_dims = {};
if(axes.empty())
Expand Down
6 changes: 5 additions & 1 deletion test/op_shape_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4569,7 +4569,11 @@ TEST_CASE(test_squeeze_dyn)
migraphx::shape s3{migraphx::shape::float_type, {{1, 4}, {3, 3}, {3, 3}}};
expect_shape(s3, migraphx::make_op("squeeze"), s1);

throws_shape(migraphx::make_op("squeeze", {{"axes", {0}}}), s1);
// allowing to squeeze dynamic_dimension that intersect with {1, 1}
migraphx::shape s4{migraphx::shape::float_type, {{1, 1}, {3, 3}, {1, 1}, {3, 3}}};
expect_shape(s4, migraphx::make_op("squeeze", {{"axes", {0}}}), s1);

throws_shape(migraphx::make_op("squeeze", {{"axes", {2}}}), s1);
}

TEST_CASE(test_squeeze_dyn_neg_axes)
Expand Down
Loading