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.
108 строки
3.0 KiB
C
108 строки
3.0 KiB
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.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*/
|
|
/** @file:
|
|
*/
|
|
|
|
#ifndef MCA_ESS_BASE_H
|
|
#define MCA_ESS_BASE_H
|
|
|
|
#include "orte_config.h"
|
|
#include "orte/types.h"
|
|
|
|
#include "opal/mca/mca.h"
|
|
#include "opal/dss/dss_types.h"
|
|
#include "opal/class/opal_pointer_array.h"
|
|
#include "opal/class/opal_value_array.h"
|
|
|
|
#include "orte/runtime/orte_globals.h"
|
|
|
|
#include "orte/mca/ess/ess.h"
|
|
|
|
BEGIN_C_DECLS
|
|
|
|
/*
|
|
* Global functions for MCA overall collective open and close
|
|
*/
|
|
|
|
/**
|
|
* Open the ess framework
|
|
*/
|
|
ORTE_DECLSPEC int orte_ess_base_open(void);
|
|
|
|
/**
|
|
* Select a ess module
|
|
*/
|
|
ORTE_DECLSPEC int orte_ess_base_select(void);
|
|
|
|
/**
|
|
* Close the ess framework
|
|
*/
|
|
ORTE_DECLSPEC int orte_ess_base_close(void);
|
|
|
|
/*
|
|
* The verbose channel for debug output
|
|
*/
|
|
ORTE_DECLSPEC extern int orte_ess_base_output;
|
|
|
|
ORTE_DECLSPEC extern opal_list_t orte_ess_base_components_available;
|
|
|
|
#if !ORTE_DISABLE_FULL_SUPPORT
|
|
|
|
/*
|
|
* Internal helper functions used by components
|
|
*/
|
|
ORTE_DECLSPEC int orte_ess_env_get(void);
|
|
|
|
ORTE_DECLSPEC int orte_ess_base_std_prolog(void);
|
|
|
|
ORTE_DECLSPEC int orte_ess_base_app_setup(void);
|
|
ORTE_DECLSPEC int orte_ess_base_app_finalize(void);
|
|
ORTE_DECLSPEC void orte_ess_base_app_abort(int status, bool report) __opal_attribute_noreturn__;
|
|
|
|
ORTE_DECLSPEC int orte_ess_base_tool_setup(void);
|
|
ORTE_DECLSPEC int orte_ess_base_tool_finalize(void);
|
|
|
|
ORTE_DECLSPEC int orte_ess_base_orted_setup(void);
|
|
ORTE_DECLSPEC int orte_ess_base_orted_finalize(void);
|
|
|
|
/*
|
|
* Job/nid/pmap support
|
|
*/
|
|
ORTE_DECLSPEC int orte_ess_base_build_nidmap(opal_buffer_t *buffer,
|
|
opal_pointer_array_t *nidmap,
|
|
opal_value_array_t *pmap, orte_vpid_t *num_procs);
|
|
|
|
ORTE_DECLSPEC orte_pmap_t* orte_ess_base_lookup_pmap(opal_pointer_array_t *jobmap, orte_process_name_t *proc);
|
|
|
|
ORTE_DECLSPEC orte_nid_t* orte_ess_base_lookup_nid(opal_pointer_array_t *nidmap,
|
|
opal_pointer_array_t *jobmap,
|
|
orte_process_name_t *proc);
|
|
|
|
/*
|
|
* Put functions
|
|
*/
|
|
ORTE_DECLSPEC int orte_ess_env_put(orte_std_cntr_t num_procs,
|
|
orte_std_cntr_t num_local_procs,
|
|
char ***env);
|
|
|
|
#endif /* ORTE_DISABLE_FULL_SUPPORT */
|
|
|
|
END_C_DECLS
|
|
|
|
#endif
|