Skip to content

Commit 4899eaf

Browse files
authored
Merge pull request #10393 from awlauria/log_main_pmix_back
Fix build failure with unreleased PMIx.
2 parents 97dda9f + 42c0ed6 commit 4899eaf

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

opal/util/show_help.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,18 @@ static void local_delivery(const char *file, const char *topic, char *msg) {
141141

142142
opal_log_info_t *cbdata = calloc(1, sizeof(opal_log_info_t));
143143
if(opal_help_want_aggregate) {
144+
// Not available in PMIx releases of v4.1.2 and earlier.
145+
// This should be available in future v4.1 and v4.2 releases,
146+
// as well as future major releases.
147+
// Disabling the aggregate behavior here, but stil log it, as
148+
// seeing duplicate messages is better than not seeing anything at all.
149+
#ifdef PMIX_LOG_AGG
144150
PMIX_INFO_CREATE(dirs, 3);
145151
PMIX_INFO_LOAD(&dirs[ndirs++], PMIX_LOG_AGG, &opal_help_want_aggregate, PMIX_BOOL);
146152
PMIX_INFO_LOAD(&dirs[ndirs++], PMIX_LOG_KEY, file, PMIX_STRING);
147153
PMIX_INFO_LOAD(&dirs[ndirs++], PMIX_LOG_VAL, topic, PMIX_STRING);
148154
cbdata->dirs = dirs;
155+
#endif
149156
}
150157

151158
cbdata->info = info;

0 commit comments

Comments
 (0)