Skip to content

Rework the MPI_Op support. #9719

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 2 commits into from
Jan 23, 2022
Merged

Rework the MPI_Op support. #9719

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
1215776
Change the loop order in the base MPI_Op to allow for more
bosilca Dec 2, 2021
786bd35
Fix the test to respect arrays boundaries.
bosilca Dec 2, 2021
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
20 changes: 10 additions & 10 deletions ompi/mca/op/base/op_base_functions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
int i; \
type *a = (type *) in; \
type *b = (type *) out; \
for (i = 0; i < *count; ++i) { \
for (i = *count; i > 0; i--) { \
*(b++) op *(a++); \
} \
}
Expand All @@ -65,7 +65,7 @@
int i; \
type *a = (type *) in; \
type *b = (type *) out; \
for (i = 0; i < *count; ++i) { \
for (i = *count; i > 0; i--) { \
*(b) = current_func(*(b), *(a)); \
++b; \
++a; \
Expand Down Expand Up @@ -93,7 +93,7 @@
int i; \
ompi_op_predefined_##type_name##_t *a = (ompi_op_predefined_##type_name##_t*) in; \
ompi_op_predefined_##type_name##_t *b = (ompi_op_predefined_##type_name##_t*) out; \
for (i = 0; i < *count; ++i, ++a, ++b) { \
for (i = *count; i > 0; i--, ++a, ++b) { \
if (a->v op b->v) { \
b->v = a->v; \
b->k = a->k; \
Expand All @@ -117,7 +117,7 @@
int i; \
type (*a)[2] = (type (*)[2]) in; \
type (*b)[2] = (type (*)[2]) out; \
for (i = 0; i < *count; ++i, ++a, ++b) { \
for (i = *count; i > 0; i--, ++a, ++b) { \
(*b)[0] += (*a)[0]; \
(*b)[1] += (*a)[1]; \
} \
Expand All @@ -138,7 +138,7 @@
type (*a)[2] = (type (*)[2]) in; \
type (*b)[2] = (type (*)[2]) out; \
type c[2]; \
for (i = 0; i < *count; ++i, ++a, ++b) { \
for (i = *count; i > 0; i--, ++a, ++b) { \
c[0] = (*a)[0] * (*b)[0] - (*a)[1] * (*b)[1]; \
c[1] = (*a)[0] * (*b)[1] + (*a)[1] * (*b)[0]; \
(*b)[0] = c[0]; \
Expand Down Expand Up @@ -693,7 +693,7 @@ LOC_FUNC(minloc, long_double_int, <)
type *a1 = (type *) in1; \
type *a2 = (type *) in2; \
type *b = (type *) out; \
for (i = 0; i < *count; ++i) { \
for (i = *count; i > 0; i--) { \
*(b++) = *(a1++) op *(a2++); \
} \
}
Expand All @@ -715,7 +715,7 @@ LOC_FUNC(minloc, long_double_int, <)
type *a1 = (type *) in1; \
type *a2 = (type *) in2; \
type *b = (type *) out; \
for (i = 0; i < *count; ++i) { \
for (i = *count; i > 0; i--) { \
*(b) = current_func(*(a1), *(a2)); \
++b; \
++a1; \
Expand Down Expand Up @@ -748,7 +748,7 @@ LOC_FUNC(minloc, long_double_int, <)
ompi_op_predefined_##type_name##_t *a1 = (ompi_op_predefined_##type_name##_t*) in1; \
ompi_op_predefined_##type_name##_t *a2 = (ompi_op_predefined_##type_name##_t*) in2; \
ompi_op_predefined_##type_name##_t *b = (ompi_op_predefined_##type_name##_t*) out; \
for (i = 0; i < *count; ++i, ++a1, ++a2, ++b ) { \
for (i = *count; i > 0; i--, ++a1, ++a2, ++b ) { \
if (a1->v op a2->v) { \
b->v = a1->v; \
b->k = a1->k; \
Expand Down Expand Up @@ -778,7 +778,7 @@ LOC_FUNC(minloc, long_double_int, <)
type (*a1)[2] = (type (*)[2]) in1; \
type (*a2)[2] = (type (*)[2]) in2; \
type (*b)[2] = (type (*)[2]) out; \
for (i = 0; i < *count; ++i, ++a1, ++a2, ++b) { \
for (i = *count; i > 0; i--, ++a1, ++a2, ++b) { \
(*b)[0] = (*a1)[0] + (*a2)[0]; \
(*b)[1] = (*a1)[1] + (*a2)[1]; \
} \
Expand All @@ -800,7 +800,7 @@ LOC_FUNC(minloc, long_double_int, <)
type (*a1)[2] = (type (*)[2]) in1; \
type (*a2)[2] = (type (*)[2]) in2; \
type (*b)[2] = (type (*)[2]) out; \
for (i = 0; i < *count; ++i, ++a1, ++a2, ++b) { \
for (i = *count; i > 0; i--, ++a1, ++a2, ++b) { \
(*b)[0] = (*a1)[0] * (*a2)[0] - (*a1)[1] * (*a2)[1]; \
(*b)[1] = (*a1)[0] * (*a2)[1] + (*a1)[1] * (*a2)[0]; \
} \
Expand Down
3 changes: 2 additions & 1 deletion test/datatype/reduce_local.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ do { \
for(int _r = repeats; _r > 0; _r--) { \
memcpy(_p2, _p3, sizeof(TYPE) * (COUNT)); \
tstart = MPI_Wtime(); \
MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT), (MPITYPE), (MPIOP)); \
MPI_Reduce_local(_p1+_k, _p2+_k, (COUNT)-_k, (MPITYPE), (MPIOP)); \
tend = MPI_Wtime(); \
duration[_k] += (tend - tstart); \
if( check ) { \
Expand Down Expand Up @@ -281,6 +281,7 @@ int main(int argc, char **argv)
" -1 <number> : (mis)alignment in elements for the first op\n"
" -2 <number> : (mis)alignment in elements for the result\n"
" -v: increase the verbosity level\n"
" -f: turn off correctness checks\n"
" -h: this help message\n",
argv[0]);
exit(0);
Expand Down