ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

check-help-strings cleanup

Просмотр исходного кода 
This commit was SVN r32491.
Этот коммит содержится в:
Gilles Gouaillardet 2014-08-11 03:19:57 +00:00
родитель 03fbd9a12d
Коммит b565e69b86
6 изменённых файлов: 31 добавлений и 19 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
ompi/mca/bcol/iboffload/bcol_iboffload_component.c
Просмотреть файл

@ -5,6 +5,8 @@
* Copyright (c) 2014 The University of Tennessee and The University
* of Tennessee Research Foundation. All rights
* reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -319,7 +321,7 @@ static int iboffload_load_devices(void)
if (0 == num_devs || NULL == cm->ib_devs) {
IBOFFLOAD_ERROR(("No IB devices found"));
/* No hca error*/
opal_show_help("help-mpi-btl-openib.txt", "no-nics", true);
opal_show_help("help-mpi-btl-base.txt", "btl:no-nics", true);
return OMPI_ERROR;
}

24
ompi/mca/bcol/iboffload/bcol_iboffload_mca.c
Просмотреть файл

@ -1,6 +1,8 @@
/*
* Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved.
* Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -140,60 +142,60 @@ static int reg_bool(const char* param_name,
int mca_bcol_iboffload_verify_params(void)
{
if (mca_bcol_iboffload_component.min_rnr_timer > 31) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_min_rnr_timer > 31",
"bcol_iboffload_ib_min_rnr_timer reset to 31");
mca_bcol_iboffload_component.min_rnr_timer = 31;
} else if (mca_bcol_iboffload_component.min_rnr_timer < 0){
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_min_rnr_timer < 0",
"bcol_iboffload_ib_min_rnr_timer reset to 0");
mca_bcol_iboffload_component.min_rnr_timer = 0;
}
if (mca_bcol_iboffload_component.timeout > 31) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_timeout > 31",
"bcol_iboffload_ib_timeout reset to 31");
mca_bcol_iboffload_component.timeout = 31;
} else if (mca_bcol_iboffload_component.timeout < 0) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_timeout < 0",
"bcol_iboffload_ib_timeout reset to 0");
mca_bcol_iboffload_component.timeout = 0;
}
if (mca_bcol_iboffload_component.retry_count > 7) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_retry_count > 7",
"bcol_iboffload_ib_retry_count reset to 7");
mca_bcol_iboffload_component.retry_count = 7;
} else if (mca_bcol_iboffload_component.retry_count < 0) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_retry_count < 0",
"bcol_iboffload_ib_retry_count reset to 0");
mca_bcol_iboffload_component.retry_count = 0;
}
if (mca_bcol_iboffload_component.max_rdma_dst_ops > 7) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_rnr_retry > 7",
"bcol_iboffload_ib_rnr_retry reset to 7");
mca_bcol_iboffload_component.max_rdma_dst_ops = 7;
} else if (mca_bcol_iboffload_component.max_rdma_dst_ops < 0) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_rnr_retry < 0",
"bcol_iboffload_ib_rnr_retry reset to 0");
mca_bcol_iboffload_component.max_rdma_dst_ops = 0;
}
if (mca_bcol_iboffload_component.service_level > 15) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_service_level > 15",
"bcol_iboffload_ib_service_level reset to 15");
mca_bcol_iboffload_component.service_level = 15;
} else if (mca_bcol_iboffload_component.service_level < 0) {
opal_show_help("help-mpi-bcol-iboffload.txt", "invalid mca param value",
opal_show_help("help-mpi-btl-openib.txt", "invalid mca param value",
true, "bcol_iboffload_ib_service_level < 0",
"bcol_iboffload_ib_service_level reset to 0");
mca_bcol_iboffload_component.service_level = 0;
@ -201,7 +203,7 @@ int mca_bcol_iboffload_verify_params(void)
if(mca_bcol_iboffload_component.buffer_alignment <= 1 ||
(mca_bcol_iboffload_component.buffer_alignment & (mca_bcol_iboffload_component.buffer_alignment - 1))) {
opal_show_help("help-mpi-bcol-iboffload.txt", "wrong buffer alignment",
opal_show_help("help-mpi-btl-openib.txt", "wrong buffer alignment",
true, mca_bcol_iboffload_component.buffer_alignment, ompi_process_info.nodename, 64);
mca_bcol_iboffload_component.buffer_alignment = 64;
}

6
ompi/mca/sbgp/ibnet/sbgp_ibnet_component.c
Просмотреть файл

@ -1,7 +1,9 @@
/*
* Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved.
* Copyright (c) 2009-2012 Mellanox Technologies. All rights reserved.
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2012 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -514,7 +516,7 @@ static int ibnet_load_devices(void)
if(0 == num_devs || NULL == ib_devs) {
IBNET_VERBOSE(10, ("No ib devices found"));
/* No hca error*/
opal_show_help("help-mpi-sbgp-ibnet.txt", "no-nics", true);
opal_show_help("help-mpi-btl-base.txt", "btl:no-nics", true);
return OMPI_ERROR;
}

8
opal/mca/common/ofacm/common_ofacm_base.c
Просмотреть файл

@ -4,6 +4,8 @@
*
* Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved.
* Copyright (c) 2013 Intel, Inc. All rights reserved
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -284,7 +286,7 @@ int opal_common_ofacm_base_register(mca_base_component_t *base)
}
}
if (NULL == all[i]) {
opal_show_help("help-mpi-common-ofacm-cpc-base.txt",
opal_show_help("help-mpi-common-ofacm-base.txt",
"cpc name not found", true,
"include", opal_proc_local_get()->proc_hostname,
"include", opal_common_ofacm_cpc_include, temp[j],
@ -310,7 +312,7 @@ int opal_common_ofacm_base_register(mca_base_component_t *base)
}
}
if (NULL == all[i]) {
opal_show_help("help-mpi-common-ofacm-cpc-base.txt",
opal_show_help("help-mpi-common-ofacm-base.txt",
"cpc name not found", true,
"exclude", opal_proc_local_get()->proc_hostname,
"exclude", opal_common_ofacm_cpc_exclude, temp[j],
@ -464,7 +466,7 @@ int opal_common_ofacm_base_select_for_local_port(opal_common_ofacm_base_dev_desc
/* If we got an empty array, then no CPCs were eligible. Doh! */
if (0 == cpc_index) {
opal_show_help("help-mpi-common-ofacm-cpc-base.txt",
opal_show_help("help-mpi-common-ofacm-base.txt",
"no cpcs for port", true,
opal_proc_local_get()->proc_hostname,
ibv_get_device_name(dev->ib_dev),

4
opal/mca/common/ofacm/common_ofacm_oob.c
Просмотреть файл

@ -16,6 +16,8 @@
* Copyright (c) 2008-2012 Mellanox Technologies. All rights reserved.
*
* Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -584,7 +586,7 @@ static int qp_create_one(opal_common_ofacm_base_local_connection_context_t *cont
if (init_attr.cap.max_inline_data < req_inline) {
context->qps[qp].ib_inline_max = init_attr.cap.max_inline_data;
opal_show_help("help-mpi-common-ofacm-cpc-base.txt",
opal_show_help("help-mpi-common-ofacm-base.txt",
"inline truncated", true, opal_proc_local_get()->proc_hostname,
req_inline, init_attr.cap.max_inline_data);
} else {

4
opal/mca/common/ofacm/common_ofacm_xoob.c
Просмотреть файл

@ -5,6 +5,8 @@
* All rights reserved.
* Copyright (c) 2009-2012 Oak Ridge National Laboratory. All rights reserved.
* Copyright (c) 2013 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2014 Research Organization for Information Science
* and Technology (RIST). All rights reserved.
* $COPYRIGHT$
*
* Additional copyrights may follow
@ -829,7 +831,7 @@ static int xoob_send_qp_create
if (init_attr.cap.max_inline_data < req_inline) {
context->qps[0].ib_inline_max = init_attr.cap.max_inline_data;
opal_show_help("help-mpi-common-ofacm-cpc-base.txt",
opal_show_help("help-mpi-common-ofacm-base.txt",
"inline truncated", true, opal_proc_local_get()->proc_hostname,
req_inline, init_attr.cap.max_inline_data);
} else {