Updates to support Singularity containers v2.2
Этот коммит содержится в:
Gregory M. Kurtzer
родитель
56cd5e102d
Коммит
16794cc260
@ -29,89 +29,17 @@
|
||||
|
||||
#include "schizo_singularity.h"
|
||||
|
||||
static int setup_app(orte_app_context_t *context);
|
||||
static int setup_fork(orte_job_t *jdata,
|
||||
orte_app_context_t *context);
|
||||
static int setup_fork(orte_job_t *jdata, orte_app_context_t *context);
|
||||
|
||||
orte_schizo_base_module_t orte_schizo_singularity_module = {
|
||||
.setup_app = setup_app,
|
||||
.setup_fork = setup_fork
|
||||
};
|
||||
|
||||
static int setup_app(orte_app_context_t *app)
|
||||
{
|
||||
int i;
|
||||
char *newenv, *pth, *t2;
|
||||
bool takeus = false;
|
||||
|
||||
if (NULL != orte_schizo_base.personalities) {
|
||||
/* see if we are included */
|
||||
for (i=0; NULL != orte_schizo_base.personalities[i]; i++) {
|
||||
if (0 == strcmp(orte_schizo_base.personalities[i], "singularity")) {
|
||||
takeus = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!takeus) {
|
||||
/* even if they didn't specify, check to see if
|
||||
* this involves a singularity container */
|
||||
if (0 != strcmp(app->argv[0],"singularity") &&
|
||||
0 != strcmp(app->argv[0],"sapprun") &&
|
||||
NULL == strstr(app->argv[0], ".sapp")) {
|
||||
/* guess not! */
|
||||
return ORTE_ERR_TAKE_NEXT_OPTION;
|
||||
}
|
||||
}
|
||||
|
||||
opal_output_verbose(1, orte_schizo_base_framework.framework_output,
|
||||
"%s schizo:singularity: checking app %s",
|
||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), app->argv[0]);
|
||||
|
||||
if (0 < strlen(OPAL_SINGULARITY_PATH)) {
|
||||
asprintf(&pth, "%s/singularity", OPAL_SINGULARITY_PATH);
|
||||
} else {
|
||||
/* since we allow for detecting singularity's presence, it
|
||||
* is possible that we found it in the PATH, but not in a
|
||||
* standard location. Check for that here */
|
||||
pth = opal_path_findv("singularity", X_OK, app->env, NULL);
|
||||
if (NULL == pth) {
|
||||
/* cannot execute */
|
||||
return ORTE_ERR_TAKE_NEXT_OPTION;
|
||||
}
|
||||
}
|
||||
/* find the path and prepend it with the path to Singularity */
|
||||
for (i = 0; NULL != app->env && NULL != app->env[i]; ++i) {
|
||||
/* add to PATH */
|
||||
if (0 == strncmp("PATH=", app->env[i], 5)) {
|
||||
t2 = opal_dirname(pth);
|
||||
asprintf(&newenv, "%s:%s", t2, app->env[i] + 5);
|
||||
opal_setenv("PATH", newenv, true, &app->env);
|
||||
free(newenv);
|
||||
free(t2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
free(pth);
|
||||
|
||||
if (0 == strcmp(app->argv[0], "singularity")) {
|
||||
/* we don't want the backend to setup a cache dir */
|
||||
orte_set_attribute(&app->attributes, ORTE_APP_NO_CACHEDIR, ORTE_ATTR_GLOBAL, NULL, OPAL_BOOL);
|
||||
}
|
||||
|
||||
/* export an envar to permit shared memory operations */
|
||||
opal_setenv("SINGULARITY_NO_NAMESPACE_PID", "1", true, &app->env);
|
||||
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
|
||||
static int setup_fork(orte_job_t *jdata,
|
||||
orte_app_context_t *app)
|
||||
static int setup_fork(orte_job_t *jdata, orte_app_context_t *app)
|
||||
{
|
||||
int i;
|
||||
bool takeus = false;
|
||||
char *p, *t2;
|
||||
char dir[MAXPATHLEN];
|
||||
char *t2, *pth, *newenv;
|
||||
|
||||
if (NULL != orte_schizo_base.personalities) {
|
||||
/* see if we are included */
|
||||
@ -125,67 +53,57 @@ static int setup_fork(orte_job_t *jdata,
|
||||
if (!takeus) {
|
||||
/* even if they didn't specify, check to see if
|
||||
* this involves a singularity container */
|
||||
if (0 != strcmp(app->argv[0],"singularity") &&
|
||||
0 != strcmp(app->argv[0],"sapprun") &&
|
||||
NULL == strstr(app->argv[0], ".sapp")) {
|
||||
if (0 != strcmp(app->argv[0],"singularity")) {
|
||||
/* guess not! */
|
||||
return ORTE_ERR_TAKE_NEXT_OPTION;
|
||||
}
|
||||
}
|
||||
|
||||
opal_output_verbose(1, orte_schizo_base_framework.framework_output,
|
||||
"%s schizo:singularity: configuring app environment %s",
|
||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), app->argv[0]);
|
||||
|
||||
|
||||
/* Make sure we prepend the path Singularity was called by incase that
|
||||
* path is not defined on the nodes */
|
||||
if (0 < strlen(OPAL_SINGULARITY_PATH)) {
|
||||
if (0 > asprintf(&pth, "%s/singularity", OPAL_SINGULARITY_PATH) ) {
|
||||
/* Something bad happened, let's move on */
|
||||
return ORTE_ERR_TAKE_NEXT_OPTION;
|
||||
}
|
||||
} else {
|
||||
/* since we allow for detecting singularity's presence, it
|
||||
* is possible that we found it in the PATH, but not in a
|
||||
* standard location. Check for that here */
|
||||
pth = opal_path_findv("singularity", X_OK, app->env, NULL);
|
||||
if (NULL == pth) {
|
||||
/* cannot execute */
|
||||
return ORTE_ERR_TAKE_NEXT_OPTION;
|
||||
}
|
||||
}
|
||||
/* find the path and prepend it with the path to Singularity */
|
||||
for (i = 0; NULL != app->env && NULL != app->env[i]; ++i) {
|
||||
/* add to PATH */
|
||||
if (0 == strncmp("PATH=", app->env[i], 5)) {
|
||||
t2 = opal_dirname(pth);
|
||||
if (0 < asprintf(&newenv, "%s:%s", t2, app->env[i] + 5) ) {
|
||||
opal_setenv("PATH", newenv, true, &app->env);
|
||||
free(newenv);
|
||||
}
|
||||
free(t2);
|
||||
break;
|
||||
}
|
||||
}
|
||||
free(pth);
|
||||
|
||||
/* set the singularity cache dir, unless asked not to do so */
|
||||
if (!orte_get_attribute(&app->attributes, ORTE_APP_NO_CACHEDIR, NULL, OPAL_BOOL)) {
|
||||
opal_setenv("SINGULARITY_CACHEDIR", orte_process_info.job_session_dir, true, &app->env);
|
||||
opal_setenv("SINGULARITY_CACHEDIR", orte_process_info.job_session_dir, true, &environ);
|
||||
/* Set the Singularity sessiondir to exist within the OMPI sessiondir */
|
||||
opal_setenv("SINGULARITY_SESSIONDIR", orte_process_info.job_session_dir, true, &app->env);
|
||||
/* No need for Singularity to clean up after itself if OMPI will */
|
||||
opal_setenv("SINGULARITY_NOSESSIONCLEANUP", "1", true, &app->env);
|
||||
}
|
||||
|
||||
/* save our current directory */
|
||||
getcwd(dir, sizeof(dir));
|
||||
|
||||
/* change to the working directory for this context */
|
||||
chdir(app->cwd);
|
||||
|
||||
/* if the app contains .sapp, then we need to strip that
|
||||
* extension so singularity doesn't bark at us */
|
||||
if (NULL != strstr(app->argv[0], ".sapp")) {
|
||||
/* ensure the app is installed */
|
||||
opal_output_verbose(1, orte_schizo_base_framework.framework_output,
|
||||
"%s schizo:singularity: installing app %s",
|
||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME), app->argv[0]);
|
||||
t2 = opal_basename(app->argv[0]);
|
||||
p = strstr(t2, ".sapp");
|
||||
*p = '\0'; // strip the extension
|
||||
if (0 < opal_output_get_verbosity(orte_schizo_base_framework.framework_output)) {
|
||||
(void)asprintf(&p, "singularity -vv install --runkey %s %s", t2, app->argv[0]);
|
||||
} else {
|
||||
(void)asprintf(&p, "singularity --quiet install --runkey %s %s", t2, app->argv[0]);
|
||||
}
|
||||
system(p);
|
||||
free(p);
|
||||
free(app->argv[0]);
|
||||
app->argv[0] = t2;
|
||||
}
|
||||
|
||||
/* ensure that we use "singularity run" to execute this app */
|
||||
if (0 != strcmp(app->app, "singularity")) {
|
||||
opal_output_verbose(1, orte_schizo_base_framework.framework_output,
|
||||
"%s schizo:singularity: adding singularity cmd",
|
||||
ORTE_NAME_PRINT(ORTE_PROC_MY_NAME));
|
||||
/* change the app to the "singularity" command */
|
||||
free(app->app);
|
||||
app->app = strdup("singularity");
|
||||
opal_argv_prepend_nosize(&app->argv, "run");
|
||||
if (0 < opal_output_get_verbosity(orte_schizo_base_framework.framework_output)) {
|
||||
opal_argv_prepend_nosize(&app->argv, "-vv");
|
||||
} else {
|
||||
opal_argv_prepend_nosize(&app->argv, "--quiet");
|
||||
}
|
||||
opal_argv_prepend_nosize(&app->argv, "singularity");
|
||||
}
|
||||
|
||||
/* return to the original directory */
|
||||
chdir(dir);
|
||||
|
||||
return ORTE_SUCCESS;
|
||||
}
|
||||
|
||||
|
||||
Загрузка…
Ссылка в новой задаче
Block a user