Skip to content

Commit

Permalink
Merge pull request #12920 from rhc54/topic/dpm
Browse files Browse the repository at this point in the history 
Allow the dpm to query the server for local peer info
  • Loading branch information
@bosilca
bosilca authored Nov 19, 2024
2 parents 7b2ac18 + c6a7d45 commit 594e29a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ompi/dpm/dpm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ int ompi_dpm_connect_accept(ompi_communicator_t *comm, int root,
wildcard_rank.jobid = proc->super.proc_name.jobid;
wildcard_rank.vpid = OMPI_NAME_WILDCARD->vpid;
/* retrieve the local peers for the specified jobid */
OPAL_MODEX_RECV_VALUE_OPTIONAL(rc, PMIX_LOCAL_PEERS,
OPAL_MODEX_RECV_VALUE_IMMEDIATE(rc, PMIX_LOCAL_PEERS,
&wildcard_rank, &val, PMIX_STRING);
if (OPAL_SUCCESS == rc && NULL != val) {
char **peers = opal_argv_split(val, ',');
Expand Down
14 changes: 8 additions & 6 deletions opal/mca/pmix/pmix-internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
* reserved.
* Copyright (c) 2020 Amazon.com, Inc. or its affiliates.
* All Rights reserved.
* Copyright (c) 2021 Nanook Consulting. All rights reserved.
* Copyright (c) 2021-2024 Nanook Consulting All rights reserved.
* Copyright (c) 2021 Argonne National Laboratory. All rights
* reserved.
* $COPYRIGHT$
Expand Down Expand Up @@ -293,7 +293,7 @@ typedef struct {
OPAL_OUTPUT_VERBOSE((1, opal_pmix_verbose_output, \
"%s[%s:%d] MODEX RECV VALUE OPTIONAL FOR PROC %s KEY %s", \
OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), __FILE__, __LINE__, \
OPAL_NAME_PRINT(*(p)), (s))); \
OPAL_NAME_PRINT(*(p)), PMIx_Get_attribute_name(s))); \
OPAL_PMIX_CONVERT_NAME(&_proc, (p)); \
PMIX_INFO_LOAD(&_info, PMIX_OPTIONAL, NULL, PMIX_BOOL); \
(r) = PMIx_Get(&(_proc), (s), &(_info), 1, &(_kv)); \
Expand Down Expand Up @@ -334,7 +334,7 @@ typedef struct {
OPAL_OUTPUT_VERBOSE((1, opal_pmix_verbose_output, \
"%s[%s:%d] MODEX RECV VALUE IMMEDIATE FOR PROC %s KEY %s", \
OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), __FILE__, __LINE__, \
OPAL_NAME_PRINT(*(p)), (s))); \
OPAL_NAME_PRINT(*(p)), PMIx_Get_attribute_name(s))); \
OPAL_PMIX_CONVERT_NAME(&_proc, (p)); \
PMIX_INFO_LOAD(&_info, PMIX_IMMEDIATE, NULL, PMIX_BOOL); \
(r) = PMIx_Get(&(_proc), (s), &(_info), 1, &(_kv)); \
Expand Down Expand Up @@ -370,7 +370,8 @@ typedef struct {
size_t _sz; \
OPAL_OUTPUT_VERBOSE( \
(1, opal_pmix_verbose_output, "%s[%s:%d] MODEX RECV VALUE FOR PROC %s KEY %s", \
OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), __FILE__, __LINE__, OPAL_NAME_PRINT(*(p)), (s))); \
OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), __FILE__, __LINE__, OPAL_NAME_PRINT(*(p)), \
PMIx_Get_attribute_name(s))); \
OPAL_PMIX_CONVERT_NAME(&_proc, (p)); \
(r) = PMIx_Get(&(_proc), (s), NULL, 0, &(_kv)); \
if (NULL == _kv) { \
Expand Down Expand Up @@ -406,7 +407,7 @@ typedef struct {
OPAL_OUTPUT_VERBOSE((1, opal_pmix_verbose_output, \
"%s[%s:%d] MODEX RECV STRING OPTIONAL FOR PROC %s KEY %s", \
OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), __FILE__, __LINE__, \
OPAL_NAME_PRINT(*(p)), (s))); \
OPAL_NAME_PRINT(*(p)), PMIx_Get_attribute_name(s))); \
*(d) = NULL; \
*(sz) = 0; \
OPAL_PMIX_CONVERT_NAME(&_proc, (p)); \
Expand Down Expand Up @@ -444,7 +445,8 @@ typedef struct {
pmix_info_t _info; \
OPAL_OUTPUT_VERBOSE( \
(1, opal_pmix_verbose_output, "%s[%s:%d] MODEX RECV STRING FOR PROC %s KEY %s", \
OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), __FILE__, __LINE__, OPAL_NAME_PRINT(*(p)), (s))); \
OPAL_NAME_PRINT(OPAL_PROC_MY_NAME), __FILE__, __LINE__, OPAL_NAME_PRINT(*(p)), \
PMIx_Get_attribute_name(s))); \
*(d) = NULL; \
*(sz) = 0; \
OPAL_PMIX_CONVERT_NAME(&_proc, (p)); \
Expand Down

0 comments on commit 594e29a

Please sign in to comment.