583bf425c0
Short version: remove opal_paffinity_alone and restore mpi_paffinity_alone. ORTE makes various information available for the MPI layer to decide what it wants to do in terms of processor affinity. Details: * remove opal_paffinity_alone MCA param; restore mpi_paffinity_alone MCA param * move opal_paffinity_slot_list param registration to paffinity base * ompi_mpi_init() calls opal_paffinity_base_slot_list_set(); if that succeeds use that. If no slot list was set, see if mpi_paffinity_alone was set. If so, bind this process to its Node Local Rank (NLR). The NLR is the ORTE-maintained slot ID; if you COMM_SPAWN to a host in this ORTE universe that already has procs on it, the NLR for the new job will start at N (not 0). So this is slightly better than mpi_paffinity_alone in the v1.2 series. * If a slot list is specified *and* mpi_paffinity_alone is set, we display an error and abort. * Remove calls from rmaps/rank_file component to register and lookup opal_paffinity mca params. * Remove code in orte/odls that set affinities - instead, have them just pass a slot_list if it exists. * Cleanup the orte/odls code that determined oversubscribed/want_processor as these were just opposites of each other. This commit was SVN r18874. The following Trac tickets were found above: Ticket 1383 --> https://svn.open-mpi.org/trac/ompi/ticket/1383
96 строки
2.8 KiB
C
96 строки
2.8 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 (c) 2006 Los Alamos National Security, LLC. All rights
|
|
* reserved.
|
|
* Copyright (c) 2008 Cisco Systems, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
|
|
#include "opal_config.h"
|
|
|
|
#include <time.h>
|
|
#ifdef HAVE_SIGNAL_H
|
|
#include <signal.h>
|
|
#endif
|
|
|
|
#include "opal/constants.h"
|
|
#include "opal/runtime/opal.h"
|
|
#include "opal/util/output.h"
|
|
#include "opal/util/show_help.h"
|
|
#include "opal/mca/base/mca_base_param.h"
|
|
#include "opal/threads/mutex.h"
|
|
|
|
int opal_register_params(void)
|
|
{
|
|
/*
|
|
* This string is going to be used in opal/util/stacktrace.c
|
|
*/
|
|
{
|
|
char *string = NULL;
|
|
int j;
|
|
int signals[] = {
|
|
#ifdef SIGABRT
|
|
SIGABRT,
|
|
#endif
|
|
#ifdef SIGBUS
|
|
SIGBUS,
|
|
#endif
|
|
#ifdef SIGFPE
|
|
SIGFPE,
|
|
#endif
|
|
#ifdef SIGSEGV
|
|
SIGSEGV,
|
|
#endif
|
|
-1
|
|
};
|
|
for (j = 0 ; signals[j] != -1 ; ++j) {
|
|
if (j == 0) {
|
|
asprintf(&string, "%d", signals[j]);
|
|
} else {
|
|
char *tmp;
|
|
asprintf(&tmp, "%s,%d", string, signals[j]);
|
|
free(string);
|
|
string = tmp;
|
|
}
|
|
}
|
|
|
|
mca_base_param_reg_string_name("opal", "signal",
|
|
"If a signal is received, display the stack trace frame",
|
|
false, false, string, NULL);
|
|
free(string);
|
|
}
|
|
|
|
#if OMPI_ENABLE_DEBUG
|
|
|
|
|
|
mca_base_param_reg_int_name("opal", "progress_debug",
|
|
"Set to non-zero to debug progress engine features",
|
|
false, false, 0, NULL);
|
|
|
|
{
|
|
int value;
|
|
mca_base_param_reg_int_name("opal", "debug_locks",
|
|
"Debug mutex usage within Open MPI. On a "
|
|
"non-threaded build, this enables integer counters and "
|
|
"warning messages when double-locks are detected.",
|
|
false, false, 0, &value);
|
|
if (value) opal_mutex_check_locks = true;
|
|
}
|
|
#endif
|
|
|
|
return OPAL_SUCCESS;
|
|
}
|