Skip to content

Commit 0e4fd94

Browse files
authored
Merge pull request #10497 from vspetrov/v4.1.x
V4.1.x: (s)coll/ucc: don't force cls by default
2 parents b2f23c1 + 88034bb commit 0e4fd94

File tree

4 files changed

+14
-12
lines changed

4 files changed

+14
-12
lines changed

ompi/mca/coll/ucc/coll_ucc_component.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ mca_coll_ucc_component_t mca_coll_ucc_component = {
4949
0, /* ucc_verbose */
5050
0, /* ucc_enable */
5151
2, /* ucc_np */
52-
"basic", /* cls */
52+
"", /* cls */
5353
COLL_UCC_CTS_STR, /* requested coll_types string */
5454
UCC_VERSION_STRING /* ucc version */
5555
};

ompi/mca/coll/ucc/coll_ucc_module.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -234,10 +234,12 @@ static int mca_coll_ucc_init_ctx() {
234234
UCC_ERROR("UCC lib config read failed");
235235
return OMPI_ERROR;
236236
}
237-
if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) {
238-
ucc_lib_config_release(lib_config);
239-
UCC_ERROR("failed to modify UCC lib config to set CLS");
240-
return OMPI_ERROR;
237+
if (strlen(cm->cls) > 0) {
238+
if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) {
239+
ucc_lib_config_release(lib_config);
240+
UCC_ERROR("failed to modify UCC lib config to set CLS");
241+
return OMPI_ERROR;
242+
}
241243
}
242244

243245
if (UCC_OK != ucc_init(&lib_params, lib_config, &cm->ucc_lib)) {

oshmem/mca/scoll/ucc/scoll_ucc_component.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ mca_scoll_ucc_component_t mca_scoll_ucc_component = {
6060
0, /* verbose level */
6161
0, /* ucc_enable */
6262
2, /* ucc_np */
63-
"basic", /* cls */
63+
"", /* cls */
6464
SCOLL_UCC_CTS_STR, /* cts */
6565
0, /* nr_modules */
6666
false /* libucc_initialized */

oshmem/mca/scoll/ucc/scoll_ucc_module.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -220,13 +220,13 @@ static int mca_scoll_ucc_init_ctx(oshmem_group_t *osh_group)
220220
UCC_ERROR("UCC lib config read failed");
221221
return OSHMEM_ERROR;
222222
}
223-
224-
if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) {
225-
ucc_lib_config_release(lib_config);
226-
UCC_ERROR("failed to modify UCC lib config to set CLS");
227-
return OSHMEM_ERROR;
223+
if (strlen(cm->cls) > 0) {
224+
if (UCC_OK != ucc_lib_config_modify(lib_config, "CLS", cm->cls)) {
225+
ucc_lib_config_release(lib_config);
226+
UCC_ERROR("failed to modify UCC lib config to set CLS");
227+
return OSHMEM_ERROR;
228+
}
228229
}
229-
230230
if (UCC_OK != ucc_init(&lib_params, lib_config, &cm->ucc_lib)) {
231231
UCC_ERROR("UCC lib init failed");
232232
ucc_lib_config_release(lib_config);

0 commit comments

Comments
 (0)