Skip to content

V5.0.x: (s)coll/ucc: don't force cls by default #10496

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
Jun 23, 2022
Merged

V5.0.x: (s)coll/ucc: don't force cls by default #10496

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
2 changes: 1 addition & 1 deletion ompi/mca/coll/ucc/coll_ucc_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ mca_coll_ucc_component_t mca_coll_ucc_component = {
0, /* ucc_verbose */
0, /* ucc_enable */
2, /* ucc_np */
"basic", /* cls */
"", /* cls */
COLL_UCC_CTS_STR, /* requested coll_types string */
UCC_VERSION_STRING /* ucc version */
};
Expand Down
10 changes: 6 additions & 4 deletions ompi/mca/coll/ucc/coll_ucc_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,10 +234,12 @@ static int mca_coll_ucc_init_ctx() {
UCC_ERROR("UCC lib config read failed");
return OMPI_ERROR;
}
if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) {
ucc_lib_config_release(lib_config);
UCC_ERROR("failed to modify UCC lib config to set CLS");
return OMPI_ERROR;
if (strlen(cm->cls) > 0) {
if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) {
ucc_lib_config_release(lib_config);
UCC_ERROR("failed to modify UCC lib config to set CLS");
return OMPI_ERROR;
}
}

if (UCC_OK != ucc_init(&lib_params, lib_config, &cm->ucc_lib)) {
Expand Down
2 changes: 1 addition & 1 deletion oshmem/mca/scoll/ucc/scoll_ucc_component.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ mca_scoll_ucc_component_t mca_scoll_ucc_component = {
0, /* verbose level */
0, /* ucc_enable */
2, /* ucc_np */
"basic", /* cls */
"", /* cls */
SCOLL_UCC_CTS_STR, /* cts */
0, /* nr_modules */
false, /* libucc_initialized */
Expand Down
12 changes: 6 additions & 6 deletions oshmem/mca/scoll/ucc/scoll_ucc_module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,13 @@ static int mca_scoll_ucc_init(oshmem_group_t *osh_group)
UCC_ERROR("UCC lib config read failed");
return OSHMEM_ERROR;
}

if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) {
ucc_lib_config_release(lib_config);
UCC_ERROR("failed to modify UCC lib config to set CLS");
return OSHMEM_ERROR;
if (strlen(cm->cls) > 0) {
if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) {
ucc_lib_config_release(lib_config);
UCC_ERROR("failed to modify UCC lib config to set CLS");
return OSHMEM_ERROR;
}
}

if (UCC_OK != ucc_init(&lib_params, lib_config, &cm->ucc_lib)) {
UCC_ERROR("UCC lib init failed");
ucc_lib_config_release(lib_config);
Expand Down