Remove some redundancy from redundant MCA redundant param names. The
following names are all new for v1.3, and therefore haven't been officially released yet: * btl_openib_of_cq_size * btl_openib_of_max_inline_data * btl_openib_of_pkey * btl_openib_of_psn * btl_openib_of_mtu The "_of_" (for OpenFabrics) in there is redundant. It used to be "_ib_", indicating that these values are pretty much passed directly to the verbs stack. But I think the "openib" in the name implies this already; having "_of_" in there just seems redundant, makes the name longer, and seems redundant. It's also redundant. So I took those "_of_"'s out of the MCA names. The old (v1.2) names are still valid (but deprecated), such ash btl_openib_ib_cq_size. This commit was SVN r19718.
Этот коммит содержится в:
родитель
b8b7619312
Коммит
46d7ffd298
@ -260,7 +260,7 @@ int btl_openib_register_mca_params(void)
|
||||
16, (int*) &mca_btl_openib_component.reg_mru_len,
|
||||
REGINT_GE_ONE));
|
||||
|
||||
CHECK(reg_int("of_cq_size", "ib_cq_size",
|
||||
CHECK(reg_int("cq_size", "ib_cq_size",
|
||||
"Size of the OpenFabrics completion "
|
||||
"queue (will automatically be set to a minimum of "
|
||||
"(2 * number_of_peers * btl_openib_rd_num))",
|
||||
@ -268,7 +268,7 @@ int btl_openib_register_mca_params(void)
|
||||
mca_btl_openib_component.ib_cq_size[BTL_OPENIB_LP_CQ] =
|
||||
mca_btl_openib_component.ib_cq_size[BTL_OPENIB_HP_CQ] = (uint32_t) ival;
|
||||
|
||||
CHECK(reg_int("of_max_inline_data", "ib_max_inline_data",
|
||||
CHECK(reg_int("max_inline_data", "ib_max_inline_data",
|
||||
"Maximum size of inline data segment "
|
||||
"(-1 = use device default, "
|
||||
"0 = run-time probe to discover max value, "
|
||||
@ -276,7 +276,7 @@ int btl_openib_register_mca_params(void)
|
||||
-1, &ival, REGINT_NEG_ONE_OK | REGINT_GE_ZERO));
|
||||
mca_btl_openib_component.ib_max_inline_data = (int32_t) ival;
|
||||
|
||||
CHECK(reg_string("of_pkey", "ib_pkey_val",
|
||||
CHECK(reg_string("pkey", "ib_pkey_val",
|
||||
"OpenFabrics partition key (pkey) value. "
|
||||
"Unsigned integer decimal or hex values are allowed (e.g., \"3\" or \"0x3f\") and will be masked against the maximum allowable IB paritition key value (0x7fff)",
|
||||
"0", &pkey, 0));
|
||||
@ -291,7 +291,7 @@ int btl_openib_register_mca_params(void)
|
||||
}
|
||||
free(pkey);
|
||||
|
||||
CHECK(reg_int("of_psn", "ib_psn",
|
||||
CHECK(reg_int("psn", "ib_psn",
|
||||
"OpenFabrics packet sequence starting number "
|
||||
"(must be >= 0)",
|
||||
0, &ival, REGINT_GE_ZERO));
|
||||
@ -313,7 +313,7 @@ int btl_openib_register_mca_params(void)
|
||||
/* Don't try to recover from this */
|
||||
return OMPI_ERR_OUT_OF_RESOURCE;
|
||||
}
|
||||
CHECK(reg_int("of_mtu", "ib_mtu", msg, IBV_MTU_1024, &ival, 0));
|
||||
CHECK(reg_int("mtu", "ib_mtu", msg, IBV_MTU_1024, &ival, 0));
|
||||
free(msg);
|
||||
if (ival < IBV_MTU_1024 || ival > IBV_MTU_4096) {
|
||||
orte_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user