ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Merge pull request #5650 from matcabral/remove_psm2_shadow_env_40x

Просмотр исходного кода 
v4.0.x: MTL PSM2: Remove shadow variables from v4.0.x
Этот коммит содержится в:
Geoff Paulsen 2018-09-17 14:40:59 -05:00 коммит произвёл GitHub
родитель f762b14f0d 8fa172e60b
Коммит de0c595ca5
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 0 добавлений и 142 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

131
ompi/mca/mtl/psm2/mtl_psm2_component.c
Просмотреть файл

@ -84,129 +84,6 @@ mca_mtl_psm2_component_t mca_mtl_psm2_component = {
}
};
struct ompi_mtl_psm2_shadow_variable {
int variable_type;
void *storage;
mca_base_var_storage_t default_value;
const char *env_name;
mca_base_var_info_lvl_t info_level;
const char *mca_name;
const char *description;
mca_base_var_flag_t flags;
};
struct ompi_mtl_psm2_shadow_variable ompi_mtl_psm2_shadow_variables[] = {
{MCA_BASE_VAR_TYPE_STRING, &ompi_mtl_psm2.psm2_devices, {.stringval = "self,shm,hfi"}, "PSM2_DEVICES", OPAL_INFO_LVL_3,
"devices",
"Comma-delimited list of PSM2 devices. Valid values: self, shm, hfi (default: self,shm,hfi. Reduced to self,shm in single node jobs)",0},
{MCA_BASE_VAR_TYPE_STRING, &ompi_mtl_psm2.psm2_memory, {.stringval = "normal"}, "PSM2_MEMORY", OPAL_INFO_LVL_9,
"memory_model", "PSM2 memory usage mode. Valid values: min, normal, large (default: normal)", 0},
{MCA_BASE_VAR_TYPE_UNSIGNED_LONG, &ompi_mtl_psm2.psm2_mq_sendreqs_max, {.ulval = 0}, "PSM2_MQ_SENDREQS_MAX", OPAL_INFO_LVL_3,
"mq_sendreqs_max", "PSM2 maximum number of isend requests in flight (default: unset, let libpsm2 use its default)", MCA_BASE_VAR_FLAG_DEF_UNSET},
{MCA_BASE_VAR_TYPE_UNSIGNED_LONG, &ompi_mtl_psm2.psm2_mq_recvreqs_max, {.ulval = 0}, "PSM2_MQ_RECVREQS_MAX", OPAL_INFO_LVL_3,
"mq_recvreqs_max", "PSM2 maximum number of irecv requests in flight (default: unset, let libpsm2 use its default)", MCA_BASE_VAR_FLAG_DEF_UNSET},
{MCA_BASE_VAR_TYPE_UNSIGNED_LONG, &ompi_mtl_psm2.psm2_mq_rndv_hfi_threshold, {.ulval = 0}, "PSM2_MQ_RNDV_HFI_THRESH", OPAL_INFO_LVL_3,
"hfi_eager_limit", "PSM2 eager to rendezvous threshold (default: unset, let libpsm2 use its defaults)", MCA_BASE_VAR_FLAG_DEF_UNSET},
{MCA_BASE_VAR_TYPE_UNSIGNED_LONG, &ompi_mtl_psm2.psm2_mq_rndv_shm_threshold, {.ulval = 0}, "PSM2_MQ_RNDV_SHM_THRESH", OPAL_INFO_LVL_3,
"shm_eager_limit", "PSM2 shared memory eager to rendezvous threshold (default: unset, let libpsm2 use its default)", MCA_BASE_VAR_FLAG_DEF_UNSET},
{MCA_BASE_VAR_TYPE_BOOL, &ompi_mtl_psm2.psm2_recvthread, {.boolval = true}, "PSM2_RCVTHREAD", OPAL_INFO_LVL_3,
"use_receive_thread", "Use PSM2 progress thread (default: true)"},
{MCA_BASE_VAR_TYPE_BOOL, &ompi_mtl_psm2.psm2_shared_contexts, {.boolval = true}, "PSM2_SHAREDCONTEXTS", OPAL_INFO_LVL_6,
"use_shared_contexts", "Share PSM contexts between MPI processes (default: true)"},
{MCA_BASE_VAR_TYPE_UNSIGNED_LONG, &ompi_mtl_psm2.psm2_max_contexts_per_job, {.ulval = 0}, "PSM2_MAX_CONTEXTS_PER_JOB", OPAL_INFO_LVL_9,
"max_contexts_per_job", "Maximum number of contexts available on a node (default: unset, let libpsm2 use its default)", MCA_BASE_VAR_FLAG_DEF_UNSET},
{MCA_BASE_VAR_TYPE_UNSIGNED_LONG, &ompi_mtl_psm2.psm2_tracemask, {.ulval = 1}, "PSM2_TRACEMASK", OPAL_INFO_LVL_9,
"trace_mask", "PSM2 tracemask value. See PSM2 documentation for accepted values in 0x (default: 1)"},
{MCA_BASE_VAR_TYPE_UNSIGNED_LONG, &ompi_mtl_psm2.psm2_opa_sl, {.ulval = 0}, "HFI_SL", OPAL_INFO_LVL_9,
"opa_service_level", "HFI Service Level (default: unset, let libpsm2 use its defaults)", MCA_BASE_VAR_FLAG_DEF_UNSET},
{-1},
};
static void ompi_mtl_psm2_set_shadow_env (struct ompi_mtl_psm2_shadow_variable *variable)
{
mca_base_var_storage_t *storage = variable->storage;
char *env_value;
int ret = 0;
int var_index = 0;
const mca_base_var_t *mca_base_var;
var_index = mca_base_var_find("ompi", "mtl", "psm2", variable->mca_name);
ret = mca_base_var_get (var_index,&mca_base_var);
/* Something is fundamentally broken if registered variables are
* not found */
if (OPAL_SUCCESS != ret) {
fprintf (stderr, "ERROR setting PSM2 environment variable: %s\n", variable->env_name);
return;
}
/** Skip setting variables for which the default behavior is "unset" */
if ((mca_base_var->mbv_flags & MCA_BASE_VAR_FLAG_DEF_UNSET) &&
(MCA_BASE_VAR_SOURCE_DEFAULT == mca_base_var->mbv_source)){
return ;
}
switch (variable->variable_type) {
case MCA_BASE_VAR_TYPE_BOOL:
ret = asprintf (&env_value, "%s=%d", variable->env_name, storage->boolval ? 1 : 0);
break;
case MCA_BASE_VAR_TYPE_UNSIGNED_LONG:
if (0 == strcmp (variable->env_name, "PSM2_TRACEMASK")) {
/* PSM2 documentation shows the tracemask as a hexidecimal number. to be consitent
* use hexidecimal here. */
ret = asprintf (&env_value, "%s=0x%lx", variable->env_name, storage->ulval);
} else {
ret = asprintf (&env_value, "%s=%lu", variable->env_name, storage->ulval);
}
break;
case MCA_BASE_VAR_TYPE_STRING:
ret = asprintf (&env_value, "%s=%s", variable->env_name, storage->stringval);
break;
}
if (0 > ret) {
fprintf (stderr, "ERROR setting PSM2 environment variable: %s\n", variable->env_name);
} else {
putenv (env_value);
}
}
static void ompi_mtl_psm2_register_shadow_env (struct ompi_mtl_psm2_shadow_variable *variable)
{
mca_base_var_storage_t *storage = variable->storage;
char *env_value;
env_value = getenv (variable->env_name);
switch (variable->variable_type) {
case MCA_BASE_VAR_TYPE_BOOL:
if (env_value) {
int tmp;
(void) mca_base_var_enum_bool.value_from_string (&mca_base_var_enum_bool, env_value, &tmp);
storage->boolval = !!tmp;
} else {
storage->boolval = variable->default_value.boolval;
}
break;
case MCA_BASE_VAR_TYPE_UNSIGNED_LONG:
if (env_value) {
storage->ulval = strtol (env_value, NULL, 0);
} else {
storage->ulval = variable->default_value.ulval;
}
break;
case MCA_BASE_VAR_TYPE_STRING:
if (env_value) {
storage->stringval = env_value;
} else {
storage->stringval = variable->default_value.stringval;
}
break;
}
(void) mca_base_component_var_register (&mca_mtl_psm2_component.super.mtl_version, variable->mca_name, variable->description,
variable->variable_type, NULL, 0, variable->flags, variable->info_level, MCA_BASE_VAR_SCOPE_READONLY,
variable->storage);
}
static int
get_num_total_procs(int *out_ntp)
{
@ -260,10 +137,6 @@ ompi_mtl_psm2_component_register(void)
MCA_BASE_VAR_SCOPE_READONLY,
&param_priority);
for (int i = 0 ; ompi_mtl_psm2_shadow_variables[i].variable_type >= 0 ; ++i) {
ompi_mtl_psm2_register_shadow_env (ompi_mtl_psm2_shadow_variables + i);
}
ompi_mtl_psm2_register_pvars();
return OMPI_SUCCESS;
@ -395,10 +268,6 @@ ompi_mtl_psm2_component_init(bool enable_progress_threads,
return NULL;
}
for (int i = 0 ; ompi_mtl_psm2_shadow_variables[i].variable_type >= 0 ; ++i) {
ompi_mtl_psm2_set_shadow_env (ompi_mtl_psm2_shadow_variables + i);
}
#if OPAL_CUDA_SUPPORT
/*
* If using CUDA enabled Open MPI, the user likely intends to

11
ompi/mca/mtl/psm2/mtl_psm2_types.h
Просмотреть файл

@ -50,17 +50,6 @@ struct mca_mtl_psm2_module_t {
psm2_mq_t mq;
psm2_epid_t epid;
psm2_epaddr_t epaddr;
char *psm2_devices;
char *psm2_memory;
unsigned long psm2_mq_sendreqs_max;
unsigned long psm2_mq_recvreqs_max;
unsigned long psm2_mq_rndv_hfi_threshold;
unsigned long psm2_mq_rndv_shm_threshold;
unsigned long psm2_max_contexts_per_job;
unsigned long psm2_tracemask;
bool psm2_recvthread;
bool psm2_shared_contexts;
unsigned long psm2_opa_sl;
};
typedef struct mca_mtl_psm2_module_t mca_mtl_psm2_module_t;