ba5498cdc6
1. repair of the linear and direct routed modules 2. repair of the ompi/pubsub/orte module to correctly init routes to the ompi-server, and correctly handle failure to correctly parse the provided ompi-server URI 3. modification of orterun to accept both "file" and "FILE" for designating where the ompi-server URI is to be found - purely a convenience feature 4. resolution of a message ordering problem during the connect/accept handshake that allowed the "send-first" proc to attempt to send to the "recv-first" proc before the HNP had actually updated its routes. Let this be a further reminder to all - message ordering is NOT guaranteed in the OOB 5. Repair the ompi/dpm/orte module to correctly init routes during connect/accept. Reminder to all: messages sent to procs in another job family (i.e., started by a different mpirun) are ALWAYS routed through the respective HNPs. As per the comments in orte/routed, this is REQUIRED to maintain connect/accept (where only the root proc on each side is capable of init'ing the routes), allow communication between mpirun's using different routing modules, and to minimize connections on tools such as ompi-server. It is all taken care of "under the covers" by the OOB to ensure that a route back to the sender is maintained, even when the different mpirun's are using different routed modules. 6. corrections in the orte/odls to ensure proper identification of daemons participating in a dynamic launch 7. corrections in build/nidmap to support update of an existing nidmap during dynamic launch 8. corrected implementation of the update_arch function in the ESS, along with consolidation of a number of ESS operations into base functions for easier maintenance. The ability to support info from multiple jobs was added, although we don't currently do so - this will come later to support further fault recovery strategies 9. minor updates to several functions to remove unnecessary and/or no longer used variables and envar's, add some debugging output, etc. 10. addition of a new macro ORTE_PROC_IS_DAEMON that resolves to true if the provided proc is a daemon There is still more cleanup to be done for efficiency, but this at least works. Tested on single-node Mac, multi-node SLURM via odin. Tests included connect/accept, publish/lookup/unpublish, comm_spawn, comm_spawn_multiple, and singleton comm_spawn. Fixes ticket #1256 This commit was SVN r18804.
72 строки
2.0 KiB
C
72 строки
2.0 KiB
C
/*
|
|
* Copyright (c) 2004-2007 The Trustees of Indiana University.
|
|
* All rights reserved.
|
|
* Copyright (c) 2004-2005 The Trustees of the University of Tennessee.
|
|
* 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 "ompi_config.h"
|
|
|
|
#include "opal/mca/mca.h"
|
|
#include "opal/mca/base/base.h"
|
|
|
|
#include "orte/util/show_help.h"
|
|
#include "opal/mca/base/mca_base_param.h"
|
|
|
|
#include "orte/util/show_help.h"
|
|
|
|
#include "ompi/mca/dpm/dpm.h"
|
|
#include "ompi/mca/dpm/base/base.h"
|
|
|
|
#include "ompi/mca/dpm/base/static-components.h"
|
|
|
|
/*
|
|
* Globals
|
|
*/
|
|
OMPI_DECLSPEC int ompi_dpm_base_output = -1;
|
|
OMPI_DECLSPEC ompi_dpm_base_module_t ompi_dpm = {
|
|
NULL,
|
|
ompi_dpm_base_null_connect_accept,
|
|
ompi_dpm_base_null_disconnect,
|
|
ompi_dpm_base_null_spawn,
|
|
ompi_dpm_base_null_dyn_init,
|
|
ompi_dpm_base_null_dyn_finalize,
|
|
ompi_dpm_base_null_mark_dyncomm,
|
|
ompi_dpm_base_null_open_port,
|
|
ompi_dpm_base_null_close_port,
|
|
NULL
|
|
};
|
|
opal_list_t ompi_dpm_base_components_available;
|
|
ompi_dpm_base_component_t ompi_dpm_base_selected_component;
|
|
|
|
/**
|
|
* Function for finding and opening either all MCA components,
|
|
* or the one that was specifically requested via a MCA parameter.
|
|
*/
|
|
int ompi_dpm_base_open(void)
|
|
{
|
|
/* Debugging/Verbose output */
|
|
ompi_dpm_base_output = opal_output_open(NULL);
|
|
|
|
/* Open up all available components */
|
|
if (OPAL_SUCCESS !=
|
|
mca_base_components_open("dpm",
|
|
ompi_dpm_base_output,
|
|
mca_dpm_base_static_components,
|
|
&ompi_dpm_base_components_available,
|
|
true)) {
|
|
return OMPI_ERROR;
|
|
}
|
|
|
|
return OMPI_SUCCESS;
|
|
}
|