1508a01325
The ess pmi module was not handling aprun launched daemons. All daemons were thinking they were vpid 1. Also, turns out that on cray systems using MOM nodes for launched jobs, just detecting whether or not a process is in a PAGG container is not sufficient. Crank up the priority of the alps PLM component in the event that the configure detected the presence of both slurm and alps. Have the ESS pmi component open the pmix framework and select a pmix component. This commit was SVN r32773.
113 строки
3.1 KiB
C
113 строки
3.1 KiB
C
/*
|
|
* Copyright (c) 2014 Intel, Inc. All rights reserved.
|
|
* $COPYRIGHT$
|
|
*
|
|
* Additional copyrights may follow
|
|
*
|
|
* $HEADER$
|
|
*
|
|
* These symbols are in a file by themselves to provide nice linker
|
|
* semantics. Since linkers generally pull in symbols by object
|
|
* files, keeping these symbols as the only symbols in this file
|
|
* prevents utility programs such as "ompi_info" from having to import
|
|
* entire components just to query their version and parameters.
|
|
*/
|
|
|
|
#include "opal_config.h"
|
|
|
|
#include "opal/constants.h"
|
|
#include "opal/mca/pmix/pmix.h"
|
|
#include "pmix_cray.h"
|
|
#include <sys/syscall.h>
|
|
|
|
/*
|
|
* Public string showing the pmix cray component version number
|
|
*/
|
|
const char *opal_pmix_cray_component_version_string =
|
|
"OPAL cray pmix MCA component version " OPAL_VERSION;
|
|
|
|
/*
|
|
* Local function
|
|
*/
|
|
static int pmix_cray_component_query(mca_base_module_t **module, int *priority);
|
|
static int pmix_cray_component_close(void);
|
|
|
|
|
|
/*
|
|
* Instantiate the public struct with all of our public information
|
|
* and pointers to our public functions in it
|
|
*/
|
|
|
|
const opal_pmix_base_component_t mca_pmix_cray_component = {
|
|
|
|
/* First, the mca_component_t struct containing meta information
|
|
about the component itself */
|
|
|
|
{
|
|
/* Indicate that we are a pmix v1.1.0 component (which also
|
|
implies a specific MCA version) */
|
|
|
|
OPAL_PMIX_BASE_VERSION_2_0_0,
|
|
|
|
/* Component name and version */
|
|
|
|
"cray",
|
|
OPAL_MAJOR_VERSION,
|
|
OPAL_MINOR_VERSION,
|
|
OPAL_RELEASE_VERSION,
|
|
|
|
/* Component open and close functions */
|
|
|
|
NULL,
|
|
pmix_cray_component_close,
|
|
pmix_cray_component_query,
|
|
NULL
|
|
},
|
|
/* Next the MCA v1.0.0 component meta data */
|
|
{
|
|
/* The component is checkpoint ready */
|
|
MCA_BASE_METADATA_PARAM_CHECKPOINT
|
|
}
|
|
};
|
|
|
|
static int pmix_cray_component_query(mca_base_module_t **module, int *priority)
|
|
{
|
|
int rc;
|
|
const char proc_job_file[]="/proc/job";
|
|
FILE *fd = NULL;
|
|
char string[128]; /* just need to get a little output */
|
|
char *tmp = NULL;
|
|
|
|
/* disqualify ourselves if not running in a Cray PAGG container */
|
|
fd = fopen(proc_job_file, "r");
|
|
if (fd == NULL) {
|
|
*priority = 0;
|
|
*module = NULL;
|
|
rc = OPAL_ERROR;
|
|
} else {
|
|
tmp = fgets(string, sizeof(string), fd);
|
|
if (tmp && (getenv("ALPS_APP_DEPTH") != NULL)) { /* okay we're in a PAGG container,
|
|
got non-null output from job device.
|
|
The check for ALPS_APP_DEPTH is required
|
|
since on systems using MOM nodes, the
|
|
mpirun/orte is actually in a PAGG */
|
|
*priority = 90;
|
|
*module = (mca_base_module_t *)&opal_pmix_cray_module;
|
|
rc = OPAL_SUCCESS;
|
|
}
|
|
fclose(fd);
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
static int pmix_cray_component_close(void)
|
|
{
|
|
int ret = OPAL_SUCCESS;
|
|
|
|
ret = opal_pmix_cray_module.finalize();
|
|
|
|
return ret;
|
|
}
|
|
|