Skip to content

Check for OPAL_PREFIX and set corresponding PMIX_PREFIX if found #3985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Check for OPAL_PREFIX and set corresponding PMIX_PREFIX if found #3985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85bc526
Check for OPAL_PREFIX and set corresponding PMIX_PREFIX if found
Jul 31, 2017
6e1a13d
Revert "Check for OPAL_PREFIX and set corresponding PMIX_PREFIX if fo…
Aug 1, 2017
6ae593c
Move the detection of OPAL_PREFIX and subsequent posting of PMIX_PREF…
Aug 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions opal/mca/pmix/pmix2x/pmix2x_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include "opal/hash_string.h"
#include "opal/threads/threads.h"
#include "opal/util/argv.h"
#include "opal/util/opal_environ.h"
#include "opal/util/proc.h"

#include "opal/mca/pmix/base/base.h"
Expand Down Expand Up @@ -64,6 +65,7 @@ int pmix2x_client_init(opal_list_t *ilist)
pmix_info_t *pinfo;
size_t ninfo, n;
opal_value_t *ival;
char *evar;

opal_output_verbose(1, opal_pmix_base_framework.framework_output,
"PMIx_client init");
Expand All @@ -75,6 +77,9 @@ int pmix2x_client_init(opal_list_t *ilist)
asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);
putenv(dbgvalue);
}
if (NULL != (evar = getenv("OPAL_PREFIX"))) {
opal_setenv("PMIX_PREFIX", evar, false, &environ);
}
}

/* convert the incoming list to info structs */
Expand Down
5 changes: 5 additions & 0 deletions opal/mca/pmix/pmix2x/pmix2x_server_south.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
#include "opal/util/argv.h"
#include "opal/util/error.h"
#include "opal/util/output.h"
#include "opal/util/opal_environ.h"
#include "opal/util/proc.h"
#include "opal/util/show_help.h"
#include "opal/mca/pmix/base/base.h"
Expand Down Expand Up @@ -99,6 +100,7 @@ int pmix2x_server_init(opal_pmix_server_module_t *module,
opal_pmix2x_event_t *event;
opal_pmix2x_jobid_trkr_t *job;
opal_pmix_lock_t lk;
char *evar;

OPAL_PMIX_ACQUIRE_THREAD(&opal_pmix_base.lock);

Expand All @@ -107,6 +109,9 @@ int pmix2x_server_init(opal_pmix_server_module_t *module,
asprintf(&dbgvalue, "PMIX_DEBUG=%d", dbg);
putenv(dbgvalue);
}
if (NULL != (evar = getenv("OPAL_PREFIX"))) {
opal_setenv("PMIX_PREFIX", evar, false, &environ);
}
}
++opal_pmix_base.initialized;

Expand Down