6166278e18
The bug was a race condition in the barrier operation that caused the barrier in MPI_Finalize to fail on very short programs. Scalaiblity was improved by using the daemons to aggregate modex and barrier messages before sending them to the rank=0 proc. Improvement is proportional to ppn, of course, but there really wasn't a scaling problem at low ppn anyway. This modification also paves the way for better allgather operations since now all the data for each node is sitting at the daemon level, and the daemons are now aware that a collective operation on the OOB is underway (so they -can- participate in a collective of their own to support it). Also added better diagnostics to map out the timing associated with MPI_Init - turned on by -mca orte_timing 1. This commit was SVN r17988.
216 строки
7.2 KiB
C
216 строки
7.2 KiB
C
/*
|
|
* Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
|
|
* University Research and Technology
|
|
* Corporation. All rights reserved.
|
|
* Copyright (c) 2004-2005 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.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "orte_config.h"
|
|
#include "orte/constants.h"
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#ifdef HAVE_UNISTD_H
|
|
#include <unistd.h>
|
|
#endif
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
|
|
#include "opal/mca/base/base.h"
|
|
#include "opal/mca/base/mca_base_param.h"
|
|
#include "opal/util/output.h"
|
|
|
|
#include "orte/runtime/orte_globals.h"
|
|
|
|
#include "orte/util/proc_info.h"
|
|
|
|
ORTE_DECLSPEC orte_proc_info_t orte_process_info = {
|
|
/* .my_name = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID},
|
|
/* .my_daemon = */ {ORTE_JOBID_INVALID, ORTE_VPID_INVALID},
|
|
/* .my_daemon_uri = */ NULL,
|
|
/* .num_daemons = */ 0,
|
|
/* .my_hnp = */ {0, 0},
|
|
/* .my_hnp_uri = */ NULL,
|
|
/* .hnp_pid = */ 0,
|
|
/* ,app_num = */ -1,
|
|
/* ,universe_size = */ -1,
|
|
/* .num_procs = */ 1,
|
|
/* .local_rank = */ ORTE_VPID_INVALID,
|
|
/* .num_local_procs = */ 0,
|
|
/* .nodeid = */ ORTE_NODEID_INVALID,
|
|
/* .nodename = */ NULL,
|
|
/* .pid = */ 0,
|
|
/* .singleton = */ false,
|
|
/* .daemon = */ false,
|
|
/* .hnp = */ false,
|
|
/* .tool = */ false,
|
|
/* .tmpdir_base = */ NULL,
|
|
/* .top_session_dir = */ NULL,
|
|
/* .job_session_dir = */ NULL,
|
|
/* .proc_session_dir = */ NULL,
|
|
/* .sock_stdin = */ NULL,
|
|
/* .sock_stdout = */ NULL,
|
|
/* .sock_stderr = */ NULL
|
|
};
|
|
|
|
#define ORTE_MAX_HOSTNAME_SIZE 512
|
|
static bool init=false;
|
|
|
|
int orte_proc_info(void)
|
|
{
|
|
|
|
int tmp;
|
|
char *uri, *ptr;
|
|
size_t len, i;
|
|
char hostname[ORTE_MAX_HOSTNAME_SIZE];
|
|
|
|
if (init) {
|
|
return ORTE_SUCCESS;
|
|
}
|
|
init = true;
|
|
|
|
mca_base_param_reg_string_name("orte", "hnp_uri",
|
|
"HNP contact info",
|
|
true, false, NULL, &uri);
|
|
if (NULL != uri) {
|
|
/* the uri value passed to us will have quote marks around it to protect
|
|
* the value if passed on the command line. We must remove those
|
|
* to have a correct uri string
|
|
*/
|
|
if ('"' == uri[0]) {
|
|
/* if the first char is a quote, then so will the last one be */
|
|
ptr = &uri[1];
|
|
len = strlen(ptr) - 1;
|
|
} else {
|
|
ptr = &uri[0];
|
|
len = strlen(uri);
|
|
}
|
|
|
|
/* we have to copy the string by hand as strndup is a GNU extension
|
|
* and may not be generally available
|
|
*/
|
|
orte_process_info.my_hnp_uri = (char*)malloc(len+1);
|
|
for (i=0; i < len; i++) {
|
|
orte_process_info.my_hnp_uri[i] = ptr[i];
|
|
}
|
|
orte_process_info.my_hnp_uri[len] = '\0'; /* NULL terminate */
|
|
free(uri);
|
|
|
|
}
|
|
|
|
mca_base_param_reg_string_name("orte", "local_daemon_uri",
|
|
"Daemon contact info",
|
|
true, false, NULL, &(orte_process_info.my_daemon_uri));
|
|
|
|
OPAL_OUTPUT_VERBOSE((1, orte_debug_output,
|
|
"proc_info: hnp_uri %s\n\tdaemon uri %s",
|
|
(NULL == orte_process_info.my_hnp_uri) ? "NULL" : orte_process_info.my_hnp_uri,
|
|
(NULL == orte_process_info.my_daemon_uri) ? "NULL" : orte_process_info.my_daemon_uri));
|
|
|
|
mca_base_param_reg_int_name("orte", "num_daemons",
|
|
"Number of daemons in system",
|
|
true, false, -1, &tmp);
|
|
orte_process_info.num_daemons = tmp;
|
|
|
|
mca_base_param_reg_int_name("orte", "app_num",
|
|
"Index of the app_context that defines this proc",
|
|
true, false, -1, &tmp);
|
|
orte_process_info.app_num = tmp;
|
|
|
|
mca_base_param_reg_int_name("orte", "universe_size",
|
|
"Total number of process slots allocated to this job",
|
|
true, false, -1, &tmp);
|
|
orte_process_info.universe_size = tmp;
|
|
|
|
mca_base_param_reg_string_name("tmpdir", "base",
|
|
"Base of the session directory tree",
|
|
false, false, NULL, &(orte_process_info.tmpdir_base));
|
|
|
|
/* get the process id */
|
|
orte_process_info.pid = getpid();
|
|
|
|
/* get the nodeid */
|
|
mca_base_param_reg_int_name("orte", "nodeid",
|
|
"ORTE ID for this node",
|
|
false, false, ORTE_NODEID_INVALID, &tmp);
|
|
orte_process_info.nodeid = (orte_nodeid_t)tmp;
|
|
|
|
/* get the nodename */
|
|
gethostname(hostname, ORTE_MAX_HOSTNAME_SIZE);
|
|
/* overwrite with value if in environment */
|
|
mca_base_param_reg_string_name("orte", "base_nodename",
|
|
"Name of this node, as provided in environment",
|
|
false, false, hostname, &(orte_process_info.nodename));
|
|
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
|
|
int orte_proc_info_finalize(void)
|
|
{
|
|
if (!init) {
|
|
return ORTE_SUCCESS;
|
|
}
|
|
|
|
if (NULL != orte_process_info.tmpdir_base) {
|
|
free(orte_process_info.tmpdir_base);
|
|
orte_process_info.tmpdir_base = NULL;
|
|
}
|
|
|
|
if (NULL != orte_process_info.top_session_dir) {
|
|
free(orte_process_info.top_session_dir);
|
|
orte_process_info.top_session_dir = NULL;
|
|
}
|
|
|
|
if (NULL != orte_process_info.job_session_dir) {
|
|
free(orte_process_info.job_session_dir);
|
|
orte_process_info.job_session_dir = NULL;
|
|
}
|
|
|
|
if (NULL != orte_process_info.proc_session_dir) {
|
|
free(orte_process_info.proc_session_dir);
|
|
orte_process_info.proc_session_dir = NULL;
|
|
|
|
}
|
|
|
|
if (NULL != orte_process_info.nodename) {
|
|
free(orte_process_info.nodename);
|
|
orte_process_info.nodename = NULL;
|
|
}
|
|
|
|
if (NULL != orte_process_info.sock_stdin) {
|
|
free(orte_process_info.sock_stdin);
|
|
orte_process_info.sock_stdin = NULL;
|
|
}
|
|
|
|
if (NULL != orte_process_info.sock_stdout) {
|
|
free(orte_process_info.sock_stdout);
|
|
orte_process_info.sock_stdout = NULL;
|
|
}
|
|
|
|
if (NULL != orte_process_info.sock_stderr) {
|
|
free(orte_process_info.sock_stderr);
|
|
orte_process_info.sock_stderr = NULL;
|
|
}
|
|
|
|
orte_process_info.hnp = false;
|
|
orte_process_info.singleton = false;
|
|
orte_process_info.daemon = false;
|
|
|
|
init = false;
|
|
return ORTE_SUCCESS;
|
|
}
|