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.
58 строки
1.5 KiB
C
58 строки
1.5 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
|
|
*
|
|
* Resource Allocation (Host)
|
|
*/
|
|
#ifndef ORTE_RAS_LOCALHOST_H
|
|
#define ORTE_RAS_LOCALHOST_H
|
|
|
|
#include "mca/ras/ras.h"
|
|
#if defined(c_plusplus) || defined(__cplusplus)
|
|
extern "C" {
|
|
#endif
|
|
|
|
/**
|
|
* Localhost-specific RAS component struct
|
|
*/
|
|
struct orte_ras_localhost_component_t {
|
|
/** Base RAS component */
|
|
orte_ras_base_component_t super;
|
|
/** What's the priority of this component */
|
|
int priority;
|
|
};
|
|
/**
|
|
* Convenience typedef
|
|
*/
|
|
typedef struct orte_ras_localhost_component_t orte_ras_localhost_component_t;
|
|
|
|
/**
|
|
* Component export structure
|
|
*/
|
|
OMPI_COMP_EXPORT extern orte_ras_localhost_component_t mca_ras_localhost_component;
|
|
|
|
/**
|
|
* Module init function
|
|
*/
|
|
orte_ras_base_module_t *orte_ras_localhost_init(int* priority);
|
|
|
|
#if defined(c_plusplus) || defined(__cplusplus)
|
|
}
|
|
#endif
|
|
|
|
#endif
|