Skip to content

scoll/ucc: proper fallback #10294

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
janjust merged 1 commit into from
Apr 20, 2022
Merged

scoll/ucc: proper fallback #10294

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions oshmem/mca/scoll/ucc/scoll_ucc_alltoall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ int mca_scoll_ucc_alltoall(struct oshmem_group_t *group,
mca_scoll_ucc_module_t *ucc_module;
size_t count;
ucc_coll_req_h req;
int rc;

UCC_VERBOSE(3, "running ucc alltoall");
ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_alltoall_module;
Expand All @@ -87,7 +88,7 @@ int mca_scoll_ucc_alltoall(struct oshmem_group_t *group,
return OSHMEM_SUCCESS;
fallback:
UCC_VERBOSE(3, "running fallback alltoall");
return ucc_module->previous_alltoall(group, target, source, dst, sst, nelems,
element_size, pSync, alg);
PREVIOUS_SCOLL_FN(ucc_module, alltoall, group, target, source,
dst, sst, nelems, element_size, pSync, alg);
return rc;
}

5 changes: 4 additions & 1 deletion oshmem/mca/scoll/ucc/scoll_ucc_barrier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ int mca_scoll_ucc_barrier(struct oshmem_group_t *group, long *pSync, int alg)
{
mca_scoll_ucc_module_t *ucc_module;
ucc_coll_req_h req;
int rc;

UCC_VERBOSE(3, "running ucc barrier");
ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_barrier_module;
Expand All @@ -44,6 +45,8 @@ int mca_scoll_ucc_barrier(struct oshmem_group_t *group, long *pSync, int alg)
return OSHMEM_SUCCESS;
fallback:
UCC_VERBOSE(3, "running fallback barrier");
return ucc_module->previous_barrier(group, pSync, alg);
PREVIOUS_SCOLL_FN(ucc_module, barrier, group,
pSync, alg);
return rc;
}

6 changes: 4 additions & 2 deletions oshmem/mca/scoll/ucc/scoll_ucc_broadcast.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ int mca_scoll_ucc_broadcast(struct oshmem_group_t *group,
mca_scoll_ucc_module_t * ucc_module;
void * buf;
ucc_coll_req_h req;
int rc;

UCC_VERBOSE(3, "running ucc bcast");
ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_broadcast_module;
Expand All @@ -72,6 +73,7 @@ int mca_scoll_ucc_broadcast(struct oshmem_group_t *group,
return OSHMEM_SUCCESS;
fallback:
UCC_VERBOSE(3, "running fallback bcast");
return ucc_module->previous_broadcast(group, PE_root, target, source,
nlong, pSync, nlong_type, alg);
PREVIOUS_SCOLL_FN(ucc_module, broadcast, group, PE_root, target, source,
nlong, pSync, nlong_type, alg);
return rc;
}
6 changes: 4 additions & 2 deletions oshmem/mca/scoll/ucc/scoll_ucc_collect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ int mca_scoll_ucc_collect(struct oshmem_group_t *group,
{
mca_scoll_ucc_module_t *ucc_module;
ucc_coll_req_h req;
int rc;

UCC_VERBOSE(3, "running ucc collect");
ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_collect_module;
Expand All @@ -69,6 +70,7 @@ int mca_scoll_ucc_collect(struct oshmem_group_t *group,
return OSHMEM_SUCCESS;
fallback:
UCC_VERBOSE(3, "running fallback collect");
return ucc_module->previous_collect(group, target, source, nlong,
pSync, nlong_type, alg);
PREVIOUS_SCOLL_FN(ucc_module, collect, group, target, source,
nlong, pSync, nlong_type, alg);
return rc;
}
6 changes: 4 additions & 2 deletions oshmem/mca/scoll/ucc/scoll_ucc_reduce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ int mca_scoll_ucc_reduce(struct oshmem_group_t *group,
mca_scoll_ucc_module_t *ucc_module;
size_t count;
ucc_coll_req_h req;
int rc;

UCC_VERBOSE(3, "running ucc reduce");
ucc_module = (mca_scoll_ucc_module_t *) group->g_scoll.scoll_reduce_module;
Expand All @@ -93,6 +94,7 @@ int mca_scoll_ucc_reduce(struct oshmem_group_t *group,
return OSHMEM_SUCCESS;
fallback:
UCC_VERBOSE(3, "running fallback reduction");
return ucc_module->previous_reduce(group, op, target, source, nlong, pSync,
pWrk, alg);
PREVIOUS_SCOLL_FN(ucc_module, reduce, group, op, target,
source, nlong, pSync, pWrk, alg);
return rc;
}