* Merge in pcm extension from the tmp/brbarret-pcm branch. Extends the
PCM to have startup functionality (COFS should still work fine). This commit was SVN r1916.
Этот коммит содержится в:
Brian Barrett
родитель
d4f42ec944
Коммит
9243100d79
@ -20,15 +20,9 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
int mca_pcm_base_open(void);
|
||||
int mca_oob_base_select(bool *allow_multi_user_threads,
|
||||
int mca_pcm_base_select(bool *allow_multi_user_threads,
|
||||
bool *have_hidden_threads);
|
||||
int mca_pcm_base_close(void);
|
||||
|
||||
bool mca_pcm_base_is_checkpointable(void);
|
||||
|
||||
int mca_pcm_base_checkpoint(void);
|
||||
int mca_pcm_base_continue(void);
|
||||
int mca_pcm_base_restart(void);
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
@ -38,7 +32,7 @@ extern "C" {
|
||||
* Globals
|
||||
*/
|
||||
extern int mca_pcm_base_output;
|
||||
extern ompi_list_t mca_pcm_base_modules_available;
|
||||
extern ompi_list_t mca_pcm_base_components_available;
|
||||
extern mca_pcm_base_component_t mca_pcm_base_selected_component;
|
||||
extern mca_pcm_base_module_t mca_pcm;
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
#include "mca/mca.h"
|
||||
#include "mca/base/base.h"
|
||||
#include "mca/pcm/pcm.h"
|
||||
#include "mca/pcm/base/base.h"
|
||||
|
||||
|
||||
int mca_pcm_base_close(void)
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include "mca/mca.h"
|
||||
#include "mca/base/base.h"
|
||||
#include "mca/pcm/pcm.h"
|
||||
|
||||
#include "mca/pcm/base/base.h"
|
||||
|
||||
/*
|
||||
* The following file was created by configure. It contains extern
|
||||
|
||||
@ -11,7 +11,7 @@
|
||||
#include "mca/mca.h"
|
||||
#include "mca/base/base.h"
|
||||
#include "mca/pcm/pcm.h"
|
||||
|
||||
#include "mca/pcm/base/base.h"
|
||||
|
||||
/**
|
||||
* Function for selecting one module from all those that are
|
||||
@ -46,13 +46,13 @@ int mca_pcm_base_select(bool *allow_multi_user_threads,
|
||||
|
||||
ompi_output_verbose(10, mca_pcm_base_output,
|
||||
"select: initializing %s component %s",
|
||||
component->pcmm_version.mca_type_name,
|
||||
component->pcmm_version.mca_component_name);
|
||||
if (NULL == component->pcmm_init) {
|
||||
component->pcm_version.mca_type_name,
|
||||
component->pcm_version.mca_component_name);
|
||||
if (NULL == component->pcm_init) {
|
||||
ompi_output_verbose(10, mca_pcm_base_output,
|
||||
"select: no init function; ignoring component");
|
||||
} else {
|
||||
module = component->pcmm_init(&priority, &user_threads, &hidden_threads);
|
||||
module = component->pcm_init(&priority, &user_threads, &hidden_threads);
|
||||
if (NULL == module) {
|
||||
ompi_output_verbose(10, mca_pcm_base_output,
|
||||
"select: init returned failure");
|
||||
@ -89,16 +89,16 @@ int mca_pcm_base_select(bool *allow_multi_user_threads,
|
||||
|
||||
/* Finalize */
|
||||
|
||||
if (NULL != component->pcmm_finalize) {
|
||||
if (NULL != component->pcm_finalize) {
|
||||
|
||||
/* Blatently ignore the return code (what would we do to
|
||||
recover, anyway? This component is going away, so errors
|
||||
don't matter anymore) */
|
||||
|
||||
component->pcmm_finalize();
|
||||
component->pcm_finalize();
|
||||
ompi_output_verbose(10, mca_pcm_base_output,
|
||||
"select: component %s finalized",
|
||||
component->pcmm_version.mca_component_name);
|
||||
component->pcm_version.mca_component_name);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -118,7 +118,7 @@ int mca_pcm_base_select(bool *allow_multi_user_threads,
|
||||
*have_hidden_threads = best_hidden_threads;
|
||||
ompi_output_verbose(10, mca_pcm_base_output,
|
||||
"select: component %s initialized",
|
||||
component->pcmm_version.mca_component_name);
|
||||
component->pcm_version.mca_component_name);
|
||||
|
||||
/* All done */
|
||||
|
||||
|
||||
@ -42,8 +42,16 @@ mca_pcm_base_component_1_0_0_t mca_pcm_cofs_component = {
|
||||
|
||||
|
||||
struct mca_pcm_base_module_1_0_0_t mca_pcm_cofs_1_0_0 = {
|
||||
mca_pcm_cofs_get_peers,
|
||||
mca_pcm_cofs_get_self
|
||||
NULL, /* unique_string */
|
||||
NULL, /* allocate_resources */
|
||||
NULL, /* register_monitor */
|
||||
NULL, /* can_spawn */
|
||||
NULL, /* spawn_procs */
|
||||
mca_pcm_cofs_get_peers,
|
||||
mca_pcm_cofs_get_self,
|
||||
NULL, /* kill_proc */
|
||||
NULL, /* kill_job */
|
||||
NULL /* deallocate_resources */
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -23,24 +23,28 @@
|
||||
* capabilities of a particular module, please see the individual
|
||||
* module's documentation.
|
||||
*
|
||||
* A run-time environment suitable for use by OMPI/MPI must provide the
|
||||
* following capabilities:
|
||||
* A run-time environment suitable for use by OMPI/MPI must provide
|
||||
* the following capabilities:
|
||||
*
|
||||
* - Remote process startup at job-start time with the ability to:
|
||||
* - push an environment (or a large chunk of an environment) to the started process
|
||||
* - redirect the stdout and stderr of the process to either a file (batch
|
||||
* schedulers) or the mpirun application (OMPI daemons) without interaction from the
|
||||
* started process
|
||||
* - push an environment (or a large chunk of an environment) to
|
||||
* the started process
|
||||
* - redirect the stdout and stderr of the process to either a file
|
||||
* (batch schedulers) or the mpirun application (OMPI daemons)
|
||||
* without interaction from the started process
|
||||
* - A working registry interface
|
||||
* - A "unique" job id for each parallel job
|
||||
* - The ability to "clean up" after a job when provided with that job id
|
||||
* - The ability to receive UNIX wait-style notification of parallel job termination
|
||||
* - The ability to "clean up" after a job when provided with that job
|
||||
id
|
||||
* - The ability to receive UNIX wait-style notification of parallel
|
||||
* job termination
|
||||
*
|
||||
* A run-time environment should proivde the following capabilities if supported:
|
||||
* A run-time environment should proivde the following capabilities
|
||||
* if supported:
|
||||
* - Remote process spawning for MPI_SPAWN and friends
|
||||
* - Fine-grained control over process cleanup (for example, only do final cleanup
|
||||
* of resources when all applications are unavailable, kill on first death, kill on
|
||||
* the 3rd process exit, etc.)
|
||||
* - Fine-grained control over process cleanup (for example, only do
|
||||
* final cleanup of resources when all applications are unavailable,
|
||||
* kill on first death, kill on the 3rd process exit, etc.)
|
||||
*
|
||||
* The pcm interface is responsible for ensuring that each process
|
||||
* started is capable of performing peer discovery during MPI_INIT.
|
||||
@ -49,6 +53,8 @@
|
||||
* mpirun is certainly not required, but it is anticipated this will
|
||||
* be a common module design.
|
||||
*
|
||||
* \note Users should not use this interface directly, instead using
|
||||
* the RTE interface defined in runtime.h
|
||||
*/
|
||||
|
||||
#ifndef MCA_PCM_H_
|
||||
@ -62,38 +68,306 @@
|
||||
|
||||
#include <sys/param.h>
|
||||
|
||||
/* Module functions */
|
||||
/*
|
||||
* MCA component management functions
|
||||
*/
|
||||
|
||||
typedef int (*mca_pcm_base_module_get_peers_fn_t)
|
||||
(ompi_process_name_t **peers, size_t *npeers);
|
||||
typedef ompi_process_name_t* (*mca_pcm_base_module_get_self_fn_t)(void);
|
||||
/**
|
||||
* PCM initialization function
|
||||
*
|
||||
* Called by the MCA framework to initialize the component. Will
|
||||
* be called exactly once in the lifetime of the process.
|
||||
*
|
||||
* @param active_pcm (IN) Name of the currently active PCM module,
|
||||
* as it might be useful in determining
|
||||
* useability.
|
||||
* @param priority (OUT) Relative priority or ranking use by MCA to
|
||||
* select a module.
|
||||
* @param allow_multiple_user_threads (OUT) Whether this module can
|
||||
* run with multiple threads making calls into
|
||||
* the library (equivalent of MPI_THREAD_MULTIPLE
|
||||
* from MPI-land).
|
||||
* @param have_hidden_threads (OUT) Whether this module needs to start
|
||||
* a background thread for operation.
|
||||
*/
|
||||
typedef struct mca_pcm_base_module_1_0_0_t*
|
||||
(*mca_pcm_base_component_init_fn_t)(int *priority,
|
||||
bool *allow_multiple_user_threads,
|
||||
bool *have_hidden_threads);
|
||||
|
||||
/* Component functions */
|
||||
|
||||
typedef struct mca_pcm_base_module_1_0_0_t *(*mca_pcm_base_component_init_fn_t)
|
||||
(int *priority, bool *allow_multi_user_threads,
|
||||
bool *have_hidden_threads);
|
||||
/**
|
||||
* PCM finalization function
|
||||
*
|
||||
* Called by the MCA framework to finalize the component. Will be
|
||||
* called once per successful call to pcm_base_compoenent_init.
|
||||
*/
|
||||
typedef int (*mca_pcm_base_component_finalize_fn_t)(void);
|
||||
|
||||
/* Ver 1.0.0 */
|
||||
struct mca_pcm_base_component_1_0_0_t {
|
||||
mca_base_component_t pcmm_version;
|
||||
mca_base_component_data_1_0_0_t pcmm_data;
|
||||
|
||||
mca_pcm_base_component_init_fn_t pcmm_init;
|
||||
mca_pcm_base_component_finalize_fn_t pcmm_finalize;
|
||||
/**
|
||||
* PCM module version and interface functions
|
||||
*
|
||||
* \note the first two entries have type names that are a bit
|
||||
* misleading. The plan is to rename the mca_base_module_*
|
||||
* types in the future.
|
||||
*/
|
||||
struct mca_pcm_base_component_1_0_0_t {
|
||||
mca_base_component_t pcm_version;
|
||||
mca_base_component_data_1_0_0_t pcm_data;
|
||||
mca_pcm_base_component_init_fn_t pcm_init;
|
||||
mca_pcm_base_component_finalize_fn_t pcm_finalize;
|
||||
};
|
||||
typedef struct mca_pcm_base_component_1_0_0_t mca_pcm_base_component_1_0_0_t;
|
||||
typedef struct mca_pcm_base_component_1_0_0_t mca_pcm_base_component_t;
|
||||
typedef mca_pcm_base_component_1_0_0_t mca_pcm_base_component_t;
|
||||
|
||||
|
||||
/*
|
||||
* PCM interface types
|
||||
*/
|
||||
|
||||
/**
|
||||
* Container for key = value pairs from the node container.
|
||||
*
|
||||
* Container used for the \c info member of the \c mca_pcm_base_node_t
|
||||
* structure. Ownership of char* strings must be give to the
|
||||
* container, who will \c free() them when the container is destroyed.
|
||||
*/
|
||||
struct mca_pcm_base_valuepair_t {
|
||||
ompi_list_item_t super;
|
||||
char *key;
|
||||
char *value;
|
||||
};
|
||||
typedef struct mca_pcm_base_valuepair_t mca_pcm_base_valuepair_t;
|
||||
OBJ_CLASS_DECLARATION(mca_pcm_base_valuepair_t);
|
||||
|
||||
|
||||
/**
|
||||
* Container for node allocation information.
|
||||
*
|
||||
* Container used for the allocate and deallocate functions of the
|
||||
* PCM.
|
||||
*/
|
||||
struct mca_pcm_base_node_t {
|
||||
ompi_list_item_t super;
|
||||
char hostname[MAXHOSTNAMELEN];
|
||||
int count;
|
||||
ompi_list_t info;
|
||||
};
|
||||
typedef struct mca_pcm_base_node_t mca_pcm_base_node_t;
|
||||
OBJ_CLASS_DECLARATION(mca_pcm_base_node_t);
|
||||
|
||||
|
||||
/**
|
||||
* Container use for process startup information
|
||||
*
|
||||
*/
|
||||
struct mca_pcm_base_schedule_t {
|
||||
ompi_list_item_t super;
|
||||
char **argv;
|
||||
int argc;
|
||||
char **env;
|
||||
char *cwd;
|
||||
ompi_list_t nodelist;
|
||||
};
|
||||
typedef struct mca_pcm_base_schedule_t mca_pcm_base_schedule_t;
|
||||
OBJ_CLASS_DECLARATION(mca_pcm_base_schedule_t);
|
||||
|
||||
|
||||
/**
|
||||
* VPID type
|
||||
*/
|
||||
typedef pid_t ompi_vpid_t;
|
||||
|
||||
|
||||
/**
|
||||
* Monitor type
|
||||
*/
|
||||
typedef int (*mca_pcm_base_monitor_fn_t)(ompi_process_name_t*,
|
||||
int newstate,
|
||||
int status);
|
||||
|
||||
|
||||
/*
|
||||
* PCM interface functions
|
||||
*/
|
||||
|
||||
/**
|
||||
* Return a string uniquely identifying the environment
|
||||
*
|
||||
* Return a string that provides some uniqueness that the system
|
||||
* run-time environment makes available. For rsh, this function will
|
||||
* return NULL as there is nothing special to be gained. In a PBS
|
||||
* job, however, this function will return the concatentaion of the
|
||||
* PBS variables required for uniquely identifying the PBS job
|
||||
* environment (the same is true of LSF, SGE, etc.).
|
||||
*
|
||||
* @returns NULL on error or if no uniqueness available
|
||||
* non-null otherwize
|
||||
*/
|
||||
typedef char *
|
||||
(*mca_pcm_base_get_unique_name_fn_t)(void);
|
||||
|
||||
|
||||
/**
|
||||
* Allocate requested resources
|
||||
*
|
||||
* Allocate the specified nodes / processes for use in a new job.
|
||||
* Requires a jobid from the PCM interface. The allocation returned
|
||||
* may be smaller than requested - it is up to the caller to proceed
|
||||
* as appropriate should this occur. This function should only be
|
||||
* called once per jobid.
|
||||
*
|
||||
* @param jobid (IN) Jobid with which to associate the given resources.
|
||||
* @param nodes (IN) Number of nodes to try to allocate. If 0,
|
||||
* the PCM will try to allocate <code>procs</code>
|
||||
* processes on as many nodes as are needed. If non-zero,
|
||||
* will try to fairly distribute <code>procs</code>
|
||||
* processes over the nodes. If <code>procs</code> is 0,
|
||||
* will attempt to allocate all cpus on
|
||||
* <code>nodes</code> nodes
|
||||
* @param procs (IN) Number of processors to try to allocate. See the note
|
||||
* for <code>nodes</code> for usage.
|
||||
* @param nodelist (OUT) List of <code>mca_pcm_node_t</code>s describing
|
||||
* the allocated resources.
|
||||
*
|
||||
* @warning The type for jobid will change in the near future
|
||||
*/
|
||||
typedef int
|
||||
(*mca_pcm_base_allocate_resources_fn_t)(int jobid,
|
||||
int nodes,
|
||||
int procs,
|
||||
ompi_list_t **nodelist);
|
||||
|
||||
/**
|
||||
* Register a watch function for changes in the job status
|
||||
*
|
||||
* @param jobid (IN) Jobid associated with the job to be monitored
|
||||
* @param func (IN) Function to call on status change
|
||||
*
|
||||
* @warning Type type for jobid will change in the near future.
|
||||
*/
|
||||
typedef int
|
||||
(*mca_pcm_base_register_monitor_fn_t)(int jobid,
|
||||
mca_pcm_base_monitor_fn_t func);
|
||||
|
||||
|
||||
/**
|
||||
* This tells you whether the pcm module is capable of spawning new
|
||||
* processes or not during a run
|
||||
*
|
||||
* @return True/False
|
||||
*/
|
||||
|
||||
typedef bool
|
||||
(*mca_pcm_base_can_spawn_fn_t)(void);
|
||||
|
||||
|
||||
/**
|
||||
* Spawn a job
|
||||
*
|
||||
* Start a job with given jobid and starting vpid (should probably be
|
||||
* 0 for the forseeable future). The job is specified using an array
|
||||
* of \c mca_pcm_base_schedule_t structures, which give both process
|
||||
* and location information.
|
||||
*
|
||||
* @warning Parameter list will probably change in the near future.
|
||||
*/
|
||||
typedef int
|
||||
(*mca_pcm_base_spwan_procs_fn_t)(int jobid,
|
||||
ompi_list_t schedule_list,
|
||||
ompi_vpid_t start_vpid);
|
||||
|
||||
|
||||
/**
|
||||
* Get my name
|
||||
*
|
||||
* @return my name
|
||||
*/
|
||||
typedef ompi_process_name_t* (*mca_pcm_base_module_get_self_fn_t)(void);
|
||||
|
||||
|
||||
/**
|
||||
* Get names of peer processes which have been launched
|
||||
*
|
||||
* @param Nothing
|
||||
* @return An array of peer names, including me
|
||||
*/
|
||||
typedef int (*mca_pcm_base_module_get_peers_fn_t)
|
||||
(ompi_process_name_t **peers, size_t *npeers);
|
||||
|
||||
|
||||
/**
|
||||
* Kill a specific process in this cell
|
||||
*
|
||||
* @param process_name Which process needs to be killed.
|
||||
* @return Error code
|
||||
*
|
||||
* @warning flags is currently ignored, but should be set to 0 for
|
||||
* future compatibility. Will be used to specify how to kill
|
||||
* processes (0 will be same as a "kill <pid>"
|
||||
*/
|
||||
typedef int
|
||||
(*mca_pcm_base_kill_proc_fn_t)(ompi_process_name_t *name, int flags);
|
||||
|
||||
|
||||
/**
|
||||
* Kill all the processes in a job. This will probably find out all
|
||||
* the processes in the job by contacting the registry and then call
|
||||
* mca_pcm_kill_process for each process in the job (for a cell)
|
||||
*
|
||||
* @param jobid Job id
|
||||
* @return Error code
|
||||
*
|
||||
* @warning flags is currently ignored, but should be set to 0 for
|
||||
* future compatibility. Will be used to specify how to kill
|
||||
* processes (0 will be same as a "kill <pid>"
|
||||
*/
|
||||
typedef int
|
||||
(*mca_pcm_base_kill_job_fn_t)(int jobid, int flags);
|
||||
|
||||
|
||||
/**
|
||||
* Deallocate requested resources
|
||||
*
|
||||
* Return the resources for the given jobid to the system.
|
||||
*
|
||||
* @param jobid (IN) Jobid associated with the resources to be freed.
|
||||
* @param nodes (IN) Nodelist from associated allocate_resource call.
|
||||
* All associated memory will be freed as appropriate.
|
||||
*
|
||||
* @warning The type for jobid will change in the near future.
|
||||
*/
|
||||
typedef int
|
||||
(*mca_pcm_base_deallocate_resources_fn_t)(int jobid,
|
||||
ompi_list_t *nodelist);
|
||||
|
||||
|
||||
/**
|
||||
* Base module structure for the PCM
|
||||
*
|
||||
* Base module structure for the PCM - presents the required function
|
||||
* pointers to the calling interface.
|
||||
*/
|
||||
struct mca_pcm_base_module_1_0_0_t {
|
||||
mca_pcm_base_module_get_peers_fn_t pcm_peers;
|
||||
mca_pcm_base_module_get_self_fn_t pcm_self;
|
||||
mca_pcm_base_get_unique_name_fn_t pcm_get_unique_name;
|
||||
mca_pcm_base_allocate_resources_fn_t pcm_allocate_resources;
|
||||
mca_pcm_base_register_monitor_fn_t pcm_register_monitor;
|
||||
mca_pcm_base_can_spawn_fn_t pcm_can_spawn;
|
||||
mca_pcm_base_spwan_procs_fn_t pcm_spawn_procs;
|
||||
mca_pcm_base_module_get_peers_fn_t pcm_peers;
|
||||
mca_pcm_base_module_get_self_fn_t pcm_self;
|
||||
mca_pcm_base_kill_proc_fn_t pcm_kill_proc;
|
||||
mca_pcm_base_kill_job_fn_t pcm_kill_job;
|
||||
mca_pcm_base_deallocate_resources_fn_t pcm_deallocate_resources;
|
||||
};
|
||||
typedef struct mca_pcm_base_module_1_0_0_t mca_pcm_base_module_1_0_0_t;
|
||||
typedef struct mca_pcm_base_module_1_0_0_t mca_pcm_base_module_t;
|
||||
|
||||
/*
|
||||
extern mca_pcm_base_module_t mca_pcm;
|
||||
|
||||
|
||||
/**
|
||||
* Macro for use in modules that are of type pcm v1.0.0
|
||||
*/
|
||||
#define MCA_PCM_BASE_VERSION_1_0_0 \
|
||||
@ -102,37 +376,4 @@ typedef struct mca_pcm_base_module_1_0_0_t mca_pcm_base_module_t;
|
||||
/* pcm v1.0 */ \
|
||||
"pcm", 1, 0, 0
|
||||
|
||||
/*
|
||||
* Global functions for MCA overall collective open and close
|
||||
*/
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
extern "C" {
|
||||
#endif
|
||||
int mca_pcm_base_open(void);
|
||||
int mca_pcm_base_select(bool *allow_multi_user_threads,
|
||||
bool *have_hidden_threads);
|
||||
int mca_pcm_base_close(void);
|
||||
|
||||
bool mca_pcm_base_is_checkpointable(void);
|
||||
|
||||
int mca_pcm_base_checkpoint(void);
|
||||
int mca_pcm_base_continue(void);
|
||||
int mca_pcm_base_restart(void);
|
||||
#if defined(c_plusplus) || defined(__cplusplus)
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
/*
|
||||
* Macros
|
||||
*/
|
||||
|
||||
/*
|
||||
* Globals
|
||||
*/
|
||||
extern int mca_pcm_base_output;
|
||||
extern ompi_list_t mca_pcm_base_components_available;
|
||||
extern mca_pcm_base_component_t mca_pcm_base_selected_component;
|
||||
extern mca_pcm_base_module_t mca_pcm;
|
||||
|
||||
#endif
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user