Skip to content

Multiple commits #2377

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

Merged
rhc54 merged 2 commits into from
Jan 16, 2026
Merged

Multiple commits #2377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a86d51
Provide an MCA param to control hwloc shmem sharing
rhc54 Jan 16, 2026
eaf3560
Update the directive list in check_multi
rhc54 Jan 16, 2026
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
9 changes: 5 additions & 4 deletions src/mca/schizo/base/schizo_base_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "src/util/pmix_basename.h"
#include "src/util/pmix_environ.h"
#include "src/util/pmix_show_help.h"
#include "src/util/prte_cmd_line.h"

prte_schizo_base_module_t *prte_schizo_base_detect_proxy(char *cmdpath)
{
Expand Down Expand Up @@ -70,10 +71,10 @@ PRTE_EXPORT void prte_schizo_base_root_error_msg(void)
static bool check_multi(const char *target)
{
char *multi_dirs[] = {
"display",
"output",
"tune",
"runtime-options",
PRTE_CLI_DISPLAY,
PRTE_CLI_OUTPUT,
PRTE_CLI_TUNE,
PRTE_CLI_RTOS,
NULL
};
int n;
Expand Down
9 changes: 8 additions & 1 deletion src/prted/pmix/pmix_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,8 @@ static void modex_resp(pmix_status_t status, char *data, size_t sz, void *cbdata
static bool remote_connections_specified = false;
static char *remote_cncts = NULL;
static char *generate_dist = "fabric,gpu,network";
static bool share_hwloc_memory = true;

void pmix_server_register_params(void)
{
int i;
Expand Down Expand Up @@ -487,6 +489,10 @@ void pmix_server_register_params(void)
PMIX_MCA_BASE_VAR_TYPE_BOOL,
&prte_pmix_server_globals.system_server);

(void) pmix_mca_base_var_register("prte", "pmix", NULL, "hwloc_shared_memory",
"Whether or not to share HWLOC topology via shared memory",
PMIX_MCA_BASE_VAR_TYPE_BOOL,
&share_hwloc_memory);
}

static void timeout_cbfunc(int sd, short args, void *cbdata)
Expand Down Expand Up @@ -698,7 +704,8 @@ int pmix_server_init(void)
return rc;
}
// tell the server to share this topology for us
PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_SHARE_TOPOLOGY, NULL, PMIX_BOOL);
PMIX_INFO_LIST_ADD(prc, ilist, PMIX_SERVER_SHARE_TOPOLOGY,
(void*)&share_hwloc_memory, PMIX_BOOL);
if (PMIX_SUCCESS != prc) {
PMIX_INFO_LIST_RELEASE(ilist);
rc = prte_pmix_convert_status(prc);
Expand Down
Loading