Skip to content

Changed simplify_iteration_two_strides, simplify_iteration_three_strides #1054

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

Merged
merged 1 commit into from
Feb 3, 2023
Merged

Changed simplify_iteration_two_strides, simplify_iteration_three_strides #1054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 36 additions & 12 deletions dpctl/tensor/libtensor/include/utils/strided_iters.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,11 +428,19 @@ int simplify_iteration_two_strides(const int nd,
std::iota(pos.begin(), pos.end(), 0);

std::stable_sort(
pos.begin(), pos.end(), [&strides1, &shape](int i1, int i2) {
auto abs_str1 = (strides1[i1] < 0) ? -strides1[i1] : strides1[i1];
auto abs_str2 = (strides1[i2] < 0) ? -strides1[i2] : strides1[i2];
return (abs_str1 > abs_str2) ||
(abs_str1 == abs_str2 && shape[i1] > shape[i2]);
pos.begin(), pos.end(), [&strides1, &strides2, &shape](int i1, int i2) {
auto abs_str1_i1 =
(strides1[i1] < 0) ? -strides1[i1] : strides1[i1];
auto abs_str1_i2 =
(strides1[i2] < 0) ? -strides1[i2] : strides1[i2];
auto abs_str2_i1 =
(strides2[i1] < 0) ? -strides2[i1] : strides2[i1];
auto abs_str2_i2 =
(strides2[i2] < 0) ? -strides2[i2] : strides2[i2];
return (abs_str1_i1 > abs_str1_i2) ||
(abs_str1_i1 == abs_str1_i2 &&
(abs_str2_i1 > abs_str2_i2 ||
(abs_str2_i1 == abs_str2_i2 && shape[i1] > shape[i2])));
});

std::vector<ShapeTy> shape_w;
Expand All @@ -458,6 +466,7 @@ int simplify_iteration_two_strides(const int nd,
strides1_w.push_back(str1_p);
strides2_w.push_back(str2_p);
}

int nd_ = nd;
while (contractable) {
bool changed = false;
Expand Down Expand Up @@ -570,13 +579,28 @@ int simplify_iteration_three_strides(const int nd,
std::vector<int> pos(nd);
std::iota(pos.begin(), pos.end(), 0);

std::stable_sort(
pos.begin(), pos.end(), [&strides1, &shape](int i1, int i2) {
auto abs_str1 = (strides1[i1] < 0) ? -strides1[i1] : strides1[i1];
auto abs_str2 = (strides1[i2] < 0) ? -strides1[i2] : strides1[i2];
return (abs_str1 > abs_str2) ||
(abs_str1 == abs_str2 && shape[i1] > shape[i2]);
});
std::stable_sort(pos.begin(), pos.end(),
[&strides1, &strides2, &strides3, &shape](int i1, int i2) {
auto abs_str1_i1 =
(strides1[i1] < 0) ? -strides1[i1] : strides1[i1];
auto abs_str1_i2 =
(strides1[i2] < 0) ? -strides1[i2] : strides1[i2];
auto abs_str2_i1 =
(strides2[i1] < 0) ? -strides2[i1] : strides2[i1];
auto abs_str2_i2 =
(strides2[i2] < 0) ? -strides2[i2] : strides2[i2];
auto abs_str3_i1 =
(strides3[i1] < 0) ? -strides3[i1] : strides3[i1];
auto abs_str3_i2 =
(strides3[i2] < 0) ? -strides3[i2] : strides3[i2];
return (abs_str1_i1 > abs_str1_i2) ||
((abs_str1_i1 == abs_str1_i2) &&
((abs_str2_i1 > abs_str2_i2) ||
((abs_str2_i1 == abs_str2_i2) &&
((abs_str3_i1 > abs_str3_i2) ||
((abs_str3_i1 == abs_str3_i2) &&
(shape[i1] > shape[i2]))))));
});

std::vector<ShapeTy> shape_w;
std::vector<StridesTy> strides1_w;
Expand Down