Skip to content

ompi/oshmem: fix bug in shmem_alltoall in mca/scoll/basic. #4984

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
Apr 3, 2018
Merged

ompi/oshmem: fix bug in shmem_alltoall in mca/scoll/basic. #4984

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
18 changes: 9 additions & 9 deletions oshmem/mca/scoll/basic/scoll_basic_alltoall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,15 +105,13 @@ get_stride_elem(const void *base, ptrdiff_t sst, size_t nelems, size_t elem_size
}

static inline int
get_dst_pe(struct oshmem_group_t *group, int src_blk_idx, int dst_blk_idx)
get_dst_pe(struct oshmem_group_t *group, int src_blk_idx, int dst_blk_idx, int *dst_pe_idx)
{
int dst_grp_pe;

/* index permutation for better distribution of traffic */
dst_grp_pe = (dst_blk_idx + src_blk_idx) % group->proc_count;
(*dst_pe_idx) = (dst_blk_idx + src_blk_idx) % group->proc_count;

/* convert to the global pe */
return oshmem_proc_pe(group->proc_array[dst_grp_pe]);
return oshmem_proc_pe(group->proc_array[*dst_pe_idx]);
}

static int a2as_alg_simple(struct oshmem_group_t *group,
Expand All @@ -127,6 +125,7 @@ static int a2as_alg_simple(struct oshmem_group_t *group,
int dst_pe;
int src_blk_idx;
int dst_blk_idx;
int dst_pe_idx;
size_t elem_idx;

SCOLL_VERBOSE(14,
Expand All @@ -137,14 +136,14 @@ static int a2as_alg_simple(struct oshmem_group_t *group,

for (src_blk_idx = 0; src_blk_idx < group->proc_count; src_blk_idx++) {

dst_pe = get_dst_pe(group, src_blk_idx, dst_blk_idx);
dst_pe = get_dst_pe(group, src_blk_idx, dst_blk_idx, &dst_pe_idx);
for (elem_idx = 0; elem_idx < nelems; elem_idx++) {
rc = MCA_SPML_CALL(put(
get_stride_elem(target, tst, nelems, element_size,
dst_blk_idx, elem_idx),
element_size,
get_stride_elem(source, sst, nelems, element_size,
src_blk_idx, elem_idx),
dst_pe_idx, elem_idx),
dst_pe));
if (OSHMEM_SUCCESS != rc) {
return rc;
Expand All @@ -164,6 +163,7 @@ static int a2a_alg_simple(struct oshmem_group_t *group,
int dst_pe;
int src_blk_idx;
int dst_blk_idx;
int dst_pe_idx;
void *dst_blk;

SCOLL_VERBOSE(14,
Expand All @@ -177,11 +177,11 @@ static int a2a_alg_simple(struct oshmem_group_t *group,

for (src_blk_idx = 0; src_blk_idx < group->proc_count; src_blk_idx++) {

dst_pe = get_dst_pe(group, src_blk_idx, dst_blk_idx);
dst_pe = get_dst_pe(group, src_blk_idx, dst_blk_idx, &dst_pe_idx);
rc = MCA_SPML_CALL(put(dst_blk,
nelems * element_size,
get_stride_elem(source, 1, nelems,
element_size, src_blk_idx, 0),
element_size, dst_pe_idx, 0),
dst_pe));
if (OSHMEM_SUCCESS != rc) {
return rc;
Expand Down