0629cdc2d7
command: svn merge -r 7567:7663 https://svn.open-mpi.org/svn/ompi/tmp/jjhursey-rmaps . (where "." is a trunk checkout) The logs from this branch are much more descriptive than I will put here (including a *really* long description from last night). Here's the short version: - fixed some broken implementations in ras and rmaps - "orterun --host ..." now works and has clearly defined semantics (this was the impetus for the branch and all these fixes -- LANL had a requirement for --host to work for 1.0) - there is still a little bit of cleanup left to do post-1.0 (we got correct functionality for 1.0 -- we did not fix bad implementations that still "work") - rds/hostfile and ras/hostfile handshaking - singleton node segment assignments in stage1 - remove the default hostfile (no need for it anymore with the localhost ras component) - clean up pls components to avoid duplicate ras mapping queries - [possible] -bynode/-byslot being specific to a single app context This commit was SVN r7664.
96 строки
2.3 KiB
C
96 строки
2.3 KiB
C
/*
|
|
* Copyright (c) 2004-2005 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$
|
|
*/
|
|
/** @file:
|
|
*/
|
|
|
|
#ifndef ORTE_MCA_RAS_BASE_H
|
|
#define ORTE_MCA_RAS_BASE_H
|
|
|
|
/*
|
|
* includes
|
|
*/
|
|
#include "orte_config.h"
|
|
#include "include/orte_constants.h"
|
|
#include "opal/class/opal_list.h"
|
|
#include "mca/ras/ras.h"
|
|
|
|
|
|
/*
|
|
* Global functions for MCA overall collective open and close
|
|
*/
|
|
#if defined(c_plusplus) || defined(__cplusplus)
|
|
extern "C" {
|
|
#endif
|
|
|
|
/*
|
|
* Internal definitions
|
|
*/
|
|
|
|
struct orte_ras_base_cmp_t {
|
|
/** Base object */
|
|
opal_list_item_t super;
|
|
/** ras component */
|
|
orte_ras_base_component_t *component;
|
|
/** ras module */
|
|
orte_ras_base_module_t* module;
|
|
/** This component's priority */
|
|
int priority;
|
|
};
|
|
typedef struct orte_ras_base_cmp_t orte_ras_base_cmp_t;
|
|
|
|
|
|
/*
|
|
* function definitions
|
|
*/
|
|
ORTE_DECLSPEC int orte_ras_base_open(void);
|
|
ORTE_DECLSPEC int orte_ras_base_find_available(void);
|
|
ORTE_DECLSPEC int orte_ras_base_allocate(orte_jobid_t job,
|
|
orte_ras_base_module_t **m);
|
|
ORTE_DECLSPEC int orte_ras_base_finalize(void);
|
|
ORTE_DECLSPEC int orte_ras_base_close(void);
|
|
|
|
ORTE_DECLSPEC int orte_ras_base_allocate_nodes(orte_jobid_t jobid,
|
|
opal_list_t* nodes);
|
|
|
|
/*
|
|
* globals that might be needed
|
|
*/
|
|
|
|
|
|
typedef struct orte_ras_base_t {
|
|
int ras_output;
|
|
opal_list_t ras_opened;
|
|
bool ras_opened_valid;
|
|
opal_list_t ras_available;
|
|
bool ras_available_valid;
|
|
size_t ras_num_nodes;
|
|
} orte_ras_base_t;
|
|
|
|
ORTE_DECLSPEC extern orte_ras_base_t orte_ras_base;
|
|
|
|
/** Class declaration */
|
|
OMPI_DECLSPEC OBJ_CLASS_DECLARATION(orte_ras_base_cmp_t);
|
|
|
|
|
|
/*
|
|
* external API functions will be documented in the mca/ns/ns.h file
|
|
*/
|
|
|
|
#if defined(c_plusplus) || defined(__cplusplus)
|
|
}
|
|
#endif
|
|
#endif
|