2011-10-10 22:13:04 +04:00
|
|
|
%option nounput
|
|
|
|
|
2008-02-28 04:57:57 +03:00
|
|
|
%{ /* -*- C -*- */
|
|
|
|
/*
|
|
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
|
|
* University Research and Technology
|
|
|
|
* Corporation. All rights reserved.
|
|
|
|
* Copyright (c) 2004-2006 The University of Tennessee and The University
|
|
|
|
* of Tennessee Research Foundation. All rights
|
|
|
|
* reserved.
|
|
|
|
* Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
|
|
|
|
* University of Stuttgart. All rights reserved.
|
|
|
|
* Copyright (c) 2004-2005 The Regents of the University of California.
|
|
|
|
* All rights reserved.
|
At long last, the fabled revision to the affinity system has arrived. A more detailed explanation of how this all works will be presented here:
https://svn.open-mpi.org/trac/ompi/wiki/ProcessPlacement
The wiki page is incomplete at the moment, but I hope to complete it over the next few days. I will provide updates on the devel list. As the wiki page states, the default and most commonly used options remain unchanged (except as noted below). New, esoteric and complex options have been added, but unless you are a true masochist, you are unlikely to use many of them beyond perhaps an initial curiosity-motivated experimentation.
In a nutshell, this commit revamps the map/rank/bind procedure to take into account topology info on the compute nodes. I have, for the most part, preserved the default behaviors, with three notable exceptions:
1. I have at long last bowed my head in submission to the system admin's of managed clusters. For years, they have complained about our default of allowing users to oversubscribe nodes - i.e., to run more processes on a node than allocated slots. Accordingly, I have modified the default behavior: if you are running off of hostfile/dash-host allocated nodes, then the default is to allow oversubscription. If you are running off of RM-allocated nodes, then the default is to NOT allow oversubscription. Flags to override these behaviors are provided, so this only affects the default behavior.
2. both cpus/rank and stride have been removed. The latter was demanded by those who didn't understand the purpose behind it - and I agreed as the users who requested it are no longer using it. The former was removed temporarily pending implementation.
3. vm launch is now the sole method for starting OMPI. It was just too darned hard to maintain multiple launch procedures - maybe someday, provided someone can demonstrate a reason to do so.
As Jeff stated, it is impossible to fully test a change of this size. I have tested it on Linux and Mac, covering all the default and simple options, singletons, and comm_spawn. That said, I'm sure others will find problems, so I'll be watching MTT results until this stabilizes.
This commit was SVN r25476.
2011-11-15 07:40:11 +04:00
|
|
|
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
|
2008-02-28 04:57:57 +03:00
|
|
|
* $COPYRIGHT$
|
|
|
|
*
|
|
|
|
* Additional copyrights may follow
|
|
|
|
*
|
|
|
|
* $HEADER$
|
|
|
|
*/
|
|
|
|
#include "orte_config.h"
|
|
|
|
|
|
|
|
#include <stdio.h>
|
2008-09-05 16:44:19 +04:00
|
|
|
#ifdef HAVE_UNISTD_H
|
2008-02-28 04:57:57 +03:00
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#include "orte/util/hostfile/hostfile_lex.h"
|
|
|
|
|
|
|
|
/*
|
|
|
|
* local functions
|
|
|
|
*/
|
2009-08-20 15:42:18 +04:00
|
|
|
BEGIN_C_DECLS
|
2008-02-28 04:57:57 +03:00
|
|
|
|
|
|
|
int orte_util_hostfile_wrap(void);
|
|
|
|
|
2009-08-20 15:42:18 +04:00
|
|
|
END_C_DECLS
|
2008-02-28 04:57:57 +03:00
|
|
|
|
|
|
|
int orte_util_hostfile_wrap(void)
|
|
|
|
{
|
|
|
|
orte_util_hostfile_done = true;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* global variables
|
|
|
|
*/
|
|
|
|
int orte_util_hostfile_line=1;
|
|
|
|
orte_hostfile_value_t orte_util_hostfile_value;
|
|
|
|
bool orte_util_hostfile_done = false;
|
|
|
|
|
|
|
|
%}
|
|
|
|
|
|
|
|
WHITE [\f\t\v ]
|
|
|
|
|
|
|
|
%x comment
|
|
|
|
|
|
|
|
%%
|
|
|
|
|
|
|
|
{WHITE}*\n { orte_util_hostfile_line++;
|
|
|
|
return ORTE_HOSTFILE_NEWLINE; }
|
|
|
|
#.*\n { orte_util_hostfile_line++;
|
|
|
|
return ORTE_HOSTFILE_NEWLINE; }
|
|
|
|
"//".*\n { orte_util_hostfile_line++;
|
|
|
|
return ORTE_HOSTFILE_NEWLINE; }
|
|
|
|
|
|
|
|
"/*" { BEGIN(comment);
|
|
|
|
return ORTE_HOSTFILE_NEWLINE; }
|
|
|
|
<comment>[^*\n]* ; /* Eat up non '*'s */
|
|
|
|
<comment>"*"+[^*/\n]* ; /* Eat '*'s not followed by a '/' */
|
|
|
|
<comment>\n { orte_util_hostfile_line++;
|
|
|
|
return ORTE_HOSTFILE_NEWLINE; }
|
|
|
|
<comment>"*"+"/" { BEGIN(INITIAL); /* Done with Block Comment */
|
|
|
|
return ORTE_HOSTFILE_NEWLINE; }
|
|
|
|
|
|
|
|
\"[^\"]*\" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_QUOTED_STRING; }
|
|
|
|
|
|
|
|
{WHITE}+ ; /* whitespace */
|
|
|
|
|
|
|
|
"=" { return ORTE_HOSTFILE_EQUAL; }
|
|
|
|
|
|
|
|
cpu { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_CPU; }
|
|
|
|
count { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_COUNT; }
|
|
|
|
slots { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS; }
|
|
|
|
"slots-max" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
slots_max { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
"max-slots" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
max_slots { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
"cpu-max" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
cpu_max { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
"max-cpu" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
max_cpu { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
"count-max" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
count_max { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
"max-count" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
max_count { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOTS_MAX; }
|
|
|
|
|
2009-08-13 20:08:43 +04:00
|
|
|
rank { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_RANK; }
|
|
|
|
slot { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SLOT; }
|
|
|
|
|
2008-02-28 04:57:57 +03:00
|
|
|
username { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_USERNAME; }
|
|
|
|
"user-name" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_USERNAME; }
|
|
|
|
"user_name" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_USERNAME; }
|
|
|
|
|
2009-08-11 06:51:27 +04:00
|
|
|
boards { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_BOARDS; }
|
|
|
|
|
|
|
|
sockets { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SOCKETS_PER_BOARD; }
|
|
|
|
|
|
|
|
sockets_per_board { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SOCKETS_PER_BOARD; }
|
|
|
|
|
|
|
|
"sockets-per-board" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_SOCKETS_PER_BOARD; }
|
|
|
|
|
|
|
|
cores { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_CORES_PER_SOCKET; }
|
|
|
|
|
|
|
|
cores_per_socket { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_CORES_PER_SOCKET; }
|
|
|
|
|
|
|
|
"cores-per-socket" { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_CORES_PER_SOCKET; }
|
|
|
|
|
2008-08-19 19:16:27 +04:00
|
|
|
\+n[0-9]+ { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_RELATIVE; }
|
|
|
|
\+[eE][\:][0-9]+ { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_RELATIVE; }
|
Per request from Terry, make -host and -hostfile respect order when used as filters. In other words, if you specify -host host1,host3,host2, then we should use the hosts in that order. Previously, we used them in whatever order they were found in the allocation - all the -host did was tell us which nodes to use, not what order to use them in.
Relative node syntax remains supported. Also, if you specify empty nodes, but have a specific empty node called out later, we will not include that node in the empties we add. I'll provide examples in the manpage.
This commit was SVN r19402.
2008-08-26 06:56:10 +04:00
|
|
|
\+[eE] { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_RELATIVE; }
|
2008-08-19 19:16:27 +04:00
|
|
|
|
|
|
|
|
2008-02-28 04:57:57 +03:00
|
|
|
[0-9]+ { orte_util_hostfile_value.ival = atol(yytext);
|
|
|
|
return ORTE_HOSTFILE_INT; }
|
|
|
|
%{ /* First detect hosts as standard Strings (but without ".")
|
|
|
|
* then username@IPv4 or IPV4, then username@IPv6 or IPv6,
|
|
|
|
* followed by username@hostname or hostname
|
|
|
|
*/
|
|
|
|
%}
|
|
|
|
|
|
|
|
[A-za-z0-9_\-,:*@]* { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_STRING; }
|
|
|
|
|
|
|
|
([A-Za-z0-9][A-Za-z0-9_\-]*"@")?([0-9]{1,3}"."){3}[0-9]{1,3} {
|
|
|
|
orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_IPV4; }
|
|
|
|
|
|
|
|
([A-Za-z0-9][A-Za-z0-9_\-]*"@")?([A-Fa-f0-9]{0,4}":")+[":"]*([A-Fa-f0-9]{0,4}":")+[A-Fa-f0-9]{1,4} {
|
|
|
|
orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_IPV6; }
|
|
|
|
|
2008-03-05 07:54:57 +03:00
|
|
|
(\^?[A-Za-z0-9][A-Za-z0-9_\-]*"@")?[A-Za-z][A-Za-z0-9_\-\.]* {
|
2008-02-28 04:57:57 +03:00
|
|
|
orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_HOSTNAME; }
|
|
|
|
|
|
|
|
. { orte_util_hostfile_value.sval = yytext;
|
|
|
|
return ORTE_HOSTFILE_ERROR; }
|
|
|
|
|
|
|
|
%%
|