Skip to content

Commit a163248

Browse files
author
Burlen Loring
committed
fix MCA variable scope in coll han
Changes several variables scope from READONLY to ALL so that they can be set via MPI_T interface Signed-off-by: Burlen Loring <[email protected]>
1 parent 2e859fa commit a163248

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

‎ompi/mca/coll/han/coll_han_component.c‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -257,9 +257,9 @@ mca_coll_han_query_module_from_mca(mca_base_component_t* c,
257257
*storage = ompi_coll_han_available_components[mod_id].component_name;
258258

259259
(void) mca_base_component_var_register(c, param_name, param_doc,
260-
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
260+
MCA_BASE_VAR_TYPE_STRING, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
261261
info_level,
262-
MCA_BASE_VAR_SCOPE_READONLY, storage);
262+
MCA_BASE_VAR_SCOPE_ALL, storage);
263263
module_name = *storage;
264264
mod_id = strtol(module_name, &endptr, 10);
265265
if( module_name == endptr ) { /* no conversion, maybe we got a module name instead */
@@ -288,22 +288,22 @@ static int han_register(void)
288288
COMPONENT_T component;
289289

290290
(void) mca_base_component_var_register(c, "priority", "Priority of the HAN coll component",
291-
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
291+
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
292292
OPAL_INFO_LVL_9,
293-
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_priority);
293+
MCA_BASE_VAR_SCOPE_ALL, &cs->han_priority);
294294

295295
cs->han_output_verbose = 0;
296296
(void) mca_base_component_var_register(c, "verbose", "Verbosity of the HAN coll component (use coll base verbosity if not set)",
297-
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
297+
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
298298
OPAL_INFO_LVL_9,
299-
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_output_verbose);
299+
MCA_BASE_VAR_SCOPE_ALL, &cs->han_output_verbose);
300300

301301
cs->han_bcast_segsize = 65536;
302302
(void) mca_base_component_var_register(c, "bcast_segsize",
303303
"segment size for bcast",
304-
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
304+
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
305305
OPAL_INFO_LVL_9,
306-
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_bcast_segsize);
306+
MCA_BASE_VAR_SCOPE_ALL, &cs->han_bcast_segsize);
307307

308308
cs->han_bcast_up_module = 0;
309309
(void) mca_coll_han_query_module_from_mca(c, "bcast_up_module",
@@ -321,9 +321,9 @@ static int han_register(void)
321321
cs->han_reduce_segsize = 65536;
322322
(void) mca_base_component_var_register(c, "reduce_segsize",
323323
"segment size for reduce",
324-
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
324+
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
325325
OPAL_INFO_LVL_9,
326-
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_reduce_segsize);
326+
MCA_BASE_VAR_SCOPE_ALL, &cs->han_reduce_segsize);
327327

328328
cs->han_reduce_up_module = 0;
329329
(void) mca_coll_han_query_module_from_mca(c, "reduce_up_module",
@@ -340,9 +340,9 @@ static int han_register(void)
340340
cs->han_allreduce_segsize = 65536;
341341
(void) mca_base_component_var_register(c, "allreduce_segsize",
342342
"segment size for allreduce",
343-
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
343+
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
344344
OPAL_INFO_LVL_9,
345-
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_allreduce_segsize);
345+
MCA_BASE_VAR_SCOPE_ALL, &cs->han_allreduce_segsize);
346346

347347
cs->han_allreduce_up_module = 0;
348348
(void) mca_coll_han_query_module_from_mca(c, "allreduce_up_module",
@@ -424,8 +424,8 @@ static int han_register(void)
424424
(void) mca_base_component_var_register(c, "alltoall_pstages",
425425
"Parallel Stages for alltoall. Higher numbers require more memory, "
426426
"and performs more communication in parallel. 0 chooses pstages based on message size.",
427-
MCA_BASE_VAR_TYPE_INT32_T, NULL, 0, 0,
428-
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
427+
MCA_BASE_VAR_TYPE_INT32_T, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
428+
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_ALL,
429429
&cs->han_alltoall_pstages);
430430

431431
cs->han_alltoallv_low_module = 0;
@@ -436,38 +436,38 @@ static int han_register(void)
436436
cs->han_alltoallv_smsc_avg_send_limit = 8192;
437437
(void) mca_base_component_var_register(c, "alltoallv_smsc_avg_send_limit",
438438
"The per-rank averaged send bytes limit above which smsc-based alltoallv will disqualify itself.",
439-
MCA_BASE_VAR_TYPE_INT64_T, NULL, 0, 0,
440-
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
439+
MCA_BASE_VAR_TYPE_INT64_T, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
440+
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_ALL,
441441
&cs->han_alltoallv_smsc_avg_send_limit);
442442
cs->han_alltoallv_smsc_noncontig_activation_limit = 0.10;
443443
(void) mca_base_component_var_register(c, "alltoallv_smsc_noncontig_limit",
444444
"The fractional (0.00-1.00) limit of peers in the communicator which have "
445445
"strided or otherwise non-contiguous data buffers. Above this limit "
446446
"smsc-based alltoallv will ignore the avg_send_limit, and always remain active.",
447-
MCA_BASE_VAR_TYPE_DOUBLE, NULL, 0, 0,
448-
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
447+
MCA_BASE_VAR_TYPE_DOUBLE, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
448+
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_ALL,
449449
&cs->han_alltoallv_smsc_noncontig_activation_limit);
450450

451451
cs->han_reproducible = 0;
452452
(void) mca_base_component_var_register(c, "reproducible",
453453
"whether we need reproducible results "
454454
"(enabling this disables optimisations using topology)"
455455
"0 disable 1 enable, default 0",
456-
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
456+
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
457457
OPAL_INFO_LVL_3,
458-
MCA_BASE_VAR_SCOPE_READONLY, &cs->han_reproducible);
458+
MCA_BASE_VAR_SCOPE_ALL, &cs->han_reproducible);
459459

460460
cs->han_packbuf_bytes = 128*1024;
461461
(void) mca_base_component_var_register(c, "packbuf_bytes",
462462
"The number of bytes in each HAN packbuf.",
463-
MCA_BASE_VAR_TYPE_INT64_T, NULL, 0, 0,
464-
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
463+
MCA_BASE_VAR_TYPE_INT64_T, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
464+
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_ALL,
465465
&cs->han_packbuf_bytes);
466466
cs->han_packbuf_max_count = 32;
467467
(void) mca_base_component_var_register(c, "packbuf_max_count",
468468
"The maximum number of packbufs that are allowed to be allocated.",
469-
MCA_BASE_VAR_TYPE_INT64_T, NULL, 0, 0,
470-
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_READONLY,
469+
MCA_BASE_VAR_TYPE_INT64_T, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
470+
OPAL_INFO_LVL_9, MCA_BASE_VAR_SCOPE_ALL,
471471
&cs->han_packbuf_max_count);
472472

473473
/*
@@ -582,9 +582,9 @@ static int han_register(void)
582582
}
583583

584584
mca_base_component_var_register(c, param_name, param_desc,
585-
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
585+
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
586586
OPAL_INFO_LVL_9,
587-
MCA_BASE_VAR_SCOPE_READONLY,
587+
MCA_BASE_VAR_SCOPE_ALL,
588588
&(cs->mca_sub_components[coll][topo_lvl]));
589589
}
590590
}
@@ -594,27 +594,27 @@ static int han_register(void)
594594
(void) mca_base_component_var_register(&mca_coll_han_component.super.collm_version,
595595
"use_dynamic_file_rules",
596596
"Enable the dynamic selection provided via the dynamic_rules_filename MCA",
597-
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
597+
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
598598
OPAL_INFO_LVL_6,
599-
MCA_BASE_VAR_SCOPE_READONLY,
599+
MCA_BASE_VAR_SCOPE_ALL,
600600
&(cs->use_dynamic_file_rules));
601601

602602
cs->dynamic_rules_filename = NULL;
603603
(void) mca_base_component_var_register(&mca_coll_han_component.super.collm_version,
604604
"dynamic_rules_filename",
605605
"Configuration file containing the dynamic selection rules",
606-
MCA_BASE_VAR_TYPE_STRING, NULL, 0, 0,
606+
MCA_BASE_VAR_TYPE_STRING, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
607607
OPAL_INFO_LVL_6,
608-
MCA_BASE_VAR_SCOPE_READONLY,
608+
MCA_BASE_VAR_SCOPE_ALL,
609609
&(cs->dynamic_rules_filename));
610610

611611
cs->dump_dynamic_rules = false;
612612
(void) mca_base_component_var_register(&mca_coll_han_component.super.collm_version,
613613
"dump_dynamic_rules",
614614
"Switch used to decide if we dump dynamic rules provided by configuration file",
615-
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, 0,
615+
MCA_BASE_VAR_TYPE_BOOL, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
616616
OPAL_INFO_LVL_6,
617-
MCA_BASE_VAR_SCOPE_READONLY,
617+
MCA_BASE_VAR_SCOPE_ALL,
618618
&(cs->dump_dynamic_rules));
619619

620620
if((cs->dump_dynamic_rules || NULL != cs->dynamic_rules_filename)
@@ -631,9 +631,9 @@ static int han_register(void)
631631
"errors printed on rank 0 "
632632
"with a 0 verbosity."
633633
"Useless if coll_base_verbose is 30 or more.",
634-
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
634+
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
635635
OPAL_INFO_LVL_6,
636-
MCA_BASE_VAR_SCOPE_READONLY,
636+
MCA_BASE_VAR_SCOPE_ALL,
637637
&(cs->max_dynamic_errors));
638638

639639

0 commit comments

Comments
 (0)