From 1e02bb056f10e5f74ac3d579925a22ef298e2fb0 Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Fri, 8 Aug 2014 20:40:18 +0000 Subject: [PATCH] openib btl check-help-strings cleanup This commit was SVN r32470. --- opal/mca/btl/openib/btl_openib_ini.c | 14 +++---- .../connect/help-mpi-btl-openib-cpc-ibcm.txt | 36 ------------------ .../help-mpi-btl-openib-cpc-rdmacm.txt | 15 ++++---- opal/mca/btl/openib/help-mpi-btl-openib.txt | 37 ------------------- 4 files changed, 14 insertions(+), 88 deletions(-) delete mode 100644 opal/mca/btl/openib/connect/help-mpi-btl-openib-cpc-ibcm.txt diff --git a/opal/mca/btl/openib/btl_openib_ini.c b/opal/mca/btl/openib/btl_openib_ini.c index 15cba2cd4c..9cb92026b9 100644 --- a/opal/mca/btl/openib/btl_openib_ini.c +++ b/opal/mca/btl/openib/btl_openib_ini.c @@ -276,7 +276,7 @@ static int parse_file(char *filename) /* Warn that there is no current section, and ignore this parameter */ if (!showed_no_section_warning) { - show_help("ini file:not in a section"); + opal_show_help("help-mpi-btl-openib.txt", "ini file:not in a section", true); showed_no_section_warning = true; } /* Parse it and then dump it */ @@ -290,7 +290,7 @@ static int parse_file(char *filename) default: /* anything else is an error */ if (!showed_unexpected_tokens_warning) { - show_help("ini file:unexpected token"); + opal_show_help("help-mpi-btl-openib.txt", "ini file:unexpected token", true); showed_unexpected_tokens_warning = true; } break; @@ -338,7 +338,7 @@ static int parse_line(parsed_section_values_t *sv) /* The first thing we have to see is an "=" */ val = btl_openib_ini_yylex(); if (btl_openib_ini_parse_done || BTL_OPENIB_INI_PARSE_EQUAL != val) { - show_help("ini file:expected equals"); + opal_show_help("help-mpi-btl-openib.txt", "ini file:expected equals", true); return OPAL_ERROR; } @@ -352,7 +352,7 @@ static int parse_line(parsed_section_values_t *sv) val = btl_openib_ini_yylex(); if (BTL_OPENIB_INI_PARSE_NEWLINE != val && BTL_OPENIB_INI_PARSE_DONE != val) { - show_help("ini file:expected newline"); + opal_show_help("help-mpi-btl-openib.txt", "ini file:expected newline", true); free(value); return OPAL_ERROR; } @@ -361,7 +361,7 @@ static int parse_line(parsed_section_values_t *sv) /* If we did not get EOL or EOF, something is wrong */ else if (BTL_OPENIB_INI_PARSE_DONE != val && BTL_OPENIB_INI_PARSE_NEWLINE != val) { - show_help("ini file:expected newline"); + opal_show_help("help-mpi-btl-openib.txt", "ini file:expected newline", true); return OPAL_ERROR; } @@ -424,7 +424,7 @@ static int parse_line(parsed_section_values_t *sv) /* Have no idea what this parameter is. Not an error -- just ignore it */ if (!showed_unknown_field_warning) { - opal_show_help("help-mpi-btl-openib.txt", + opal_show_help("help-mpi-btl-openib.txt", "ini file:unknown field", true, ini_filename, btl_openib_ini_yynewlines, key_buffer); @@ -693,7 +693,7 @@ int opal_btl_openib_ini_intify_list(char *value, uint32_t **values, int *len) } /* - * Trival helper function + * Trival helper function -don't use this, it confuses check-help-strings.pl tool */ static inline void show_help(const char *topic) { diff --git a/opal/mca/btl/openib/connect/help-mpi-btl-openib-cpc-ibcm.txt b/opal/mca/btl/openib/connect/help-mpi-btl-openib-cpc-ibcm.txt deleted file mode 100644 index fd6727ab33..0000000000 --- a/opal/mca/btl/openib/connect/help-mpi-btl-openib-cpc-ibcm.txt +++ /dev/null @@ -1,36 +0,0 @@ -# -*- text -*- -# -# Copyright (c) 2008 Cisco Systems, Inc. All rights reserved. -# $COPYRIGHT$ -# -# Additional copyrights may follow -# -# $HEADER$ -# -# This is the US/English help file for Open MPI's OpenFabrics IB CM -# support (the openib BTL). -# -[unhandled error] -The InfiniBand Connection Manager (IBCM) received an unexpected error -when it attempted to send a connection %s. Your MPI job is -likely to hang or crash; sorry. - - Local host: %s - Error code: %d -# -[timeout not found] -The InfiniBand Connection Manager (IBCM) timed out when sending a -connection %s, but Open MPI was unable to find a matching send -request. This should not happen. Your MPI job is likely to hang or -crash; sorry. - - Local host: %s -Host: %s -# -[cannot raise btl error] - -The InfiniBand Connection Manager (IBCM) failed in some way, but is -unable to find a way to raise an error properly. This should not -happen. Your MPI job is likely to crash or hang, sorry. - - Local host: %s diff --git a/opal/mca/btl/openib/connect/help-mpi-btl-openib-cpc-rdmacm.txt b/opal/mca/btl/openib/connect/help-mpi-btl-openib-cpc-rdmacm.txt index f865b5a4ee..65c35ed91a 100644 --- a/opal/mca/btl/openib/connect/help-mpi-btl-openib-cpc-rdmacm.txt +++ b/opal/mca/btl/openib/connect/help-mpi-btl-openib-cpc-rdmacm.txt @@ -10,14 +10,6 @@ # This is the US/English help file for Open MPI's OpenFabrics RDMA CM # support (the openib BTL). # -[no valid ip] -It appears that an OpenFabrics device does not have an IP address -associated with it. The OpenFabrics RDMA CM connection scheme -*requires* IP addresses to be setup in order to function properly. - - Local host: %s - Local device: %s -# [could not find matching endpoint] The OpenFabrics device in an MPI process received an RDMA CM connect request for a peer that it could not identify as part of this MPI job. @@ -36,6 +28,13 @@ an illegal TCP port value. TCP ports must be between 0 and 65536 TCP port: %d This value was ignored. +# +[illegal retry count] +The btl_openib_connect_rdmacm_retry_count MCA parameter was used to specify +an illegal retry count. + + Retry count: %d + # [illegal timeout] The btl_openib_connect_rdmacm_resolve_timeout parameter was used to diff --git a/opal/mca/btl/openib/help-mpi-btl-openib.txt b/opal/mca/btl/openib/help-mpi-btl-openib.txt index b70ccfdcc1..2dbbbe8638 100644 --- a/opal/mca/btl/openib/help-mpi-btl-openib.txt +++ b/opal/mca/btl/openib/help-mpi-btl-openib.txt @@ -515,29 +515,6 @@ for this run. Local host: %s btl_openib_receive_queues: %s # -[XRC with wrong OOB] -WARNING: You must use the "xoob" OpenFabrics (openib) connection -manager when XRC ("X") queues are specified in the -btl_openib_receive_queues MCA parameter. Either remove the X queues -from btl_openib_receive_queues or ensure to use the "xoob" connection -manager by setting btl_openib_connect to "xoob". The OpenFabrics BTL -will therefore be deactivated for this run. - - Local host: %s - Number of XRC RQs: %d -# -[SRQ or PP with wrong OOB] -WARNING: You must use the "oob" OpenFabrics (openib) connection -manager when PP ("P") or SRQ ("S") queues are specified in the -btl_openib_receive_queues MCA parameter. Either remove the P or S -queues from btl_openib_receive_queues or ensure to use the "oob" -connection manager by setting btl_openib_connect to "oob". The -OpenFabrics BTL will therefore be deactivated for this run. - - Local host: %s - Number of SRQs: %d - Number of PPRQs: %d -# [non optimal rd_win] WARNING: rd_win specification is non optimal. For maximum performance it is advisable to configure rd_win bigger than (rd_num - rd_low), but currently @@ -662,20 +639,6 @@ Such mixed network trasport configuration is not supported by Open MPI. Remote Adapter: (vendor 0x%x, part ID %d) Remote transport type: %s # -[mem-reg-fail] -The OpenFabrics (openib) BTL failed to register memory in the driver. -Please check /var/log/messages or dmesg for driver specific failure -reason. -The failure occured here: - - Local host: %s - Device: %s - Function: %s() - Errno says: %s (errno=%d) - -You may need to consult with your system administrator to get this -problem fixed. -# [gid index too large] Open MPI tried to use a GID index that was too large for an OpenFabrics device (i.e., the GID index does not exist on this